11:08,

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

@@ -120,7 +120,6 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                                 cb_id = JSON.parseObject(word_result).getInteger("cb_id");
                                 cb_code = JSON.parseObject(word_result).getString("cb_code");
                                 Log.i("cb_id,cb_code",+cb_id+","+cb_code);
-//                                sendPicture();
                                 Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
                                 finish();
                             }
@@ -440,15 +439,15 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
-                if (!platform){
+//                if (!platform){
                     if (ListUtils.isEmpty(mPhotoList)){
                         ToastMessage(getString(R.string.please_add_image));
                     }else {
                         newSendWord();
                     }
-                }else {
-                    sendPlatWord();
-                }
+//                }else {
+//                    sendPlatWord();
+//                }
                 LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
                /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
                     return;
@@ -689,7 +688,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     " \"em_code\":\"" + "U0305" + "\",\n" +
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
-                    " \"cb_kind\":\"问题\",\n" +
+                    " \"cb_kind\":\"问题反馈\",\n" +
                     " \"cb_text\":\"" + mTextEdit.getText().toString() + "（来自ANDROID）"+"\",\n" +
                     " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
                     " \"cb_person\":\"" + emname + "\",\n" +
@@ -697,7 +696,12 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     "}\n";
             RequestParams params = new RequestParams();
             params.addQueryStringParameter("master","USOFTSYS");
-            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            if (!platform) {
+                params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            }else  {
+                params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+            }
+
             params.addBodyParameter("formStore", formStore);
             params.addBodyParameter("type", "common");
             params.addBodyParameter("caller", "Commentsback_mobile");

libbdupdatesdk/src/main/res/values/bdp_update_strings.xml

@@ -11,7 +11,7 @@
     <string name="bdp_update_action_download">立即升级</string>
     <string name="bdp_update_action_install">立即安装</string>
     <string name="bdp_update_not_now">暂不升级</string>
-    <string name="bdp_update_ignore">暂不升级</string>
+    <string name="bdp_update_ignore">忽略</string>
     
     <string name="bdp_update_new_download">发现新版本，点击更新</string>
     <string name="bdp_update_download_complete">新版本下载完成，点击安装</string>