Accept Merge Request #222 结项合并 : (zn -> master)

Merge Request: 结项合并
Created By: @kuangthree
Accepted By: @kuangthree
URL: https://coding.net/u/kuangthree/p/ULeda_Android_Client/git/merge/222

Author: universe-st

app/build.gradle

@@ -1,22 +1,40 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 24
+    sourceSets.main.jniLibs.srcDirs = ['libs']
+    compileSdkVersion 25
     buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId "ecnu.uleda"
-        minSdkVersion 15
+        minSdkVersion 21
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'x86_64', 'armeabi-v7a', 'armeabi'
+            universalApk false
+        }
+    }
+}
+
+repositories{
+    flatDir{
+        dirs 'libs' //放aar的目录地址
+    }
 }
 
 dependencies {
@@ -27,13 +45,52 @@ dependencies {
     compile files('libs/TencentMapSDK_Raster_v1.2.4_4af1d6f.jar')
     compile files('libs/TencentLocationSDK_v5.0.1_r251203_170116_1729.jar')
     compile files('libs/TencentSearch1.1.3.jar')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:support-v4:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'com.android.support:percent:24.2.1'
+    compile project(':zbarcode')
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:percent:25.3.1'
     compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'com.android.support:recyclerview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
     compile 'com.google.android.gms:play-services-appindexing:8.4.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    compile 'me.xiaopan:sketch:2.3.2'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.jcodecraeer:xrecyclerview:1.3.2'
+    compile 'com.github.chrisbanes:PhotoView:2.0.0'
+    compile 'com.wang.avi:library:1.0.0'
+    compile 'com.nineoldandroids:library:2.4.0'
+    compile 'com.github.loonggg:RecyclerViewBanner:v1.2.1'
+    compile 'org.greenrobot:eventbus:3.0.0'
+    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.contrarywind:Android-PickerView:3.2.5'
+    compile 'io.reactivex.rxjava2:rxjava:2.1.3'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
+    compile 'com.squareup.okhttp3:okhttp:3.9.0'
+    compile 'com.squareup.okio:okio:1.13.0'
+
+    compile 'com.cjj.materialrefeshlayout:library:1.3.0'
+
     testCompile 'junit:junit:4.12'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+
+    compile 'com.android.support:palette-v7:25.3.1'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    testCompile 'junit:junit:4.12'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'io.reactivex.rxjava2:rxjava:2.1.3'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile name:'SMSSDK-3.0.0',ext:'aar'
+    compile name:'SMSSDKGUI-3.0.0',ext:'aar'
+
+    compile 'jp.wasabeef:glide-transformations:2.0.2'
+
+}
+repositories {
+    mavenCentral()
+
 }

app/libs/MobCommons-2017.0607.1736.jar

@@ -1,80 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="ecnu.uleda">
-
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- 通过GPS得到精确位置 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <!-- 通过网络得到粗略位置 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <!-- 访问网络. 某些位置信息需要从网络服务器获取 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <!-- 访问WiFi状态. 需要WiFi信息用于网络定位 -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <!-- 修改WiFi状态. 发起WiFi扫描, 需要WiFi信息用于网络定位 -->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <!-- 访问网络状态, 检测网络的可用性. 需要网络运营商相关信息用于网络定位 -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <!-- 访问网络的变化, 需要某些信息用于网络定位 -->
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <!-- 访问手机当前状态, 需要某些信息用于网络定位 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!-- Mob短信验证 -->
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
     <application
+        android:name="ecnu.uleda.function_module.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:largeHeap="true"
         android:supportsRtl="true"
         android:theme="@style/UMainTheme">
         <meta-data
             android:name="TencentMapSDK"
-            android:value="DYXBZ-ALP33-ZZV3L-3LKO5-PLDRF-AKFEO"/>
-
+            android:value="DYXBZ-ALP33-ZZV3L-3LKO5-PLDRF-AKFEO" />
+        <service
+            android:name="com.tencent.qalsdk.service.QalService"
+            android:exported="true"
+            android:process=":QALSERVICE" >
+        </service>
+        <service
+            android:name="com.tencent.qalsdk.service.QalAssistService"
+            android:exported="false"
+            android:process=":QALSERVICE" >
+        </service>
+        <!-- 【必须】 离线消息广播接收器 -->
+        <receiver
+            android:name="com.tencent.qalsdk.QALBroadcastReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.tencent.qalsdk.broadcast.qal" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="com.tencent.qalsdk.core.NetConnInfoCenter" android:process=":QALSERVICE">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.TIME_SET" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+            </intent-filter>
+            <!-- ImSDK 3.0.2 后添加 -->
+            <intent-filter>
+                <action android:name="com.tencent.qalsdk.service.TASK_REMOVED" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name=".view_controller.UMainActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view_controller.LoginActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view_controller.WelcomeActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WelcomeTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".view_controller.TaskDetailsActivity"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".view_controller.SettingActivity"/>
-        <activity android:name=".view_controller.SingleUserInfoActivity"/>
-        <activity android:name=".view_controller.SettingUserActivity"/>
-        <activity android:name=".view_controller.SettingGeneralActivity"/>
-        <activity android:name=".view_controller.SettingFeedbackActivity"/>
-        <activity android:name=".view_controller.SettingAboutActivity"/>
-        <activity android:name=".view_controller.MyWalletActivity"/>
-        <activity android:name=".view_controller.MyQrActivity"/>
-        <activity android:name=".view_controller.SettingUserPhoneActivity"/>
-        <activity android:name=".view_controller.Mywallet_RechargeActivity"/>
-        <activity android:name=".view_controller.PopupwindowActivity"/>
-        <activity android:name=".view_controller.TaskPostActivity"/>
-        <activity android:name=".view_controller.LocationListActivity"/>
-        <activity android:name=".view_controller.Community"/>
-        <activity android:name=".view_controller.GetBackByNumber"/>
-        <activity android:name=".view_controller.MessageVertify"/>
-        <activity android:name=".view_controller.UserRegister"/>
-        <activity android:name=".view_controller.MyTaskInFo"/>
-        <activity android:name=".view_controller.AddNewFriends"/>
-        <activity android:name=".view_controller.TaskEditActivity"/>
-        <activity android:name=".view_controller.Chart"/>
-        <activity android:name=".view_controller.ReleasedUcircleActivity">
-        </activity>
-    </application>
+            android:name=".view_controller.task.activity.TaskDetailsActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/UMainTheme" />
+        <activity android:name=".view_controller.SettingActivity" />
+        <activity android:name=".view_controller.SingleUserInfoActivity" />
+        <activity android:name=".view_controller.SettingUserActivity" />
+        <activity android:name=".view_controller.SettingGeneralActivity" />
+        <activity android:name=".view_controller.SettingFeedbackActivity" />
+        <activity android:name=".view_controller.SettingAboutActivity" />
+        <activity android:name=".view_controller.MyWalletActivity" />
+        <activity android:name=".view_controller.MyQrActivity" />
+        <activity android:name=".view_controller.SettingUserPhoneActivity" />
+        <activity android:name=".view_controller.Mywallet_RechargeActivity" />
+        <activity android:name=".view_controller.widgets.UcircleDetailActivity"/>
+        <activity android:name=".view_controller.PopupwindowActivity" />
+        <activity
+            android:name=".view_controller.TaskPostActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/UMainTheme" />
+        <activity android:name=".view_controller.LocationListActivity" />
+        <activity android:name=".view_controller.Community" />
+        <activity android:name=".view_controller.GetBackByNumber" />
+        <activity android:name=".view_controller.MessageVertify" />
+        <activity android:name=".view_controller.UserRegister" />
+        <activity android:name=".view_controller.MyTaskInFo" />
+        <activity android:name=".view_controller.AddNewFriends" />
+        <activity android:name=".view_controller.TaskEditActivity" />
+        <activity android:name=".view_controller.ChatActivity" />
+        <activity android:name=".view_controller.ReleasedUcircleActivity"
+                  android:exported="true"/>
+        <activity android:name=".view_controller.task.activity.ActivityDetailsActivity"
+                  android:theme="@style/NoStatusBarTheme"
+                  android:parentActivityName=".view_controller.UMainActivity"/>
+        <activity android:name=".view_controller.CommonBigImageActivity"
+                  android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity android:name=".view_controller.message.SendMessageActivity"
+                  android:windowSoftInputMode="adjustPan"
+                  android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity android:name=".view_controller.task.activity.ActivityEditActivity"
+            android:theme="@style/UMainThemeActionBar"/>
+        <!-- Mob短信验证 -->
+        <activity
+            android:name="com.mob.tools.MobUIShell"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:windowSoftInputMode="stateHidden|adjustResize"/>
 
+        <activity android:name=".view_controller.AlbumActivity"
+            android:theme="@style/AppTheme"/>
+        <activity android:name=".view_controller.ImageFile"
+            android:theme="@style/AppTheme"/>
+        <activity android:name=".view_controller.ShowAllPhoto"
+            android:theme="@style/AppTheme"/>
+
+
+        <!-- 会话列表 -->
+        <!-- 聚合会话列表 -->
+        <!-- 会话界面 -->
+        <provider
+            android:name=".function_module.PhotoFileProvider"
+            android:authorities="com.example.cameraalbumtest.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"/>
+        </provider>
+    </application>
 </manifest>

app/libs/MobTools-2017.0607.1736.jar

@@ -0,0 +1,57 @@
+package ecnu.uleda.function_module;
+
+/**
+ * Created by zhaoning on 2017/4/17.
+ */
+
+import android.app.ActivityManager;
+import android.app.Application;
+import android.content.Context;
+
+
+import com.mob.MobApplication;
+import com.mob.MobSDK;
+
+import cn.smssdk.SMSSDK;
+
+public class App extends Application {
+    private static final String TAG = "App";
+    private static Context context;
+    /*
+    * Something about Mob.
+    * */
+    public static final String MOB_APP_KEY="1f19cb4168a4e";
+    public static final String MOB_APP_SECRET="ad4ea8c6dfec607ffbaffec324b75131";
+
+    public App() {
+    }
+
+    public void onCreate() {
+        super.onCreate();
+        context = getApplicationContext();
+
+        MobSDK.init(context,MOB_APP_KEY,MOB_APP_SECRET);
+
+    }
+
+    public static String getCurProcessName(Context context) {
+
+        int pid = android.os.Process.myPid();
+
+        ActivityManager activityManager = (ActivityManager) context
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        for (ActivityManager.RunningAppProcessInfo appProcess : activityManager
+                .getRunningAppProcesses()) {
+
+            if (appProcess.pid == pid) {
+                return appProcess.processName;
+            }
+        }
+        return null;
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+}

app/libs/Rong_IMLib.jar

@@ -0,0 +1,12 @@
+package ecnu.uleda.function_module;
+
+import android.support.v4.content.FileProvider;
+
+/**
+ * Created by Shensheng on 2017/4/10.
+ */
+
+public class PhotoFileProvider extends FileProvider {
+    public PhotoFileProvider() {
+    }
+}