提交类型 新家需求

提交内容   添加人脸管理的需求

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -458,15 +458,19 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                 mTabRadioGroup.clearCheck();
                 mTabRadioGroup.check(R.id.main_tab_one);
             } else if (action.equals(LoginHelper.ACTION_LOGOUT)) {
-                MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_SIMPLE_TELPHONE;
-                if (mCoreService != null) {
-                    mCoreService.logout();
+                try{
+                    MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_SIMPLE_TELPHONE;
+                    if (mCoreService != null) {
+                        mCoreService.logout();
+                    }
+                    cancelUserCheckIfExist();
+                    AlarmUtil.cancelAlarm(AlarmUtil.ID_SCHEDULE, AlarmUtil.ACTION_SCHEDULE);
+                    startActivity(new Intent(MainActivity.this, LoginActivity.class));
+                    // mFindRb.setChecked(true);
+                    MainActivity.this.finish();
+                    removeNeedUserFragment(false);
+                }catch (Exception e){
                 }
-                cancelUserCheckIfExist();
-                startActivity(new Intent(MainActivity.this, LoginActivity.class));
-                // mFindRb.setChecked(true);
-                MainActivity.this.finish();
-                removeNeedUserFragment(false);
             } else if (action.equals(LoginHelper.ACTION_CONFLICT)) {
                 // 改变用户状态
                 MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_TOKEN_CHANGE;

app_modular/facesdk/src/main/java/com/baidu/aip/excep/activity/FaceManageActivity.java

@@ -182,6 +182,7 @@ public class FaceManageActivity extends BaseNetActivity {
 
     private void handlerDelete(boolean deleteOk, EmployeesEntity model) {
         if (deleteOk) {
+            ToastUtil.showToast(ct,R.string.delete_succeed_notice1);
             allDatas.remove(model);
             search(TextUtils.isEmpty(voiceSearchView.getText()) ? "" : voiceSearchView.getText().toString());
         } else {