新的加班申请单据反提交删除操作完成。3

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

@@ -339,7 +339,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         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 ")){
+                                && JSON.parseObject(new_doc_resub_result).getBoolean("success")){
                             startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
@@ -358,7 +358,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         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 ")) {
+                                && JSON.parseObject(new_doc_redelete_result).getBoolean("success")) {
                             DeleteComDocRequest(mCaller, mkeyValue);
                         }
                     }

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/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>