androidv1.9.0

IDCardLib/src/main/res/layout/liveness_layout.xml

@@ -82,7 +82,7 @@
                     android:layout_marginTop="5dip"
                     android:layout_marginTop="5dip"
                     android:text="@string/meglive_prompt"
                     android:text="@string/meglive_prompt"
                     android:textColor="#00ACDF"
                     android:textColor="#00ACDF"
-                    android:textSize="16dp" />
+                    android:textSize="17dp" />
 
 
                 <ImageView
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
@@ -106,7 +106,7 @@
                     android:layout_centerInParent="true"
                     android:layout_centerInParent="true"
                     android:text="10"
                     android:text="10"
                     android:textColor="#00BEE2"
                     android:textColor="#00BEE2"
-                    android:textSize="20sp" />
+                    android:textSize="22sp" />
 
 
                 <com.megvii.idcardlib.view.CircleProgressBar
                 <com.megvii.idcardlib.view.CircleProgressBar
                     android:id="@+id/detection_step_timeout_progressBar"
                     android:id="@+id/detection_step_timeout_progressBar"

app/build.gradle

@@ -23,87 +23,87 @@ android {
         ndk {
         ndk {
             abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a','armeabi'
             abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a','armeabi'
         }
         }
+    }
 
 
-        signingConfigs {
-            release {
-                keyAlias 'keybigfish'
-                keyPassword '123456789'
-                storeFile file('../../app_key.jks')
-                storePassword '123456789'
-            }
+    signingConfigs {
+        release {
+            keyAlias 'keybigfish'
+            keyPassword '123456789'
+            storeFile file('../../app_key.jks')
+            storePassword '123456789'
         }
         }
+    }
 
 
-        buildTypes {
-            release {
-                signingConfig android.signingConfigs.release
-                minifyEnabled isReleaseMinify
-                shrinkResources isReleaseMinify //是否清理无用资源,依赖于minifyEnabled
-                zipAlignEnabled isReleaseMinify //是否启用zipAlign压缩
-                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            }
-
-            debug {
-                signingConfig android.signingConfigs.release
-                minifyEnabled isDebugMinify
-                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            }
+    buildTypes {
+        release {
+            signingConfig android.signingConfigs.release
+            minifyEnabled isReleaseMinify
+            shrinkResources isReleaseMinify //是否清理无用资源,依赖于minifyEnabled
+            zipAlignEnabled isReleaseMinify //是否启用zipAlign压缩
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         }
 
 
-        sourceSets {
-            main {
-                jniLibs.srcDirs = ['libs']
-                assets.srcDirs = ['src/main/assets', 'src/main/assets/']
-            }
+        debug {
+            signingConfig android.signingConfigs.release
+            minifyEnabled isDebugMinify
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         }
+    }
 
 
-        aaptOptions {
-            cruncherEnabled = false
-            useNewCruncher = false
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+            assets.srcDirs = ['src/main/assets', 'src/main/assets/']
         }
         }
+    }
 
 
-        dataBinding {
-            enabled = true
-        }
+    aaptOptions {
+        cruncherEnabled = false
+        useNewCruncher = false
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 
-        lintOptions {
-            abortOnError false
-        }
-        dexOptions {
-            preDexLibraries = false
-        }
+    dataBinding {
+        enabled = true
     }
     }
 
 
+    lintOptions {
+        abortOnError false
+    }
+    dexOptions {
+        preDexLibraries = false
+    }
+}
 
 
-    repositories {
-        flatDir {
-            dirs 'libs'
-        }
+
+repositories {
+    flatDir {
+        dirs 'libs'
     }
     }
+}
 
 
-    dependencies {
-        compile fileTree(include: ['*.jar'], dir: 'libs')
-        testCompile 'junit:junit:4.12'
-        //ARouter
-        annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    testCompile 'junit:junit:4.12'
+    //ARouter
+    annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
 
 
-        if (isMessageModule.toBoolean()) {
-            compile project(':messageCenter')
-        }
-        if (isUserModule.toBoolean()) {
-            compile project(':userCenter')
-        }
-        if (isOrderModule.toBoolean()) {
-            compile project(':orderCenter')
-        }
+    if (isMessageModule.toBoolean()) {
+        compile project(':messageCenter')
+    }
+    if (isUserModule.toBoolean()) {
+        compile project(':userCenter')
+    }
+    if (isOrderModule.toBoolean()) {
+        compile project(':orderCenter')
+    }
 //    compile(name: 'orderCenter-debug', ext: 'aar')
 //    compile(name: 'orderCenter-debug', ext: 'aar')
 //    compile(name: 'userCenter-debug', ext: 'aar')
 //    compile(name: 'userCenter-debug', ext: 'aar')
 //    compile(name: 'messageCenter-debug', ext: 'aar')
 //    compile(name: 'messageCenter-debug', ext: 'aar')
 //    compile(name: 'provider-debug', ext: 'aar')
 //    compile(name: 'provider-debug', ext: 'aar')
 //    compile(name: 'baseSDK-debug', ext: 'aar')
 //    compile(name: 'baseSDK-debug', ext: 'aar')
-    }
+}
 
 
-}
\ No newline at end of file

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

@@ -7,28 +7,31 @@ import android.content.Intent;
 import android.net.Uri;
 import android.net.Uri;
 import android.provider.Settings;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
 import com.dayu.base.ui.activity.DataBindingActivity;
 import com.dayu.base.ui.activity.DataBindingActivity;
 import com.dayu.bigfish.databinding.ActivityInitializeMainBinding;
 import com.dayu.bigfish.databinding.ActivityInitializeMainBinding;
 import com.dayu.bigfish.ui.MainActivity;
 import com.dayu.bigfish.ui.MainActivity;
-import com.dayu.usercenter.ui.activity.LoginActivity;
+import com.dayu.event.UserInfo;
+import com.dayu.usercenter.ui.activity.SmsLoginActivity;
+import com.dayu.utils.LogUtils;
 import com.dayu.utils.MPermissionUtils;
 import com.dayu.utils.MPermissionUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.utils.UserManager;
 import com.dayu.widgets.CustomDialog;
 import com.dayu.widgets.CustomDialog;
+import com.hyphenate.EMCallBack;
+import com.hyphenate.chat.EMClient;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.analytics.MobclickAgent;
 
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
 import io.reactivex.Observable;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
 
 
 public class InitializeActivity extends DataBindingActivity<ActivityInitializeMainBinding> {
 public class InitializeActivity extends DataBindingActivity<ActivityInitializeMainBinding> {
     private static final String TAG = "InitializeActivity";
     private static final String TAG = "InitializeActivity";
     public static final int SDK_PERMISSION_REQUEST = 1;
     public static final int SDK_PERMISSION_REQUEST = 1;
     private Activity mActivity;
     private Activity mActivity;
-    private Disposable mDisposable;
 
 
     @Override
     @Override
     public int getLayoutId() {
     public int getLayoutId() {
@@ -38,7 +41,6 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
     @Override
     @Override
     public void initView() {
     public void initView() {
         MobclickAgent.openActivityDurationTrack(false);
         MobclickAgent.openActivityDurationTrack(false);
-
         mActivity = this;
         mActivity = this;
         String[] mPerArr = new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE};
         String[] mPerArr = new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 
 
@@ -62,13 +64,13 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
     private void doJump() {
     private void doJump() {
         Intent intent;
         Intent intent;
         if (UserManager.getInstance().hasUserInfo()) {
         if (UserManager.getInstance().hasUserInfo()) {
+            UserInfo info = UserManager.getInstance().getUser();
+            loginHx(info.getHxAccount(), info.getHxPwd());
             intent = new Intent(InitializeActivity.this, MainActivity.class);
             intent = new Intent(InitializeActivity.this, MainActivity.class);
         } else {
         } else {
-            intent = new Intent(InitializeActivity.this, LoginActivity.class);
+            intent = new Intent(InitializeActivity.this, SmsLoginActivity.class);
         }
         }
-        startActivity(intent);
-        finish();
-        mDisposable = Observable.timer(1000, TimeUnit.MILLISECONDS)
+        Observable.timer(1000, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                 .subscribe(
                         aLong -> {
                         aLong -> {
@@ -78,6 +80,27 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
                 );
                 );
     }
     }
 
 
+    public void loginHx(String hxAccount, String hxPwd) {
+        if (!(TextUtils.isEmpty(hxAccount)) && !(TextUtils.isEmpty(hxPwd))) {
+            EMClient.getInstance().login(hxAccount, hxPwd, new EMCallBack() {
+                @Override
+                public void onSuccess() {
+                    EMClient.getInstance().groupManager().loadAllGroups();
+                    EMClient.getInstance().chatManager().loadAllConversations();
+                }
+
+                @Override
+                public void onProgress(int progress, String status) {
+                }
+
+                @Override
+                public void onError(int code, String message) {
+                    LogUtils.d(code + message);
+                }
+            });
+        }
+    }
+
     public void showPerMissionDialog() {
     public void showPerMissionDialog() {
         CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.please_open__permission)
         CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.please_open__permission)
                 , (dialog1, confirm) -> {
                 , (dialog1, confirm) -> {
@@ -115,9 +138,6 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
     @Override
     @Override
     protected void onDestroy() {
     protected void onDestroy() {
         super.onDestroy();
         super.onDestroy();
-//        if (mDisposable != null) {
-//            mDisposable.dispose();
-//        }
     }
     }
 
 
     @TargetApi(23)
     @TargetApi(23)

app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java

@@ -51,12 +51,38 @@ public class MainPresenter extends MainContract.Presenter {
     @Override
     @Override
     public void getNewVersion(String version) {
     public void getNewVersion(String version) {
         ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
         ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
-            if (!version.equals(s)) {
+            if (parseVersion(s) > parseVersion(version)) {
                 upgradeVersion("dayushifua_dayu", s);
                 upgradeVersion("dayushifua_dayu", s);
             }
             }
         }));
         }));
     }
     }
 
 
+    private Integer parseVersion(String version) {
+        String[] vcs = version.split("\\.");
+        String v1 = vcs[0];
+        String v2 = vcs[1];
+        String v3 = vcs[2];
+        if (v1.length() == 1) {
+            v1 = "00" + v1;
+        }
+        if (v1.length() == 2) {
+            v1 = "0" + v1;
+        }
+        if (v2.length() == 1) {
+            v2 = "00" + v2;
+        }
+        if (v2.length() == 2) {
+            v2 = "0" + v2;
+        }
+        if (v3.length() == 1) {
+            v3 = "00" + v3;
+        }
+        if (v3.length() == 2) {
+            v3 = "0" + v3;
+        }
+        return Integer.parseInt(v1 + v2 + v3);
+    }
+
     @Override
     @Override
     public void upgradeVersion(String appId, String versionCode) {
     public void upgradeVersion(String appId, String versionCode) {
         ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(
         ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(

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

@@ -5,7 +5,6 @@ import android.databinding.ObservableBoolean;
 import android.net.Uri;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Environment;
-import android.text.TextUtils;
 
 
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.R;
@@ -14,14 +13,13 @@ import com.dayu.bigfish.ui.AboutUsActivity;
 import com.dayu.bigfish.ui.FeedBackActivity;
 import com.dayu.bigfish.ui.FeedBackActivity;
 import com.dayu.common.Constants;
 import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
 import com.dayu.event.UserInfo;
-import com.dayu.usercenter.ui.activity.LoginActivity;
+import com.dayu.usercenter.ui.activity.SmsLoginActivity;
 import com.dayu.utils.AppManager;
 import com.dayu.utils.AppManager;
 import com.dayu.utils.AppUtils;
 import com.dayu.utils.AppUtils;
 import com.dayu.utils.DataCleanManager;
 import com.dayu.utils.DataCleanManager;
 import com.dayu.utils.SPUtils;
 import com.dayu.utils.SPUtils;
 import com.dayu.utils.UIUtils;
 import com.dayu.utils.UIUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.utils.UserManager;
-import com.hyphenate.EMCallBack;
 import com.hyphenate.chat.EMClient;
 import com.hyphenate.chat.EMClient;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.analytics.MobclickAgent;
 
 
@@ -53,25 +51,27 @@ public class SettingPresenter extends SettingContract.Presenter {
         buttonState.set(!buttonState.get());
         buttonState.set(!buttonState.get());
         SPUtils.put(Constants.MESSAGE_STATE, buttonState.get());
         SPUtils.put(Constants.MESSAGE_STATE, buttonState.get());
         if (buttonState.get()) {
         if (buttonState.get()) {
-            if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) {
-                EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() {
-                    @Override
-                    public void onSuccess() {
-                        EMClient.getInstance().groupManager().loadAllGroups();
-                        EMClient.getInstance().chatManager().loadAllConversations();
-                    }
-
-                    @Override
-                    public void onProgress(int progress, String status) {
-                    }
-
-                    @Override
-                    public void onError(int code, String message) {
-                    }
-                });
-            }
+//            if (!(TextUtils.isEmpty(mHxAccount)) && !(TextUtils.isEmpty(mHxPwd))) {
+//                EMClient.getInstance().login(mHxAccount, mHxPwd, new EMCallBack() {
+//                    @Override
+//                    public void onSuccess() {
+//                        EMClient.getInstance().groupManager().loadAllGroups();
+//                        EMClient.getInstance().chatManager().loadAllConversations();
+//                    }
+//
+//                    @Override
+//                    public void onProgress(int progress, String status) {
+//                    }
+//
+//                    @Override
+//                    public void onError(int code, String message) {
+//                    }
+//                });
+//            }
+            SPUtils.put(Constants.HX_STATE, true);
         } else {
         } else {
-            EMClient.getInstance().logout(true);
+//            EMClient.getInstance().logout(true);
+            SPUtils.put(Constants.HX_STATE, false);
         }
         }
         MobclickAgent.onEvent(MyApplication.getContext(), "swtich_message_button");
         MobclickAgent.onEvent(MyApplication.getContext(), "swtich_message_button");
     }
     }
@@ -93,7 +93,7 @@ public class SettingPresenter extends SettingContract.Presenter {
         EMClient.getInstance().logout(true);
         EMClient.getInstance().logout(true);
         UserManager.getInstance().clearUserInfo();
         UserManager.getInstance().clearUserInfo();
         AppManager.getInstance().finishAllActivity();
         AppManager.getInstance().finishAllActivity();
-        mView.startActivity(LoginActivity.class);
+        mView.startActivity(SmsLoginActivity.class);
         MobclickAgent.onEvent(MyApplication.getContext(), "login_out");
         MobclickAgent.onEvent(MyApplication.getContext(), "login_out");
     }
     }
 
 
@@ -105,10 +105,10 @@ public class SettingPresenter extends SettingContract.Presenter {
                 Observable.timer(2, TimeUnit.SECONDS).
                 Observable.timer(2, TimeUnit.SECONDS).
                         observeOn(AndroidSchedulers.mainThread()).
                         observeOn(AndroidSchedulers.mainThread()).
                         subscribe(
                         subscribe(
-                        along -> {
-                            mView.hideDialog();
-                            mView.showToast(R.string.clear_success);
-                        });
+                                along -> {
+                                    mView.hideDialog();
+                                    mView.showToast(R.string.clear_success);
+                                });
                 DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
                 DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
                 MobclickAgent.onEvent(MyApplication.getContext(), "sure_clear_cach");
                 MobclickAgent.onEvent(MyApplication.getContext(), "sure_clear_cach");
             }
             }
@@ -143,5 +143,4 @@ public class SettingPresenter extends SettingContract.Presenter {
         mView.startActivity(FeedBackActivity.class, bundle);
         mView.startActivity(FeedBackActivity.class, bundle);
         MobclickAgent.onEvent(MyApplication.getContext(), "feed_back");
         MobclickAgent.onEvent(MyApplication.getContext(), "feed_back");
     }
     }
-
 }
 }

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -319,6 +319,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     @Subscribe(threadMode = ThreadMode.MAIN)
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onDownloadEvent(DownloadBean event) {
     public void onDownloadEvent(DownloadBean event) {
         int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100);
         int progress = (int) Math.round(event.getBytesReaded() / (double) event.getTotal() * 100);
+        if (builder==null){
+            return;
+        }
         builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false);
         builder.setContentInfo(String.valueOf(progress) + "%").setProgress(100, progress, false);
         notificationManager.notify(0, builder.build());
         notificationManager.notify(0, builder.build());
         if (progress == 100) {
         if (progress == 100) {

app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java

@@ -25,6 +25,8 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
 
 
     @Override
     @Override
     public void initView() {
     public void initView() {
+        mBind.toolbar.setNavigationOnClickListener(v->dumpBack());
+        mBind.tvTitle.setText(getString(R.string.setting_center));
     }
     }
 
 
     @Override
     @Override

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

@@ -9,20 +9,26 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat;
 
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.api.protocol.InformBean;
 import com.dayu.bigfish.api.protocol.InformBean;
 import com.dayu.bigfish.ui.MainActivity;
 import com.dayu.bigfish.ui.MainActivity;
+import com.dayu.common.BaseConstant;
 import com.dayu.common.Constants;
 import com.dayu.common.Constants;
 import com.dayu.usercenter.ui.activity.LicenceDetailActivity;
 import com.dayu.usercenter.ui.activity.LicenceDetailActivity;
 import com.dayu.utils.AppManager;
 import com.dayu.utils.AppManager;
+import com.dayu.utils.SPUtils;
+import com.dayu.utils.ToastUtils;
+import com.dayu.utils.UserManager;
 import com.dayu.widgets.LicenceDialog;
 import com.dayu.widgets.LicenceDialog;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
+import com.hyphenate.EMConnectionListener;
+import com.hyphenate.EMError;
 import com.hyphenate.EMMessageListener;
 import com.hyphenate.EMMessageListener;
 import com.hyphenate.chat.EMClient;
 import com.hyphenate.chat.EMClient;
 import com.hyphenate.chat.EMMessage;
 import com.hyphenate.chat.EMMessage;
 import com.hyphenate.chat.EMOptions;
 import com.hyphenate.chat.EMOptions;
 
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
@@ -109,6 +115,9 @@ public class HxManager {
                             }
                             }
                         });
                         });
                     } else {
                     } else {
+                        if (!(boolean) SPUtils.get(Constants.HX_STATE, true)) {
+                            return;
+                        }
                         Intent intent = new Intent(mContext, MainActivity.class);
                         Intent intent = new Intent(mContext, MainActivity.class);
                         intent.putExtra(Constants.MESSAGE_INFO, info);
                         intent.putExtra(Constants.MESSAGE_INFO, info);
                         PendingIntent pi = PendingIntent.getActivity(mContext,
                         PendingIntent pi = PendingIntent.getActivity(mContext,
@@ -167,8 +176,34 @@ public class HxManager {
                 //消息状态变动
                 //消息状态变动
             }
             }
         };
         };
+
         //注册环信消息监听
         //注册环信消息监听
         EMClient.getInstance().chatManager().addMessageListener(msgListener);
         EMClient.getInstance().chatManager().addMessageListener(msgListener);
+        //注册一个监听连接状态的listener
+        EMClient.getInstance().addConnectionListener(new MyConnectionListener());
+    }
+
+    //实现ConnectionListener接口
+    private class MyConnectionListener implements EMConnectionListener {
+        @Override
+        public void onConnected() {
+        }
+
+        @Override
+        public void onDisconnected(final int error) {
+            if (error == EMError.USER_LOGIN_ANOTHER_DEVICE) {
+                // 显示帐号在其他设备登录
+                Observable.timer(1, TimeUnit.MILLISECONDS)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(l -> {
+                            ToastUtils.showShortToast("您的账号在另一台设备中登录");
+                            EMClient.getInstance().logout(true);
+                            UserManager.getInstance().clearUserInfo();
+                            AppManager.getInstance().finishAllActivity();
+                            ARouter.getInstance().build(BaseConstant.PATH_LOGIN).navigation();
+                        });
+            }
+        }
     }
     }
 
 
     private void initEasemob() {
     private void initEasemob() {
@@ -197,16 +232,15 @@ public class HxManager {
      * @return 返回进程的名字
      * @return 返回进程的名字
      */
      */
     private String getAppName(int pid) {
     private String getAppName(int pid) {
-        String processName = null;
+        String processName;
         ActivityManager activityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
         ActivityManager activityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-        List list = null;
+        List list;
         if (activityManager == null) {
         if (activityManager == null) {
             return null;
             return null;
         }
         }
         list = activityManager.getRunningAppProcesses();
         list = activityManager.getRunningAppProcesses();
-        Iterator i = list.iterator();
-        while (i.hasNext()) {
-            ActivityManager.RunningAppProcessInfo info = (ActivityManager.RunningAppProcessInfo) (i.next());
+        for (Object aList : list) {
+            ActivityManager.RunningAppProcessInfo info = (ActivityManager.RunningAppProcessInfo) (aList);
             try {
             try {
                 if (info.pid == pid) {
                 if (info.pid == pid) {
                     // 根据进程的信息获取当前进程的名字
                     // 根据进程的信息获取当前进程的名字

app/src/main/res/layout/activity_setting.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <data>
     <data>
 
 
@@ -15,19 +16,18 @@
         android:layout_height="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
         android:orientation="vertical">
 
 
-        <RelativeLayout style="@style/title">
-
-            <ImageView
-                android:id="@+id/title_back"
-                style="@style/title_image_back"
-                android:onClick="@{()->presenter.dumpBack()}" />
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginBottom="2dp"
+            android:background="?attr/colorPrimary"
+            app:navigationIcon="@drawable/back_btn_normal">
 
 
             <TextView
             <TextView
-                style="@style/text_title"
-                android:text="@string/setting_center" />
-        </RelativeLayout>
-
-        <ImageView style="@style/card_line" />
+                android:id="@+id/tv_title"
+                style="@style/toolbar_title" />
+        </android.support.v7.widget.Toolbar>
 
 
         <LinearLayout
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_width="match_parent"
@@ -216,13 +216,17 @@
                     android:src="@mipmap/list_more" />
                     android:src="@mipmap/list_more" />
             </RelativeLayout>
             </RelativeLayout>
 
 
+            <TextView style="@style/line" />
+
             <Button
             <Button
                 android:id="@+id/exit_button"
                 android:id="@+id/exit_button"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
                 android:layout_gravity="center"
                 android:layout_gravity="center"
                 android:layout_marginTop="33.3dp"
                 android:layout_marginTop="33.3dp"
-                android:background="@drawable/btn_common_selector"
+                android:background="@drawable/tab_blue_react"
                 android:onClick="@{()->presenter.exite()}"
                 android:onClick="@{()->presenter.exite()}"
                 android:text="@string/tv_exit_login"
                 android:text="@string/tv_exit_login"
                 android:textColor="@color/cl_white" />
                 android:textColor="@color/cl_white" />

baseSDK/build.gradle

@@ -24,6 +24,7 @@ android {
             minifyEnabled isDebugMinify
             minifyEnabled isDebugMinify
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField "String", "BASEURL", "\"${BASE_URL}\""
             buildConfigField "String", "BASEURL", "\"${BASE_URL}\""
+//            resValue("string", "PORT_NUMBER", "8081")
         }
         }
     }
     }
 
 

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

@@ -51,7 +51,7 @@ public class ServerException extends Exception {
 
 
             /** 用户相关错误*/
             /** 用户相关错误*/
             case "USER0002":
             case "USER0002":
-                message = BaseApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
+                message = BaseApplication.getContext().getString(R.string.user_on_blackilst);
                 break;
                 break;
             case "USER0004":
             case "USER0004":
                 message = BaseApplication.getContext().getString(R.string.not_engineer);
                 message = BaseApplication.getContext().getString(R.string.not_engineer);
@@ -63,6 +63,7 @@ public class ServerException extends Exception {
                 message = BaseApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
                 message = BaseApplication.getContext().getString(R.string.sms_code_unsend_or_expire);
                 break;
                 break;
             case "USER0021":
             case "USER0021":
+            case "USER0012":
                 message = BaseApplication.getContext().getString(R.string.sms_code_error);
                 message = BaseApplication.getContext().getString(R.string.sms_code_error);
                 break;
                 break;
             case "USER0003":
             case "USER0003":
@@ -78,6 +79,9 @@ public class ServerException extends Exception {
             case "USER0051":
             case "USER0051":
                 message = BaseApplication.getContext().getString(R.string.not_audite_aviliable);
                 message = BaseApplication.getContext().getString(R.string.not_audite_aviliable);
                 break;
                 break;
+            case "USER0065":
+                message = BaseApplication.getContext().getString(R.string.old_pwd_error);
+                break;
             case "DETECT_ERROR00003":
             case "DETECT_ERROR00003":
                 message = BaseApplication.getContext().getString(R.string.error_detect_face);
                 message = BaseApplication.getContext().getString(R.string.error_detect_face);
                 break;
                 break;

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

@@ -26,30 +26,30 @@ public class Constants {
     /**
     /**
      * uat环境配置.
      * uat环境配置.
      */
      */
-//    public static final String ENVIROMENT = "uat";
-//    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-//    public static final String BASE_URL = "http://47.95.223.6:3112";
-//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
-//    public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
-//    public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
-//    public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
-//    public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
-//    public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
-//    public static final boolean IS_DEBUG = true;
+    public static final String ENVIROMENT = "uat";
+    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+    public static final String BASE_URL = "http://47.95.223.6:3112";
+    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
+    public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
+    public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
+    public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
+    public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
+    public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
+    public static final boolean IS_DEBUG = true;
 
 
     /**
     /**
      * 正式环境.
      * 正式环境.
      */
      */
-    public static final String ENVIROMENT = "release";
-    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-    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_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
-    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
-    public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
-    public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
-    public static final boolean IS_DEBUG = false;
+//    public static final String ENVIROMENT = "release";
+//    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+//    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_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
+//    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
+//    public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
+//    public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
+//    public static final boolean IS_DEBUG = false;
 
 
     /**
     /**
      * 演示环境
      * 演示环境
@@ -150,6 +150,10 @@ public class Constants {
 
 
     public static final String ERROR_NULL = "-1";
     public static final String ERROR_NULL = "-1";
 
 
+    public static final String HX_STATE = "hx_state";
+
+    public static final String CETIFICATION_STATE = "cetificaiton_state";//1:接单跳转0：待预约，登录页,个人中心跳转
+
 
 
     /**
     /**
      * 主动申请备件.
      * 主动申请备件.

baseSDK/src/main/java/com/dayu/utils/AppManager.java

@@ -64,9 +64,7 @@ public class AppManager {
      */
      */
     public void finishActivity(Activity activity) {
     public void finishActivity(Activity activity) {
         if (activity != null) {
         if (activity != null) {
-            activityStack.remove(activity);
             activity.finish();
             activity.finish();
-            activity = null;
         }
         }
     }
     }
 
 

baseSDK/src/main/java/com/dayu/utils/MD5Util.java

+package com.dayu.utils;
+
+import java.security.MessageDigest;
+
+/**
+ * Created by luofan
+ * on 2018/7/6.
+ */
+
+public class MD5Util {
+    /**
+     * 加密
+     * @param plaintext 明文
+     * @return ciphertext 密文
+     */
+    public final static String  encrypt(String plaintext) {
+        char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'a', 'b', 'c', 'd', 'e', 'f' };
+        try {
+            byte[] btInput = plaintext.getBytes();
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            // 使用指定的字节更新摘要
+            mdInst.update(btInput);
+            // 获得密文
+            byte[] md = mdInst.digest();
+            // 把密文转换成十六进制的字符串形式
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}