Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml
#	WeiChat/src/main/res/values/strings.xml

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

@@ -19,7 +19,6 @@ import android.os.PersistableBundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -36,10 +35,7 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
-import com.baidu.autoupdatesdk.AppUpdateInfo;
-import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
-import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -655,7 +651,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
             public void onCheckComplete() {
-                //发现新版本就初始化这个值保证下次“为UU评分”弹出，直至升级，对：就是这么流氓，叫你不升级我弹死你
+               /* //发现新版本就初始化这个值保证下次“为UU评分”弹出，直至升级，对：就是这么流氓，叫你不升级我弹死你
                 BDAutoUpdateSDK.cpUpdateCheck(MainActivity.this,
                         new CPCheckUpdateCallback() {
 
@@ -677,7 +673,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                                 }
                                 progressDialog.dismiss();
                             }
-                        });
+                        });*/
             }
         });
         Log.i("NEW_VERSION_RATING", PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING) + "");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -90,6 +90,7 @@ public class DataDownloadActivity extends BaseActivity {
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(android.os.Message msg) {
+            if (manager==null)manager=new DBManager();
             switch (msg.what) {
                 case LOAD_COMPANY_DATA:
                     Log.i("newdata", "handleMessage:" + msg.getData().getString("result"));

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

@@ -618,7 +618,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
     public void phoneAction(final String phone) {
         MaterialDialog dialog = new MaterialDialog.Builder(this).title(getString(R.string.dialog_confim_phone)).content(getString(R.string.dialog_phone)+":" + phone)
-                .positiveText("拨打").negativeText("取消").autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
+                .positiveText(getString(R.string.dialog_phone_action)).negativeText(getString(R.string.common_cancel)).autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onPositive(MaterialDialog dialog) {
                         // 用intent启动拨打电话
@@ -645,13 +645,13 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         editText.setLayoutParams(
                 new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.say_hello_dialog_title)
-                .setView(editText).setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setView(editText).setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         final String text = editText.getText().toString().trim();
                         doSayHello(text);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -761,7 +761,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.set_remark_name).setView(editText)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String input = editText.getText().toString().trim();
@@ -781,7 +781,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         }
                         remarkFriend(friend, input);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -843,12 +843,12 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
                 .setMessage(R.string.cancel_attention_prompt)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         deleteFriend(friend, 0);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -858,12 +858,12 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
                 .setMessage(R.string.delete_all_prompt)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         deleteFriend(friend, 1);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -919,7 +919,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     showMenu = false;
                     invalidateOptionsMenu();
                     // Action Btn设置为打招呼
-                    do_next_tv.setText(R.string.add_attention);
+                    do_next_tv.setText(R.string.friend_add);
                     do_next_tv.setOnClickListener(new AddAttentionListener());
                 }
                 ProgressDialogUtil.dismiss(mProgressDialog);
@@ -941,7 +941,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
                 .setMessage(messageId)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
@@ -952,7 +952,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         }
 
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -1047,7 +1047,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                             FriendHelper.addFriendExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         default:// 其他，理论上不可能
-                            do_next_tv.setText(R.string.add_attention);
+                            do_next_tv.setText(R.string.friend_add);
                             do_next_tv.setOnClickListener(new AddAttentionListener());
                             break;
                     }

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

@@ -65,6 +65,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
     private static final int COM_DOC_RESUB_SUCCESSFUL = 1213;
     private static final int COM_DOC_REDELETE_SUCCESSFUL = 1215;
+    private static final int NEW_DOC_RESUB_SUCCESSFUL = 52601;
+    private static final int New_DOC_REDELETE_SUCCESSFUL = 52602;
+    private static final int NEW_DELETE_DOC_REQUEST = 52603;
     @ViewInject(R.id.common_docui_photo_img)
     private ImageView photo_im;
     @ViewInject(R.id.common_docui_name_tv)
@@ -194,25 +197,25 @@ public class CommonDocDetailsActivity extends BaseActivity {
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + "详情");
             }
             if ("FeePlease!CCSQ".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oatravel_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oatravel_apply)+ "详情");
             }
-            if ("Workovertime".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply)+ getString(R.string.doc_detail));
+            if ("Workovertime".equals(mCaller) || "ExtraWork$".equals(mCaller)) {
+                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply)+ "详情");
             }
             if ("SpeAttendance".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply)+ "详情");
             }if ("MaterielApply".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply)+ "详情");
             } else if ("MainTain".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaservice_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaservice_apply)+ "详情");
             }if ("StandbyApplication".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply)+ "详情");
             } else
             if (!StringUtils.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title")+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(intent.getStringExtra("title")+ "详情");
             }
             //请求获取单据提交内容数据
             progressDialog.show();
@@ -294,6 +297,17 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     FormListSelectActivity.reload=false;
                     finish();
                     break;
+                case  NEW_DELETE_DOC_REQUEST:
+                    if (msg.getData() != null){
+                        String new_delete_doc_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_delete_doc_result", new_delete_doc_result);
+                        Toast.makeText(getApplicationContext(), getString(R.string.common_delete), Toast.LENGTH_LONG).show();
+                        progressDialog.dismiss();
+                        FormListSelectActivity.isdelete = true;
+                        FormListSelectActivity.reload=false;
+                        finish();
+                    }
+                    break;
                 case COM_DOC_RESUB_SUCCESSFUL:  //已提交状态 重新提交操作前的反提交
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
@@ -319,6 +333,36 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         }
                     }
                     break;
+                case NEW_DOC_RESUB_SUCCESSFUL:
+                    if (msg.getData() != null){
+                        String new_doc_resub_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_doc_resub_result", new_doc_resub_result + "");
+                        if (StringUtils.isEmpty(new_doc_resub_result)) return;
+                        if (JSON.parseObject(new_doc_resub_result).containsKey("success")
+                                && JSON.parseObject(new_doc_resub_result).getBoolean("success")){
+                            startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("submittype", "resubmit")
+                                    .putExtra("status","已提交"));
+
+                            finish();
+                        }
+
+                    }
+                    break;
+
+                case New_DOC_REDELETE_SUCCESSFUL:
+                    if (msg.getData() != null){
+                        String new_doc_redelete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_doc_redelete_result", new_doc_redelete_result);
+                        if (StringUtils.isEmpty(new_doc_redelete_result)) return;
+                        if (JSON.parseObject(new_doc_redelete_result).containsKey("success")
+                                && JSON.parseObject(new_doc_redelete_result).getBoolean("success")) {
+                            DeleteComDocRequest(mCaller, mkeyValue);
+                        }
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
                     if (!TextUtils.isEmpty(real_status) && real_status.equals("已审核")) {
@@ -338,15 +382,20 @@ public class CommonDocDetailsActivity extends BaseActivity {
      * @param mkeyValue
      */
     private void DeleteComDocRequest(String mCaller, int mkeyValue) {
-
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commondelete.action";
         Map<String, Object> formStoreMap = new HashMap<>();
         HashMap<String, Object> params = new HashMap<>();
         params.put("caller", mCaller);
         params.put("id", mkeyValue);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, DELETE_DOC_REQUEST, null, null, "get");
+        String url = "";
+        if ("ExtraWork$".equals(mCaller)){
+            url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/hr/attendance/deleteExtraWork.action";
+            ViewUtil.httpSendRequest(this, url, params, mHandler, headers, NEW_DELETE_DOC_REQUEST, null, null, "post");
+        }else {
+            url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commondelete.action";
+            ViewUtil.httpSendRequest(this, url, params, mHandler, headers, DELETE_DOC_REQUEST, null, null, "get");
+        }
 
     }
 
@@ -779,13 +828,20 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialog, int which) {
-                                        String url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
                                         Map<String, Object> params = new HashMap<>();
                                         params.put("caller", mCaller);
                                         params.put("id", mkeyValue);
                                         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
                                         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-                                        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
+                                        String url = "";
+                                        if ("ExtraWork$".equals(mCaller)){ // 新的加班单反提交
+                                            url = Constants.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, NEW_DOC_RESUB_SUCCESSFUL, null, null, "post");
+
+                                        }else { // 通用老的反提交
+                                            url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
+                                        }
 
                                     }
                                 }).show();
@@ -823,14 +879,21 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 @Override
                                     public void onClick(DialogInterface dialog, int which) {  //反提交
                                         progressDialog.show();
-                                        String url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
-                                        Map<String, Object> params = new HashMap<>();
-                                        params.put("caller", mCaller);
-                                        params.put("id", mkeyValue);
-                                        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-                                        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+
+                                    Map<String, Object> params = new HashMap<>();
+                                    params.put("caller", mCaller);
+                                    params.put("id", mkeyValue);
+                                    LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                                    headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                                    String url = "";
+                                    if ("ExtraWork$".equals(mCaller)){ // 新的加班单反提交
+                                        url = Constants.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, New_DOC_REDELETE_SUCCESSFUL, null, null, "post");
+                                    }else { // 通用老的反提交
+                                        url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
                                         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_REDELETE_SUCCESSFUL, null, null, "post");
                                     }
+                                    }
                                 }).show();
                 }
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -591,7 +591,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     }
 
                     if (mLists.isEmpty()) {
-                        mLists.add("无");
+                        mLists.add(getString(R.string.no_));
                     }
                     showSimpleDialog(et_cu_kind, getString(R.string.client_type));
                     break;
@@ -615,11 +615,11 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case UNCOMMIT:
                     progressDialog.dismiss();
-                    ToastMessage("反提交成功！");
+                    ToastMessage(getString(R.string.Operation_succeeded));
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     bt_uncommit.setVisibility(View.GONE);
                     bt_commit.setVisibility(View.VISIBLE);
-                    mMenu.findItem(R.id.btn_save).setTitle("更新");
+                    mMenu.findItem(R.id.btn_save).setTitle(getString(R.string.common_update_button));
                     mMenu.findItem(R.id.btn_save).setVisible(true);
                     //bt_save.setVisibility(View.GONE);
                     disableEdit(true);
@@ -1084,7 +1084,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     commit(COMMIT, mCuId);
                 } else {
                     new AlertDialog.Builder(this).setTitle(getString(R.string.common_notice))
-                            .setMessage("您修改了部分内容，请先更新后提交")
+                            .setMessage(getString(R.string.CRM_current_page_change_ecet))
                             .setPositiveButton(getString(R.string.common_sure), null).show();
                 }
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -484,7 +484,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         LogUtil.d("result:" + result);
                         LogUtil.d(formidkey);
                         success = JSON.parseObject(result).getBoolean("success");
-                        va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        if ("ExtraWork$".equals(caller)){
+                            va_id = JSON.parseObject(result).getIntValue("wod_id");
+                        }else{
+                            va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        }
                         if (success) {
 
                             judgeApprovers(va_id);
@@ -654,9 +658,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 } else if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
                     d_startDate = "wod_startdate";
                     d_endDate = "wod_enddate";
-                    formidkey = "wo_id";
-                    detailkey_id = "wod_id";
-                    detailkey_did = "wod_woid";
+                    if ("ExtraWork$".equals(caller)){
+                        formidkey = "wod_id";//主表id  ---适应接口频繁调整
+                    }else{
+                        formidkey = "wo_id";//主表id
+                    }
+                    detailkey_id = "wod_id";//明细id
+                    detailkey_did = "wod_woid";//主表id
                     getSupportActionBar().setTitle("加班单");
                 } else if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
                     startDate = "fp_prestartdate";
@@ -2115,7 +2123,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         click_btn.setEnabled(false);
-        String url = Constants.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
+        String url =null;
+        if ("ExtraWork$".equals(caller)){
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
+        }else{
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
+        }
         Map<String, Object> params = new HashMap<>();
         params.put("caller", caller);
         params.put("formStore", formStore);
@@ -2323,10 +2336,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         btn_update.setEnabled(false);
-        String url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
+
+        String url =null;
         Map<String, Object> params = new HashMap<>();
+        if ("ExtraWork$".equals(caller)){
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkUpdateAndSubmit.action";
+            params.put("id", String.valueOf(formid));
+        }else{
+            url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
+            params.put("keyid", String.valueOf(formid));
+        }
         params.put("caller", caller);
-        params.put("keyid", String.valueOf(formid));
         params.put("formStore", formStore);
         params.put("gridStore", gridStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -431,7 +431,6 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
-                release_btn.setEnabled(false);
                 if (!platform){
                     sendWord();
                 }else {
@@ -647,7 +646,10 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void sendPicture() {
-        if (ListUtils.isEmpty(mPhotoList))  return;
+        if (ListUtils.isEmpty(mPhotoList))  {
+            Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+            finish();
+        }
         for (int i = 0; i < mPhotoList.size(); i++) {
             String path = mPhotoList.get(i);
             sendPictureRequest(path);

WeiChat/src/main/res/layout/activity_client.xml

@@ -241,12 +241,21 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
-
+                  <!--  <ImageView
+                        android:layout_toLeftOf="@id/iv_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />-->
+                  
                     <ImageView
+                        android:id="@+id/iv_sale"
                         android:layout_width="240dp"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/ic_sale_brief" />
+                       android:layout_height="wrap_content"
+                       android:layout_centerInParent="true"
+                       android:src="@drawable/ic_sale_brief" />
+                 <!--   <ImageView
+                        android:layout_toRightOf="@id/iv_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />-->
 
                     <!--   <ImageButton style="@style/crm_ib_card_topRight"
                            android:id="@+id/ib_sale_condition" />-->

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -524,7 +524,7 @@
                 android:gravity="center"
                 android:textSize="18sp"
                 android:visibility="gone"
-                android:text="提交"/>
+                android:text="@string/common_submit_button"/>
             <TextView
                 android:id="@+id/bt_uncommit"
                 android:layout_width="match_parent"
@@ -536,7 +536,7 @@
                 android:gravity="center"
                 android:textSize="18sp"
                 android:visibility="gone"
-                android:text="反提交"/>
+                android:text="@string/unsubmit"/>
             
         </LinearLayout>
     </LinearLayout>

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

@@ -611,8 +611,8 @@
         <string name = "user_setting"> Settings </string>
         <string name = "user_scan"> scan </string>
 
-        <string name = "user_dialog_company"> select login UAS A / C> </string>
-        <string name = "user_dialog_master"> switch the A / C set </string>
+        <string name = "user_dialog_company"> Choose to log in UAS A / C set </string>
+        <string name = "user_dialog_master"> Switch A / C set </string>
         <string name = "user_master_success"> A / C Set to success </string>
         <string name = "user_master_fai"> A / C set</string>
 
@@ -647,7 +647,7 @@
         <string name = "sports_recode_distance"> Walking+Running Distance(estimated) </string>
         <string name = "sports_kilometre"> km </string>
         <string name = "sports_tody"> today </string>
-        <string name = "sports_step"> step </string>
+        <string name = "sports_step"> steps </string>
         <string name = "sports_step_tody"> Steps </string>
         <string name = "sports_recode_more"> More history </string>
 
@@ -1021,7 +1021,7 @@
     </string-array>
     <string name="daily_record">Daily Record</string>
     <string name = "search1"> find </string>
-    <string name = "formal_customer"> official client </string>
+    <string name = "formal_customer"> Formal customer </string>
     <string name = "client_yu_luru"> customer pre-entry </string>
     <string name = "client_type"> Type </string>
     <string name = "common_select1"> Please select </string>
@@ -1217,6 +1217,26 @@
     <string name = "holiday_date6"> October 1 ~ October 8 a total of 8 days of retreat; September 30 to work </string>
     <string name = "hour">hour</string>
     <string name = "remove_blacklist"> remove the blacklist </string>
+    <string name = "say_hello"> Say hello </string>
+    <string name = "send_msg"> send a message </string>
+    <string name = "say_hello_succ"> Say hello success </string>
+    <string name = "add_friend_succ"> add friends success </string>
+    <string name = "error_phone"> phone format is not correct </string>
+    <string name = "say_hello_dialog_title"> Verify the message </string>
+    <string name = "say_hello_dialog_hint"> pro, give me a reason to add you! </string>
+    <string name = "say_hello_default"> Hey, hello! </string>
+    <string name = "add_attention_succ"> Attention to success </string>
+    <string name = "add_attention_failed"> Attention Failed, you have been blacklisted by each other </string>
+    <string name = "set_remark_name"> set the note name </string>
+    <string name = "remove_blacklist_succ"> remove the blacklist succeed </string>
+    <string name = "cancel_attention_prompt"> Are you sure you want to cancel your attention? </string>
+    <string name = "delete_all_prompt"> completely delete the operation, if the other side is also concerned about you, then it will cancel the other side of your concern, sure to completely delete it? </string>
+    <string name = "cancel_attention_succ"> cancel attention successfully </string>
+    <string name = "prompt_title"> prompt </string>
+    <string name = "delete_all_succ"> delete success </string>
+    <string name = "remove_blacklist_prompt"> Are you sure you want to remove the blacklist? </string>
+    <string name = "add_blacklist_prompt"> Are you sure you want to add a blacklist? </string>
+    <string name = "add_blacklist_succ"> add blacklist success </string>
     <string name="is_must_input">is required</string>
 
     <string name="contect_is_much">联系人为必填项</string>

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

@@ -1320,4 +1320,21 @@
     <string name="say_hello_succ">打招呼成功</string>
     <string name="add_friend_succ">加好友成功</string>
     <string name="error_phone">手机格式不正确</string>
+    <string name="say_hello_dialog_title">验证消息</string>
+    <string name="say_hello_dialog_hint">亲，给我个加你的理由吧！</string>
+    <string name="say_hello_default">嘿，你好！</string>
+    <string name="add_attention_succ">加关注成功</string>
+    <string name="add_attention_failed">加关注失败，你已被对方加入黑名单</string>
+    <string name="set_remark_name">设置备注名称</string>
+    <string name="remove_blacklist_succ">移出黑名单成功</string>
+    <string name="cancel_attention_prompt">确定要取消关注吗？</string>
+    <string name="delete_all_prompt">彻底删除操作，如果对方也关注了你，那么也将取消对方对你的关注，确定要彻底删除吗？</string>
+    <string name="cancel_attention_succ">取消关注成功</string>
+    <string name="prompt_title">提示</string>
+    <string name="delete_all_succ">删除成功</string>
+    <string name="remove_blacklist_prompt">确定要移出黑名单吗</string>
+    <string name="add_blacklist_prompt">确定要加入黑名单吗？</string>
+    <string name="add_blacklist_succ">加入黑名单成功</string>
+    <string name="unsubmit">反提交</string>
+    <string name="Operation_succeeded">反提交成功</string>
 </resources>

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

@@ -1306,4 +1306,26 @@
    <string name="holiday_date5">5月28日~5月30日 共3天 調休;5月27日上班</string>
    <string name="holiday_date6">10月1日~10月8日 共8天 調休;9月30日上班</string>
     <string name="remove_blacklist">移出黑名單</string>
+    <string name="say_hello">打招呼</string>
+    <string name="send_msg">發消息</string>
+    <string name="say_hello_succ">打招呼成功</string>
+    <string name="add_friend_succ">加好友成功</string>
+    <string name="error_phone">手機格式不正確</string>
+    <string name="say_hello_dialog_title">驗證消息</string>
+    <string name="say_hello_dialog_hint">親，給我個加你的理由吧！ </string>
+    <string name="say_hello_default">嘿，你好！ </string>
+    <string name="add_attention_succ">加關注成功</string>
+    <string name="add_attention_failed">加關注失敗，你已被對方加入黑名單</string>
+    <string name="set_remark_name">設置備註名稱</string>
+    <string name="remove_blacklist_succ">移出黑名單成功</string>
+    <string name="cancel_attention_prompt">確定要取消關注嗎？ </string>
+    <string name="delete_all_prompt">徹底刪除操作，如果對方也關注了你，那麼也將取消對方對你的關注，確定要徹底刪除嗎？ </string>
+   <string name="cancel_attention_succ">取消關注成功</string>
+    <string name="prompt_title">提示</string>
+    <string name="delete_all_succ">刪除成功</string>
+    <string name="remove_blacklist_prompt">確定要移出黑名單嗎</string>
+    <string name="add_blacklist_prompt">確定要加入黑名單嗎？ </string>
+    <string name="add_blacklist_succ">加入黑名單成功</string>
+    <string name="unsubmit">unsubmit</string>
+    <string name="Operation_succeeded">Operation succeeded</string>
 </resources>

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

@@ -1650,4 +1650,6 @@
     <string name="holiday_date6">10月1日~10月8日  共8天  调休;9月30日上班</string>
     <string name="not_message_and_add">没有找到数据，请点击右上角的+进行添加</string>
 
+    <string name="unsubmit">反提交</string>
+    <string name="Operation_succeeded">反提交成功</string>
 </resources>