1.修复闪退问题

2.处理个别翻译遗漏问题
3.处理CRm2.0个别错误问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -185,20 +185,15 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        this.onSaveInstanceState(outState, null);
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) {
         outState.putString(AppConstant.EXTRA_USER_ID, userId);
         outState.putString(AppConstant.EXTRA_NICK_NAME, userName);
         outState.putString("phone", phone);
         outState.putString(AppConstant.EXTRA_EM_CODE, emcode);
         outState.putString("mLoginUserId", mLoginUserId);
-        super.onSaveInstanceState(outState, outPersistentState);
+        super.onSaveInstanceState(outState);
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ChangeMobileActivity.java

@@ -10,7 +10,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -162,7 +161,7 @@ public class ChangeMobileActivity extends BaseActivity {
     }
 
     private void endActivity() {
-        Toast.makeText(ct, R.string.change_signin_ok, Toast.LENGTH_SHORT).show();
+        ToastUtil.showToast(ct, R.string.change_signin_ok);
         Intent intent = new Intent();
         intent.putExtra("isChange", true);
         if (type == 2) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/entity/SelectCollisionTurnBean.java

@@ -3,6 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.entity;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 
 import java.util.List;
@@ -14,8 +16,8 @@ import java.util.List;
 public class SelectCollisionTurnBean implements Parcelable {
 
     private String title;//标题
-    private String sureText = "确定";//选择按钮显示
-    private String selectType = "人员";//提示选择的类型
+    private String sureText = MyApplication.getInstance().getString(R.string.common_sure);//选择按钮显示
+    private String selectType = MyApplication.getInstance().getString(R.string.personnel);//提示选择的类型
     private boolean reBackSelect = true;//是否返回选中人员，否返回非选中人员
     private String selectCode;//选中的人员Code
     private int resultCode = 0x20;//返回的code

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectCollisionPresenter.java

@@ -73,7 +73,7 @@ public class SelectCollisionPresenter {
     public void changeChecked(boolean b, List<BaseSortModel<SelectEmUser>> listData) {
         if (ListUtils.isEmpty(listData)) {
             //TODO
-        } else {
+    } else {
             for (int i = 0; i < listData.size(); i++) {
                 listData.get(i).setClick(b);
             }

WeiChat/src/main/res/values-en/strings.xml

@@ -1145,4 +1145,5 @@
     <string name="mobile_change_name">变更理由</string>
     <string name="input_reason">请填写理由</string>
     <string name="change_signin_ok">申诉成功!</string>
+    <string name="personnel">人员</string>
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -667,6 +667,7 @@
     <string name="mobile_change_name">变更理由</string>
     <string name="input_reason">请填写理由</string>
     <string name="change_signin_ok">申诉成功!</string>
+    <string name="personnel">人员</string>
 
 
     <!--end by Bitliker-->

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -638,7 +638,7 @@
     <string name="mobile_change_name">變更理由</string>
     <string name="input_reason">請填寫理由</string>
     <string name="change_signin_ok">申訴成功！</string>
-
+    <string name="personnel">人員</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

WeiChat/src/main/res/values/strings.xml

@@ -1596,4 +1596,5 @@
     <string name="mobile_mac">手机mac地址</string>
     <string name="mobile_change_name">变更理由</string>
     <string name="input_reason">请填写理由</string>
+    <string name="personnel">人员</string>
 </resources>