Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into fix_bug

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

@@ -285,7 +285,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
             }
         });
 
-        mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+       /* mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mClickPosition = (int) parent.getItemIdAtPosition(position);
@@ -294,7 +294,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 intent.putExtra("public_message", message);
                 startActivityForResult(intent,REQUEST_CODE_GET_SHUOSHUODETAIL_BACK);
             }
-        });
+        });*/
 
         mPullToRefreshListView.getRefreshableView().setOnScrollListener(
                 new PauseOnScrollListener(ImageLoader.getInstance(), true, true, new AbsListView.OnScrollListener() {

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

@@ -42,7 +42,7 @@ import java.util.Map;
 /**
  * Created by FANGlh on 2016/11/1.
  */
-public class WorkDailyAddActivity extends BaseActivity{
+public class WorkDailyAddActivity extends BaseActivity {
 
     private static final int DAILY_SUBMITTED_SUCCESSFULLY = 1101;  //提交请求成功后返回
     private static final int CLEAR_AF_UPDATE_DOC_STATE = 1208;
@@ -53,7 +53,7 @@ public class WorkDailyAddActivity extends BaseActivity{
     private boolean imOk = false;
     private boolean erpOk = false;
     private boolean isSbmit = false;
-    private  int mkeyValue;
+    private int mkeyValue;
     private TextView summary_limit_tv;
     private TextView plan_limit_tv;
     private TextView experience_limit_tv;
@@ -77,18 +77,18 @@ public class WorkDailyAddActivity extends BaseActivity{
                 case DAILY_SUBMITTED_SUCCESSFULLY:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                            String result  = msg.getData().getString("result");
+                            String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("submit_message", result);
                             if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
-                                   Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
-                                try{
+                                Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
+                                try {
                                     JSONObject resultJsonObject = new JSONObject(result);
                                     JSONArray data_message_list = resultJsonObject.getJSONArray("data");
                                     JSONObject data_first_message = data_message_list.getJSONObject(0);
                                     mkeyValue = data_first_message.getInt("WD_ID");
-                                    Log.i("First_mkeyValue",mkeyValue +" ");
+                                    Log.i("First_mkeyValue", mkeyValue + " ");
 //                                    or  mkeyValue= new JSONObject(result).getJSONObject("data").getInt("WD_ID");
-                                }catch (JSONException e){
+                                } catch (JSONException e) {
                                     e.printStackTrace();
                                 }
                                 jumptododetail(mkeyValue);
@@ -104,12 +104,12 @@ public class WorkDailyAddActivity extends BaseActivity{
                     }
                     break;
                 case CLEAR_AF_UPDATE_DOC_STATE:
-                    if (msg.getData() != null){
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("updata_message", result);
-                            if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")){
-                                if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")){
+                            if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
+                                if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")) {
                                     ToastMessage("工作日报更新成功");
 
                                     // 更新之后再提交覆盖之前同id单据
@@ -119,7 +119,7 @@ public class WorkDailyAddActivity extends BaseActivity{
                                     params.put("id", mkeyValue);
                                     LinkedHashMap<String, Object> last_headers = new LinkedHashMap<>();
                                     last_headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-                                    ViewUtil.httpSendRequest(ct, url, params, handler, last_headers,LAST_SUBMIT_SUCCESSFULLY , null, null, "post");
+                                    ViewUtil.httpSendRequest(ct, url, params, handler, last_headers, LAST_SUBMIT_SUCCESSFULLY, null, null, "post");
 
                                 }
                             }
@@ -128,8 +128,8 @@ public class WorkDailyAddActivity extends BaseActivity{
                     break;
 
                 case LAST_SUBMIT_SUCCESSFULLY:
-                    if (msg.getData() != null){
-                        if(!StringUtils.isEmpty(msg.getData().getString("result"))){
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("LAST_SUBMIT_message", result);
                             Toast.makeText(ct, "工作日报重新提交成功", Toast.LENGTH_SHORT).show();
@@ -155,13 +155,13 @@ public class WorkDailyAddActivity extends BaseActivity{
     private String last_change_plan;
     private String last_change_summary;
 
-    public void jumptododetail(int mkeyValue){
-        Intent intent = new Intent(activity,DailydetailsActivity.class);
+    public void jumptododetail(int mkeyValue) {
+        Intent intent = new Intent(activity, DailydetailsActivity.class);
         intent.putExtra("Date", TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        intent.putExtra("caller","WorkDaily");
-        intent.putExtra("ID",mkeyValue);
-        intent.putExtra("fromwhere","submitdaily");
-        intent.putExtra("Content",add_summary.getText().toString());
+        intent.putExtra("caller", "WorkDaily");
+        intent.putExtra("ID", mkeyValue);
+        intent.putExtra("fromwhere", "submitdaily");
+        intent.putExtra("Content", add_summary.getText().toString());
         intent.putExtra("Status", "待审批");
         intent.putExtra("Plan", add_plan.getText().toString());
         intent.putExtra("Experience", add_experience.getText().toString());
@@ -202,43 +202,43 @@ public class WorkDailyAddActivity extends BaseActivity{
         if (item.getItemId() == android.R.id.home) {
             if (add_summary.getText().toString().length() > 0 ||
                     add_plan.getText().toString().length() > 0 ||
-                    add_experience.getText().toString().length() > 0){
-                 new AlertDialog
-                         .Builder(mContext)
-                         .setTitle("温馨提示")
-                         .setMessage("您当前页面存在未提交数据,退出数据将被清空,是否继续退出？")
-                         .setNegativeButton("取消",null)
-                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                             @Override
-                             public void onClick(DialogInterface dialog, int which) {
-                                 finish();
-                                 return;
-                             }
-                         }).show();
-            }else {
+                    add_experience.getText().toString().length() > 0) {
+                new AlertDialog
+                        .Builder(mContext)
+                        .setTitle("温馨提示")
+                        .setMessage("您当前页面存在未提交数据,退出数据将被清空,是否继续退出？")
+                        .setNegativeButton("取消", null)
+                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                finish();
+                                return;
+                            }
+                        }).show();
+            } else {
                 finish();
             }
         }
-        return  true;
+        return true;
     }
 
     @Override
     public void onBackPressed() {
         if (add_summary.getText().toString().length() > 0 ||
                 add_plan.getText().toString().length() > 0 ||
-                add_experience.getText().toString().length() > 0){
+                add_experience.getText().toString().length() > 0) {
             new AlertDialog
                     .Builder(mContext)
                     .setTitle("温馨提示")
                     .setMessage("您当前页面存在未提交数据,退出数据将被清空,是否继续退出？")
-                    .setNegativeButton("取消",null)
+                    .setNegativeButton("取消", null)
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             finish();
                         }
                     }).show();
-        }else {
+        } else {
             super.onBackPressed();
         }
 
@@ -261,14 +261,16 @@ public class WorkDailyAddActivity extends BaseActivity{
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (add_summary.getText().toString().length() > 500){
+                if (add_summary.getText().toString().length() > 500) {
                     summary_limit_tv.setVisibility(View.VISIBLE);
-                }else{
+                } else {
                     summary_limit_tv.setVisibility(View.GONE);
                 }
             }
+
             @Override
             public void afterTextChanged(Editable s) {
                 last_change_summary = add_summary.getText().toString();
@@ -316,38 +318,42 @@ public class WorkDailyAddActivity extends BaseActivity{
         });
         // 判断有没从详情界面返回的 未提交单据的数据
         Intent intent = getIntent();
-        if(intent.getStringExtra("UC_Summary") != null){
+        if (intent.getStringExtra("UC_Summary") != null) {
             add_summary.setText(intent.getStringExtra("UC_Summary"));
-        }else{add_summary.setText("");}
-        if(intent.getStringExtra("UC_Plan") != null){
+        } else {
+            add_summary.setText("");
+        }
+        if (intent.getStringExtra("UC_Plan") != null) {
             add_plan.setText(intent.getStringExtra("UC_Plan"));
-        }else{
-            add_plan.setText("");}
-        if(intent.getStringExtra("UC_Experience") != null){
+        } else {
+            add_plan.setText("");
+        }
+        if (intent.getStringExtra("UC_Experience") != null) {
             add_experience.setText(intent.getStringExtra("UC_Experience"));
-        }else{
-            add_experience.setText("");}
+        } else {
+            add_experience.setText("");
+        }
 
         // 判断有没从详情界面返回的 重新提交的数据
         resubmit = intent.getStringExtra("resubmit");
-        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")){
+        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")) {
             add_submit.setText("重新提交");
-            if (!TextUtils.isEmpty(intent.getStringExtra("rs_summary"))){
+            if (!TextUtils.isEmpty(intent.getStringExtra("rs_summary"))) {
                 add_summary.setText(intent.getStringExtra("rs_summary"));
             }
 
-            if (!TextUtils.isEmpty(intent.getStringExtra("rs_plan"))){
+            if (!TextUtils.isEmpty(intent.getStringExtra("rs_plan"))) {
                 add_plan.setText(intent.getStringExtra("rs_plan"));
-            }else {
+            } else {
                 add_plan.setText("");
             }
-            if (!TextUtils.isEmpty(intent.getStringExtra("rs_experience"))){
+            if (!TextUtils.isEmpty(intent.getStringExtra("rs_experience"))) {
                 add_experience.setText(intent.getStringExtra("rs_experience"));
-            }else {
+            } else {
                 add_experience.setText("");
             }
-            mkeyValue = intent.getIntExtra("id",0);
-            Log.i("resubmit_mkeyValue",mkeyValue + "");
+            mkeyValue = intent.getIntExtra("id", 0);
+            Log.i("resubmit_mkeyValue", mkeyValue + "");
         }
 
 
@@ -418,17 +424,17 @@ public class WorkDailyAddActivity extends BaseActivity{
 
 
         //执行重新提交之更改单据状态操作
-        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0){
+        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) {
             String sb_summary = string2Json(last_change_summary);
             String sb_plan = string2Json(last_change_plan);
-            String sb_experience= string2Json(last_change_experience);
+            String sb_experience = string2Json(last_change_experience);
 
             Map<String, Object> formStoreMap2 = new HashMap<>();
             formStoreMap2.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
             formStoreMap2.put("wd_comment", sb_summary);
             formStoreMap2.put("wd_plan", sb_plan);
             formStoreMap2.put("wd_experience", sb_experience);
-            formStoreMap2.put("WD_ID", mkeyValue);
+            formStoreMap2.put("wd_id", String.valueOf(mkeyValue));   //这个地方之前传int类型调试很久都更新不了，只能用String类型，不明白后台处理机制
             //更新单据数据
             String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/oa/persontask/updateWorkDaily.action";
             HashMap<String, Object> params = new HashMap<>();
@@ -441,7 +447,7 @@ public class WorkDailyAddActivity extends BaseActivity{
             ViewUtil.httpSendRequest(this, url, params, handler, headers, CLEAR_AF_UPDATE_DOC_STATE, null, null, "post");
             Log.i("flhupdatedaily: ", formStore2);
 
-        }else {
+        } else {
             s1 = string2Json(s1);
             s2 = string2Json(s2);
             s3 = string2Json(s3);
@@ -464,8 +470,10 @@ public class WorkDailyAddActivity extends BaseActivity{
         }
 
     }
+
     /**
      * JSON字符串特殊字符处理，比如：“\A1;1300”
+     *
      * @param s
      * @return String
      */

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

@@ -38,7 +38,8 @@
     <View
         android:layout_width="1px"
         android:layout_height="35dp"
-        android:background="@color/white" />
+        android:background="@color/white"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/gift_tv"