问题反馈：完成

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

@@ -914,8 +914,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         LogUtil.d("onResume end:" + DateFormatUtil.getDateTimeStr());
 
         int new_version_rating = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING);
-        if (new_version_rating == 1 && !CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
-//        if (new_version_rating == 1 && !CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
+        if (new_version_rating != 1 && MyApplication.getInstance().isNetworkActive()){
             showsScoreWindowJudge();  // 显示为UU评分对话框逻辑
         }
     }
@@ -928,21 +927,14 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         if (StringUtils.isEmpty(off_time)) return;
         String cur_time =  TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
         if (cur_time.compareTo(off_time) > 0){
-            new Handler().postDelayed(new Runnable() {
+            new Handler().postDelayed(new Runnable() { // 下班时间
                 @Override
                 public void run() {
                     initScoringWindows();  // 评价UU弹框
                 }
             }, 1000);
-        }else {
-            new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                initScoringWindows();  // 评价UU弹框
-            }
-        }, 1000);
         }
-        Log.i("off_time,cur_time", cur_time.compareTo(off_time) + "");
+        Log.i("off_time,cur_time", off_time + "," +cur_time+":" +cur_time.compareTo(off_time));
     }
 
     @Override

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

@@ -17,6 +17,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -90,7 +91,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     private ArrayList<String> mPhotoList;
     private GridViewAdapter mAdapter;
     private String mImageData;
-    private String cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
+    private String cb_emcode;
 
     //添加位置和查阅人员选择
     private TextView location_tv, display_tv;
@@ -111,8 +112,14 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     if (msg.getData() != null){
                         String word_result = msg.getData().getString("result");
                         Log.i(word_result, msg.getData().getString("result"));
-//                        Toast.makeText(getApplicationContext(), getString(R.string.ask_submit_success), Toast.LENGTH_LONG);
-                        sendPicture();
+                        try {
+                            if (JSON.parseObject(word_result).containsKey("success")
+                                    && JSON.parseObject(word_result).getBoolean("success")) {
+                                sendPicture();
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
@@ -132,8 +139,16 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 case update_ID:
                     if (msg.getData() != null){
                         String updateID_result = msg.getData().getString("result");
-                        Log.i("updateID_result",updateID_result);
-                        Toast.makeText(ct,"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！",Toast.LENGTH_LONG).show();
+                        Log.i("updateID_result", updateID_result);
+                        progressDialog.dismiss();
+                        release_btn.setEnabled(true);
+                        Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                       new Handler().postDelayed(new Runnable() {
+                           @Override
+                           public void run() {
+                               finish();
+                           }
+                       },1000);
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -144,17 +159,22 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             }
         }
     };
+    private Button release_btn;
 
     private void doUpdateId(String update) {
         String url = "http://218.18.115.198:8888/ERP/common/attach/change.action";
         Map<String,Object> params = new HashMap<>();
         params.put("caller","Commentsback_mobile");
         params.put("table","Commentsback_mobile");
-        params.put("update",update);
-        params.put("condtion",cb_id);
+        params.put("update","cb_attch = '"+update+"'");
+        params.put("condition","cb_id = '"+cb_id+"'");
         params.put("type","添加附件");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        if (platform){
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        }else {
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        }
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, update_ID, null, null, "post");
     }
 
@@ -180,6 +200,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     private void initView() {
         location_tv = (TextView) findViewById(R.id.location_tv);
         display_tv = (TextView) findViewById(R.id.display_tv);
+        release_btn = (Button) findViewById(R.id.release_btn);
         findViewById(R.id.release_btn).setOnClickListener(this);
         //findViewById(R.id.location_rl).setOnClickListener(this);
         findViewById(R.id.display_rl).setOnClickListener(this);
@@ -225,7 +246,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void getCommonId() {
-        CommonUtil.getCommonId(ct, "Commentsback_mobile__SEQ", mHandler,common_id_request);
+        CommonUtil.getCommonId(ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
+        cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");;
     }
 
     private void getCode() {
@@ -409,7 +431,12 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
-                sendWord();
+                release_btn.setEnabled(false);
+                if (!platform){
+                    sendWord();
+                }else {
+                    sendPlatWord();
+                }
                 LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
                /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
                     return;
@@ -425,6 +452,37 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     }
 
+    private void sendPlatWord() {
+        if (!StringUtils.isEmpty(mTextEdit.getText().toString())) {
+            String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action";
+            String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
+            if (StringUtils.isEmpty(emname)) {
+                emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
+            }
+            String formStore = "{\n" +
+                    " \"cb_id\":\"" + cb_id + "\",\n" +
+                    " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
+                    " \"cb_code\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") + "\",\n" +
+                    " \"cb_company\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName") + "\",\n" +
+                    " \"cb_whichsys\":\"" + "USOFTSYS" + "\",\n" +
+                    " \"cb_kind\":\"问题\",\n" +
+                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "\",\n" +
+                    " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
+                    " \"cb_person\":\"" + emname + "\",\n" +
+                    " \"cb_tel\":\"" + MyApplication.getInstance().mLoginUser.getTelephone() + "\",\n" +
+                    "}\n";
+            Map<String, Object> params = new HashMap<>();
+            params.put("formStore", formStore);
+            params.put("master", "USOFTSYS");
+            params.put("caller", "Commentsback_mobile");
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+            ViewUtil.httpSendRequest(mContext, url, params, mHandler, headers, http_commit, null, null, "post");
+        } else {
+            ToastMessage(getString(R.string.suggest_hink));
+        }
+    }
+
     private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
         @Override
         protected void onPreExecute() {
@@ -482,7 +540,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 startActivity(new Intent(ct, LoginActivity.class));
             } else if (result == 2) {
                 ProgressDialogUtil.dismiss(mProgressDialog);
-                ToastUtil.showToast(ct, getString(R.string.upload_failed));
+                ToastUtil.showToast(ct, getString(R.string.qzone_upload_failed));
             } else {
                 sendShuoshuo();
             }
@@ -547,7 +605,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ImageView iconImageView = (ImageView) view.findViewById(R.id.icon_image_view);
                 TextView voiceTextTv = (TextView) view.findViewById(R.id.text_tv);
                 iconImageView.setBackgroundResource(R.drawable.add_picture);
-                voiceTextTv.setText(R.string.circle_add_image);
+                voiceTextTv.setText(R.string.qzone_add_picture);
                 return view;
             }
         }
@@ -613,9 +671,16 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         File waterBitmapToFile=  new File(path);
         if (!waterBitmapToFile.isFile())return;
         RequestParams params = new RequestParams();
-        params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-        params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        if (platform){
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+            params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+            params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+
+        }else {
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        }
         params.addBodyParameter("type", "common");
         params.addBodyParameter("img", waterBitmapToFile);
         String url = Constants.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
@@ -636,8 +701,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
             @Override
             public void onSuccess(ResponseInfo<String> responseInfo) {
-                progressDialog.dismiss();
-                ViewUtil.ToastMessage(ct, "上传成功");
+                ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
                 JsonValidator validator = new JsonValidator();
                 if (validator.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     sended_p ++;
@@ -645,7 +709,6 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     Log.i("update_cb_attch",update+"");
                     if (sended_p == mPhotoList.size()){
                         //TODO 更新附件ID接口
-                        ViewUtil.ToastMessage(ct, "开始更新ID操作");
                         doUpdateId(update);
                     }
                 }
@@ -654,7 +717,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
             @Override
             public void onFailure(HttpException error, String msg) {
-                ViewUtil.ToastMessage(ct, "上传失败：" + msg);
+                ViewUtil.ToastMessage(ct, getString(R.string.common_save_failed) + msg);
                 progressDialog.dismiss();
             }
         });

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

@@ -981,7 +981,7 @@ public class CommonUtil {
     }
 
     public static void getCommonId(Context ct, String seq, Handler mHandler, int codeWhat) {
-        String url = Constants.getAppBaseUrl(ct) + "/common/getId.action";
+        String url = "http://218.18.115.198:8888/ERP/common/getId.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("seq", seq);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -1108,4 +1108,6 @@
     <string name="Rated_now">Now to score</string>
     <string name="Rated_suggest">Feedback</string>
     <string name="Rated_next">Next time</string>
+    <string name="fangkui_success">Submitted success, we will be the first time to view your question, thank you for your cooperation!</string>
+    <string name="Uploaded_successfully">Uploaded successfully</string>
 </resources>

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

@@ -1222,4 +1222,6 @@
     <string name="Rated_now">现在去评分</string>
     <string name="Rated_suggest">问题反馈</string>
     <string name="Rated_next">以后再说</string>
+    <string name="fangkui_success">提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
+    <string name="Uploaded_successfully">上传成功</string>
 </resources>

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

@@ -1214,4 +1214,6 @@
     <string name="Rated_now">現在去評分</string>
     <string name="Rated_suggest">問題反饋</string>
     <string name="Rated_next">下次再​​說</string>
+    <string name="fangkui_success">提交成功,我們會在第一時間查看您的問題,謝謝您的配合！</string>
+    <string name="Uploaded_successfully">上傳成功</string>
 </resources>

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

@@ -1569,4 +1569,6 @@
     <string name="Rated_now">现在去评分</string>
     <string name="Rated_suggest">问题反馈</string>
     <string name="Rated_next">下次再说</string>
+    <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
+    <string name="Uploaded_successfully">上传成功</string>
 </resources>