Merge branch 'master' into dev

app/src/main/java/com/dayu/bigfish/InitializeActivity.java

@@ -13,8 +13,8 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.dayu.usercenter.ui.activity.LoginActivity;
 import com.dayu.bigfish.ui.MainActivity;
+import com.dayu.usercenter.ui.activity.LoginActivity;
 import com.dayu.utils.MPermissionUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.widgets.CustomDialog;
@@ -23,6 +23,7 @@ import com.umeng.analytics.MobclickAgent;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 
 public class InitializeActivity extends AppCompatActivity {
@@ -54,7 +55,6 @@ public class InitializeActivity extends AppCompatActivity {
                 showPerMissionDialog();
             }
         });
-
     }
 
 
@@ -65,12 +65,14 @@ public class InitializeActivity extends AppCompatActivity {
         } else {
             intent = new Intent(InitializeActivity.this, LoginActivity.class);
         }
-        mDisposable = Observable.timer(1000, TimeUnit.MICROSECONDS).subscribe(
-                aLong -> {
-                    startActivity(intent);
-                    finish();
-                }
-        );
+        mDisposable = Observable.timer(1000, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        aLong -> {
+                            startActivity(intent);
+                            finish();
+                        }
+                );
     }
 
     public void showPerMissionDialog() {

app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java

@@ -28,6 +28,7 @@ import com.umeng.analytics.MobclickAgent;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 /**
  * Created by luofan
@@ -101,7 +102,9 @@ public class SettingPresenter extends SettingContract.Presenter {
         mView.showCachDialog((dialog, confirm) -> {
             if (confirm) {
                 mView.showDialog(UIUtils.getString(R.string.on_clear));
-                Observable.timer(2, TimeUnit.SECONDS).subscribe(
+                Observable.timer(2, TimeUnit.SECONDS).
+                        observeOn(AndroidSchedulers.mainThread()).
+                        subscribe(
                         along -> {
                             mView.hideDialog();
                             mView.showToast(R.string.clear_success);

app/src/main/java/com/dayu/bigfish/utils/HxManager.java

@@ -167,7 +167,11 @@ public class HxManager {
     private String getAppName(int pid) {
         String processName = null;
         ActivityManager activityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-        List list = activityManager.getRunningAppProcesses();
+        List list = null;
+        if (activityManager == null) {
+            return null;
+        }
+        list = activityManager.getRunningAppProcesses();
         Iterator i = list.iterator();
         while (i.hasNext()) {
             ActivityManager.RunningAppProcessInfo info = (ActivityManager.RunningAppProcessInfo) (i.next());

baseSDK/src/main/java/com/dayu/base/api/Api.java

@@ -4,7 +4,6 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.dayu.base.api.protocol.BaseResponse;
-import com.dayu.baselibrary.BuildConfig;
 import com.dayu.common.BaseConstant;
 import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
@@ -94,7 +93,7 @@ public class Api {
         }
         return new Retrofit.Builder()
                 .client(build.build())
-                .baseUrl(BuildConfig.BASEURL)
+                .baseUrl(Constants.BASE_URL)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -12,13 +12,13 @@ public class Constants {
     /**
      * 测试环境配置.
      */
-    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-    public static final String ENVIROMENT = "debug";
-    public static final String BASE_URL = "http://47.94.101.239:3112";
-    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
-    public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
-    public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
-    public static final boolean IS_DEBUG = true;
+//    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+//    public static final String ENVIROMENT = "debug";
+//    public static final String BASE_URL = "http://47.94.101.239:3112";
+//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
+//    public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
+//    public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
+//    public static final boolean IS_DEBUG = true;
 
     /**
      * uat环境配置.
@@ -34,13 +34,13 @@ public class Constants {
     /**
      * 正式环境.
      */
-//    public static final String ENVIROMENT = "release";
-//    public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
-//    public static final String BASE_URL = "https://mobile.kf.ai";
-//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
-//    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
-//    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
-//    public static final boolean IS_DEBUG = false;
+    public static final String ENVIROMENT = "release";
+    public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
+    public static final String BASE_URL = "https://mobile.kf.ai";
+    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
+    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
+    public static final boolean IS_DEBUG = false;
 
     /**
      * 演示环境

build.gradle

@@ -8,8 +8,8 @@ buildscript {
     ext.version_code = 8
     ext.verson_name = "1.4.0"
     ext.gradle_version = '3.0.1'
-    ext.isReleaseMinify = false
-    ext.isDebugMinify = false
+    ext.isReleaseMinify = true
+    ext.isDebugMinify = true
     ext.arouter_api_version = '1.3.1'
     ext.arouter_compiler_version = '1.1.4'