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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -51,7 +51,7 @@ public class CommonWebviewActivity extends Activity {
                 Log.d("weburl",url);
                 String fileName = url.substring(url.lastIndexOf("/") + 1);
                 
-                fileName=fileName.split("&")[3].split("=")[1];
+               // fileName=fileName.split("&")[3].split("=")[1];
 
                 new AlertDialog.Builder(CommonWebviewActivity.this)
                         .setTitle("提示").setMessage("确定下载文件"+fileName+"吗?")

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -2,24 +2,44 @@
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.WorkDailyBean;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyShowActivity;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by FANGlh on 2016/11/1.
  */
 public class WorkDailyAdapter extends BaseAdapter {
+    private static final int DELETE_DOC_REQUEST_SUCCESSFULLY = 1219;
     private List<WorkDailyBean> mWorkDailyBeanList;
     private Context mContext;
+    private int mPosition;
 
     //获取上下文对象
     public WorkDailyAdapter(Context mContext) {
@@ -51,7 +71,7 @@ public class WorkDailyAdapter extends BaseAdapter {
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder = null;
         if (convertView == null){
             convertView = View.inflate(mContext, R.layout.item_activity_workdaily,null);
@@ -59,31 +79,104 @@ public class WorkDailyAdapter extends BaseAdapter {
             viewHolder.WorkDailyDate = (TextView) convertView.findViewById(R.id.item_activity_workdaily_time_tv);
             viewHolder.WorkDailySummary = (TextView) convertView.findViewById(R.id.item_activity_workdaily_summary_tv);
             viewHolder.WorkDailyStatus = (TextView) convertView.findViewById(R.id.item_activity_workdaily_status);
+            viewHolder.WorkDailyDelete = (TextView) convertView.findViewById(R.id.unsubmit_delete_tv);
             convertView.setTag(viewHolder);
         }else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-    //时间返回为空时显示今日时间
+        //时间返回为空时显示今日时间
       /*  if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
             viewHolder.WorkDailyDate.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
         }else{*/
-            viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
-       // }
+        viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
+        // }
         //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
-        if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
+        if(!TextUtils.isEmpty(mWorkDailyBeanList.get(position).getWD_STATUS()) &&
+                mWorkDailyBeanList.get(position).getWD_STATUS().equals("已审核")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.approval));
-        }else {
+            viewHolder.WorkDailyStatus.setText("已审批");
+            viewHolder.WorkDailyDelete.setVisibility(View.GONE);
+        }else if (!TextUtils.isEmpty(mWorkDailyBeanList.get(position).getWD_STATUS()) &&
+                mWorkDailyBeanList.get(position).getWD_STATUS().equals("已提交")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+            viewHolder.WorkDailyStatus.setText("待审批");
+            viewHolder.WorkDailyDelete.setVisibility(View.GONE);
+        }else if(!TextUtils.isEmpty(mWorkDailyBeanList.get(position).getWD_STATUS()) &&
+                mWorkDailyBeanList.get(position).getWD_STATUS().equals("在录入")){
+            viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+            viewHolder.WorkDailyStatus.setText("未提交");
+            viewHolder.WorkDailyDelete.setVisibility(View.VISIBLE);
         }
-        viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
+        viewHolder.WorkDailyDelete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认删除该条已保存单据?")
+                            .setNegativeButton("取消", null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    String mCaller = "WorkDaily";
+                                    int mkeyValue = mWorkDailyBeanList.get(position).getWD_ID();
+                                    mPosition = position;
+                                    dodelete(mCaller, mkeyValue);
+                                }
+                            }).show();
+                }
+        });
+
         return convertView;
     }
 
+    private void dodelete(String mCaller, int mkeyValue) {
+        String url = CommonUtil.getSharedPreferences(mContext, "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);
+        Log.i("dodeleted", mkeyValue + "");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        LogUtil.prinlnLongMsg("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        ViewUtil.httpSendRequest(mContext, url, params, handler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
+    }
+    private Handler handler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            switch (msg.what){
+                case DELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                        String delete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("delete_result", delete_result);
+                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
+                            mWorkDailyBeanList.remove(mPosition);
+                            notifyDataSetChanged();
+                        }
+                    }
+                    break;
+
+                default:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
+                        }
+                    }
+                    break;
+            }
+        }
+    };
     class ViewHolder{
-         TextView WorkDailyDate;
-         TextView WorkDailySummary;
-         TextView WorkDailyStatus;
+        TextView WorkDailyDate;
+        TextView WorkDailySummary;
+        TextView WorkDailyStatus;
+        TextView WorkDailyDelete;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/WorkDailyBean.java

@@ -14,6 +14,24 @@ public class WorkDailyBean {
     private int RN; //
     private String WD_PLAN;//明日工作计划
     private String WD_EXPERIENCE;//工作心得
+    private  String WD_STATUS; //准确的状态，在录入、待审批、已审核
+    private String WD_CONTEXT;//已完成工作内容
+
+    public String getWD_CONTEXT() {
+        return WD_CONTEXT;
+    }
+
+    public void setWD_CONTEXT(String WD_CONTEXT) {
+        this.WD_CONTEXT = WD_CONTEXT;
+    }
+
+    public String getWD_STATUS() {
+        return WD_STATUS;
+    }
+
+    public void setWD_STATUS(String WD_STATUS) {
+        this.WD_STATUS = WD_STATUS;
+    }
 
     public int getWD_ID() {
         return WD_ID;

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

@@ -67,9 +67,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private TextView status_tv;
     private MyListView appflow_lv;
     private int mNoc = 1;
-    private final static int COMMON_DOC_AF_REQUEST = 1101;
-    private final static int COMMON_DOC_MSG_REQUEST = 1102;
-    private static final int DELETE_DOC_REQUEST = 1103;
+    private final static int COMMON_DOC_AF_REQUEST = 1125;
+    private final static int COMMON_DOC_MSG_REQUEST = 1126;
+    private static final int DELETE_DOC_REQUEST = 1127;
     private EmptyLayout mEmptyLayput_approvalflow;
     private CommonDocApprovalFlowAdapter mCommonDocApprovalFlowAdapter;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
@@ -99,6 +99,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String em_number;
     private String type_emcode;
     private String real_status;
+    private String emCode;
 
 
     @Override
@@ -169,9 +170,12 @@ public class CommonDocDetailsActivity extends BaseActivity {
         final Intent intent = getIntent();
         mCaller = intent.getStringExtra("caller");
         mkeyValue = intent.getIntExtra("keyValue", -1);
+        real_status = intent.getStringExtra("status");
         Log.i("mCaller", mCaller);
         Log.isLoggable("keyValue", mkeyValue);
+        Log.i("real_status", real_status);
 
+        SetComDocStatus(real_status);
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
@@ -272,6 +276,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
                                     .putExtra("submittype", "resubmit"));
+                            finish();
                         }
                     }
                     break;
@@ -285,9 +290,14 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
-                    commondoc_sv.setVisibility(View.GONE);
-                    resanddel_ll.setVisibility(View.GONE);
+//                    Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
+                    if(!TextUtils.isEmpty(real_status) && real_status.equals("已审核")){
+                        commondoc_sv.setVisibility(View.VISIBLE);
+                        resanddel_ll.setVisibility(View.GONE);
+                    }else if (!TextUtils.isEmpty(real_status) && real_status.equals("已提交")){
+                        commondoc_sv.setVisibility(View.VISIBLE);
+                    }
+
                     break;
             }
         }
@@ -333,7 +343,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 resanddel_ll.setVisibility(View.GONE);
             } else {
                 commondoc_sv.setVisibility(View.VISIBLE);
-                resanddel_ll.setVisibility(View.VISIBLE);
                 mCommonDocMainMsgAdapter.setFormdataBeans(formdataArray);
                 if (griddataArray == null) {
                     secondmsg_ll.setVisibility(View.GONE);
@@ -375,13 +384,13 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             getapplypeomsg(em_number);
 
                             //申请单据的审批，提交，录入状态获取
-                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
-                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
-                                SetComDocStatus(real_status);
-                            }
+//                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
+//                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
+//                                SetComDocStatus(real_status);
+//                            }
                         }
                         mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
                         main_msg_lv.setAdapter(mCommonDocMainMsgAdapter);
@@ -467,7 +476,15 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
                         if (manager == null) manager = new DBManager(mContext);
                         String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                        String emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+                        emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        if (mCommonApprovalFlowBean.getProcesss() != null){
+//                            int pronum = mCommonApprovalFlowBean.getProcesss().size();
+//                            if (i<pronum && mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null){
+//                                emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
+//                            }
+//                        }else {
+//                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        }
                         try {
                             if (emCode.contains(",")) {
 //                                im_ids.add("");
@@ -479,7 +496,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             e.printStackTrace();
                         }
 
-                        String[] selectionArgs = {emCode == null ? "":emCode, whichsys};
+                        String[] selectionArgs = {emCode == null ? "": emCode, whichsys};
                         String selection = "em_code=? and whichsys=? ";
                         //获取数据库数据
                         try {
@@ -511,7 +528,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
         getemcodefromAF();
     }
-
     /**
      * 申请单据申请人emcode,从审批流数据获取
      */
@@ -524,34 +540,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
 //                name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
                 getapplypeomsg(em_number);
             }
-           /* if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())) {
-                int data_num = mCommonApprovalFlowBean.getData().size();
-                int nodes_num = mCommonApprovalFlowBean.getNodes().size();
-                String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
-                if ((nodes_num == data_num && nodes_num > 0) &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
-                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
-                    status_tv.setText("已审批");
-                } else {
-                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-                    status_tv.setText("待审批");
-                }
-            } else {
-                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-                status_tv.setText("待审批");
-            }
-
-        } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())) {
-
-            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
-            status_tv.setText("未提交");
-
-        } else {
-            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-            status_tv.setText("待审批");*/
         }
 
         // 当单据未提交 未触发审批流时，默认静态显示申请人的信息
@@ -586,8 +574,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
             approval_ll.setVisibility(View.GONE);
         } else {
             approval_ll.setVisibility(View.GONE);
-            resanddel_ll.setVisibility(View.VISIBLE);
-
             resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
                 @Override
                 public void onClick(View v) {

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

@@ -118,7 +118,6 @@ public class NoticesActivity extends BaseActivity {
         });
     }
 
-
     @Override
     public void onBackPressed() {
         sendResult();

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

@@ -260,7 +260,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     emname +
                     "\",\n" +
                     "\"vp_recordman\":\"" +
-                    emname +
+                     emname +
                     "\",\n" +
                     "\"vp_status\":\"" +
                     "未拜访" +

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

@@ -390,7 +390,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     if (mContext==null)return;
                                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                                             .putExtra("caller", caller)
-                                            .putExtra("keyValue", va_id));
+                                            .putExtra("keyValue", va_id)
+                                            .putExtra("status","已提交"));
                                     click_btn.setEnabled(true);
                                     finish();
                                     overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
@@ -1167,6 +1168,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     if (groupid == 1) {
                         if (data.getIsNeed() == -1) {
                             data.setDetailDid(String.valueOf(formid));//更新时候，只添加关联id---主表ID
+                            data.setDetailId("");
                             itemData.add(data);
                         }
                     }

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

@@ -402,7 +402,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     startActivity(new Intent(mContext,
                             CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
-                            .putExtra("keyValue", keyId));
+                            .putExtra("keyValue", keyId)
+                            .putExtra("status",status));
                 }
   
             }

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -22,7 +23,6 @@ import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.adapter.DailyDetailsWorkTaskAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.WorkTaskBean;
-import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
@@ -50,6 +50,8 @@ import java.util.Map;
 public class DailydetailsActivity extends BaseActivity {
     private static final int DAILY_REFORSUB_SUCCESSFULLY = 1209;
     private static final int DAILY_REFORDELETE_SUCCESSFULLY = 1214;
+    public static final int DELETE_SUCCEED = 1219;
+    private static final int REFORDELETE_DOC_REQUEST_SUCCESSFULLY = 1220;
     private TextView wdd_data;
     private TextView wdd_status;
     private TextView wdd_summary;
@@ -59,9 +61,7 @@ public class DailydetailsActivity extends BaseActivity {
     private String summary;
     private String plan;
     private String experience;
-    private String status;
-    private MyListView complete_tasklv;
-    private MyListView uncomplete_tasklv;
+    private String wd_status;
     private MyListView approval_flowlv;
     private LinearLayout plan_ll;
     private LinearLayout experience_ll;
@@ -72,7 +72,6 @@ public class DailydetailsActivity extends BaseActivity {
     private List<WorkTaskBean> mWorkTaskBeanList;
     private EmptyLayout mEmptyLayput_approvalflow;
     private EmptyLayout mEmptyLayput_Task;
-    private TextView no_task;
     private int mkeyValue;
     private String mCaller = "WorkDaily";
     private int mNoc = 1 ;
@@ -110,6 +109,7 @@ public class DailydetailsActivity extends BaseActivity {
                                     .putExtra("rs_summary", summary)
                                     .putExtra("rs_plan", plan)
                                     .putExtra("rs_experience", experience)
+                                    .putExtra("rs_donetask",donetask)
                                     .putExtra("resubmit", "resubmit"));
                             Log.i("doresubmit_id", mkeyValue + "");
                             finish();
@@ -121,11 +121,21 @@ public class DailydetailsActivity extends BaseActivity {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
                             String resfordelete_result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("RESUBMITTED_message", resfordelete_result);
-//                            Toast.makeText(ct, "工作日报反提交成功", Toast.LENGTH_SHORT).show();
                             dodelete(mCaller, mkeyValue);
                         }
                     }
                     break;
+                case REFORDELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if(msg.getData() != null){
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                            String delete_result = msg.getData().getString("result");
+                            LogUtil.prinlnLongMsg("refordelete_result", delete_result);
+                            if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                                dodelete(mCaller,mkeyValue);
+                            }
+                        }
+                    }
+                    break;
                 case DELETE_DOC_REQUEST_SUCCESSFULLY:
                     if(msg.getData() != null){
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
@@ -133,13 +143,18 @@ public class DailydetailsActivity extends BaseActivity {
                             LogUtil.prinlnLongMsg("delete_result", delete_result);
                             if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
                                 Toast.makeText(ct, "工作日报删除成功", Toast.LENGTH_LONG).show();
-                                if (!TextUtils.isEmpty(fromwhere) && fromwhere.equals("dailylist")){
-                                    finish();
-                                }else {
-                                    startActivity(new Intent(activity,WorkDailyShowActivity.class));
+//                                    startActivity(new Intent(activity,WorkDailyShowActivity.class)
+//                                    .putExtra("fromwhere","delete_succeed"));
+
+                                if (!TextUtils.isEmpty(fromwhere) && "submitdaily".equals(fromwhere)){
+                                    startActivity(new Intent(DailydetailsActivity.this,WorkDailyShowActivity.class));
                                     finish();
+                                }else if (!TextUtils.isEmpty(fromwhere) && "dailylist".equals(fromwhere)){
+                                    Intent intent = new Intent();
+                                    intent.putExtra("delete_succeed","");
+                                    setResult(DELETE_SUCCEED,intent);
+                                    DailydetailsActivity.this.finish();
                                 }
-
                             }
                         }
                     }
@@ -155,6 +170,13 @@ public class DailydetailsActivity extends BaseActivity {
         }
     };
     private String submittype;
+    private TextView resubmit_tv;
+    private LinearLayout done_task_ll;
+    private TextView done_task_tv;
+    private LinearLayout undo_task_ll;
+    private TextView undo_task_tv;
+    private String emCode;
+    private String donetask;
 
     /**
      * 日报审批流获取并处理
@@ -181,7 +203,14 @@ public class DailydetailsActivity extends BaseActivity {
                     for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
                         if (manager == null) manager = new DBManager(mContext);
                         String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                        String emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+                        emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        if (mCommonApprovalFlowBean.getProcesss() != null  &&
+//                                i < mCommonApprovalFlowBean.getProcesss().size() &&
+//                                    mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null){
+//                            emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
+//                        }else {
+//                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        }
                         if( emCode.contains(",")){
                             String str[] = emCode.split(",");
                             emCode = str[0];
@@ -191,7 +220,7 @@ public class DailydetailsActivity extends BaseActivity {
 
                         // 当处理当在Pc端不填写工作总结保存或提交时，在手机端查看详情界面这里出引起闪退：try 已解决
                         try {
-                            String[] selectionArgs = {emCode == null ? "":emCode, whichsys};
+                            String[] selectionArgs = {emCode == null ? "": emCode, whichsys};
                             String selection = "em_code=? and whichsys=? ";
                             //获取数据库数据
                             EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
@@ -216,30 +245,30 @@ public class DailydetailsActivity extends BaseActivity {
                 mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
                 approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
 
-                int nodesnum = mCommonApprovalFlowBean.getNodes().size();
-                int datanum = mCommonApprovalFlowBean.getData().size();
-                if(nodesnum > 0 && datanum > 0 && nodesnum == datanum){
-                    if(mCommonApprovalFlowBean.getNodes().get(nodesnum-1).getJn_dealResult().equals("同意")){
-                        wdd_status.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
-                        wdd_status.setText("已审批");
-                        resanddel_ll.setVisibility(View.GONE);
-                    }
-                }
-                try{
-                    // 当保存数据但未提交时的解决方案
-                    submittype = new String();
-                    if(mCommonApprovalFlowBean.getData().size() == 0 &&
-                            mCommonApprovalFlowBean.getNodes().size() == 0 &&
-                            mCommonApprovalFlowBean.getProcesss().size() == 0 &&
-                            !status.equals("已审批")){
-                        wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                        wdd_status.setText("未提交");
-                        resanddel_ll.setVisibility(View.VISIBLE);
-                        submittype = "unsubmit";  //未提交状态
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
+//                int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+//                int datanum = mCommonApprovalFlowBean.getData().size();
+//                if(nodesnum > 0 && datanum > 0 && nodesnum == datanum){
+//                    if(mCommonApprovalFlowBean.getNodes().get(nodesnum-1).getJn_dealResult().equals("同意")){
+//                        wdd_status.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+//                        wdd_status.setText("已审批");
+//                        resanddel_ll.setVisibility(View.GONE);
+//                    }
+//                }
+//                try{
+//                    // 当保存数据但未提交时的解决方案
+//                    submittype = new String();
+//                    if(mCommonApprovalFlowBean.getData().size() == 0 &&
+//                            mCommonApprovalFlowBean.getNodes().size() == 0 &&
+//                            mCommonApprovalFlowBean.getProcesss().size() == 0 &&
+//                            !status.equals("已审批")){
+//                        wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+//                        wdd_status.setText("未提交");
+//                        resanddel_ll.setVisibility(View.VISIBLE);
+//                        submittype = "unsubmit";  //未提交状态
+//                    }
+//                }catch (Exception e){
+//                    e.printStackTrace();
+//                }
 
             }
 
@@ -267,45 +296,25 @@ public class DailydetailsActivity extends BaseActivity {
         wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
         plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
         experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
-        complete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_completedtask_lv);
-        uncomplete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_uncompletedtask_lv);
         approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
-        no_task = (TextView) findViewById(R.id.work_daily_detail_no_task);
-        addDaily = (TextView) findViewById(R.id.work_daily_detail_back_to_add);
         unsubmit_iv = (ImageView) findViewById(R.id.work_daily_unsubmit_iv);
         resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
         resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
         delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
+        resubmit_tv = (TextView) findViewById(R.id.common_docui_resubmit_tv);
+        done_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_donetask_ll);
+        done_task_tv = (TextView) findViewById(R.id.work_daily_detail_donetask_tv);
+        undo_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_undotask_ll);
+        undo_task_tv = (TextView) findViewById(R.id.work_daily_detail_undotask_tv);
 
-        //加载审批流的适配器
         mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
         mEmptyLayput_approvalflow.setShowEmptyButton(false);
         mEmptyLayput_approvalflow.setShowErrorButton(false);
         mEmptyLayput_approvalflow.setShowLoadingButton(false);
+        //加载审批流的适配器
         mCommonApprovalFlowBean = new CommonApprovalFlowBean();
         mDailyDetailsApprovalFlowAdapter = new DailyDetailsApprovalFlowAdapter(this);
 
-
-        //加载我的任务的适配器
-        mEmptyLayput_Task = new EmptyLayout(this, complete_tasklv);
-        mEmptyLayput_Task.setShowEmptyButton(false);
-        mEmptyLayput_Task.setShowErrorButton(false);
-        mEmptyLayput_Task.setShowLoadingButton(false);
-        mWorkTaskBeanList = new ArrayList<>();
-        mDailyDetailsWorkTaskAdapter = new DailyDetailsWorkTaskAdapter(this);
-//        if (mWorkTaskBeanList.isEmpty()) {
-//            task_rl.setVisibility(View.GONE);
-//        } else {
-        no_task.setVisibility(View.GONE);
-        for(int i = 0;i<5;i++){
-            WorkTaskBean workTaskBean =new WorkTaskBean();
-            mWorkTaskBeanList.add(workTaskBean);
-        }
-        mDailyDetailsWorkTaskAdapter.setmWorkTaskBeanList(mWorkTaskBeanList);
-        complete_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
-//        }
-
-
         manager = new DBManager(this);
         im_ids =new ArrayList<>();
 
@@ -403,7 +412,7 @@ public class DailydetailsActivity extends BaseActivity {
         if (retype.equals("reforsub")){  //反提交之重新提交请求
             ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, DAILY_REFORSUB_SUCCESSFULLY, null, null, "post");
         }else if (retype.equals("refordelete")){ //反提交之删除请求
-            ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, DAILY_REFORDELETE_SUCCESSFULLY, null, null, "post");
+            ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, REFORDELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "post");
         }
     }
 
@@ -412,7 +421,9 @@ public class DailydetailsActivity extends BaseActivity {
         final Intent intent = getIntent();
         date = intent.getStringExtra("Date");
         summary = intent.getStringExtra("Content");
-        status = intent.getStringExtra("Status");
+        if (!TextUtils.isEmpty(intent.getStringExtra("WD_Status"))){
+            wd_status = intent.getStringExtra("WD_Status");
+        }
         mkeyValue = intent.getIntExtra("ID", -1); Log.i("first_mkeyValue",mkeyValue + "");
         fromwhere = intent.getStringExtra("fromwhere");
         if (!TextUtils.isEmpty(intent.getStringExtra("Plan"))) {
@@ -425,23 +436,34 @@ public class DailydetailsActivity extends BaseActivity {
         } else {
             experience_ll.setVisibility(View.GONE);
         }
-//        if (!TextUtils.isEmpty(summary) && !TextUtils.isEmpty(status) && !TextUtils.isEmpty(date)) {
-            wdd_data.setText(date);
-            wdd_summary.setText(summary);
-            if(status.equals("已审批")){
-                wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
-                resanddel_ll.setVisibility(View.GONE);
-            }else if (status.equals("待审批")){
-                wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-            }
-            wdd_status.setText(status);
+        if (!TextUtils.isEmpty(intent.getStringExtra("Donetask"))){
+            done_task_ll.setVisibility(View.VISIBLE);
+            done_task_tv.setText(Html.fromHtml(intent.getStringExtra("Donetask")));
+            donetask = intent.getStringExtra("Donetask");
+        }else {
+            done_task_ll.setVisibility(View.GONE);
+        }
+        wdd_data.setText(date);
+        wdd_summary.setText(summary);
+        if(wd_status.equals("已审核")){
+            wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
+            wdd_status.setText("已审批");
+            resanddel_ll.setVisibility(View.GONE);
+        }else if (wd_status.equals("已提交")){
+            wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+            wdd_status.setText("待审批");
+            resanddel_ll.setVisibility(View.VISIBLE);
+        }else if (wd_status.equals("在录入")){
+            wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+            wdd_status.setText("未提交");
+            resanddel_ll.setVisibility(View.VISIBLE);
+            submittype = "unsubmit";
+            resubmit_tv.setText("提交");
+        }
+
+        wdd_plan.setText(plan);
+        wdd_experience.setText(experience);
 
-            wdd_plan.setText(plan);
-            wdd_experience.setText(experience);
-//        } else {
-//            Toast.makeText(this, "数据异常", Toast.LENGTH_LONG).show();
-//            finish();    //这里就是处理在后台错误情况下传回错的数据才会执行该finish语句，否则永不执行
-//        }
 
         // 当获取到正确的单据caller和单据id时 请求获取审批流数据
         if(!TextUtils.isEmpty(mCaller)&&mkeyValue!= -1){
@@ -498,44 +520,11 @@ public class DailydetailsActivity extends BaseActivity {
     }
 
     /**
-     *  兼容data[]审批人信息为空的情况，UAS部门这里data全部异常,！！
+     *  兼容data[]审批人信息为空的情况，UAS部门这里data全部异常,！！ ,仅仅对日报审批流这样处理了，通用单据没兼容
      *  nodesnum = datanum && 最终已审批状态显示
      * @param mCommonApprovalFlowBean
      */
     private void Showflownodata(CommonApprovalFlowBean mCommonApprovalFlowBean) {
-        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
-            try{
-                // 当保存数据但未提交时的解决方案
-                if(mCommonApprovalFlowBean.getData().size() == 0 &&
-                        mCommonApprovalFlowBean.getNodes().size() == 0 &&
-                        mCommonApprovalFlowBean.getProcesss().size() == 0 &&
-                        !status.equals("已审批")){
-                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                    wdd_status.setText("未提交");
-                    resanddel_ll.setVisibility(View.VISIBLE);
-
-                   /* unsubmit_iv.setVisibility(View.GONE);
-                    unsubmit_iv.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent intent = new Intent(activity,WorkDailyAddActivity.class);
-                            intent.putExtra("UC_Summary",summary);
-                            intent.putExtra("UC_Plan",plan);
-                            intent.putExtra("UC_Experience",experience);
-                            intent.putExtra("id",mkeyValue);
-                            intent.putExtra("resubmit","UCsubmit");
-                            startActivity(intent);
-                            finish();
-                        }
-                    });*/
-
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
 
         if(!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
                 && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
@@ -550,7 +539,6 @@ public class DailydetailsActivity extends BaseActivity {
                     String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
                     String emCode = mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManId();
                     if (emCode.contains(",")) {
-//                                        im_ids.add("");
                         String str[] = emCode.split(",");
                         emCode = str[0];
                         ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
@@ -567,20 +555,19 @@ public class DailydetailsActivity extends BaseActivity {
                             im_ids.add(imId);
                         } else {
                             im_ids.add("");
-//                                            ToastMessage("审批流头像获取异常，已显示为默认");
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-            }
+                }
                 Log.i("imids", im_ids.toString());
-            mDailyDetailsApprovalFlowAdapter.setIm_ids(im_ids);
+                mDailyDetailsApprovalFlowAdapter.setIm_ids(im_ids);
 
-            // 设置数据之前先通过数据库获取到所有的imid保存到内存中
-            mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
-            approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
+                // 设置数据之前先通过数据库获取到所有的imid保存到内存中
+                mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
+                approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
 
-        }else {
+            }else {
                 mEmptyLayput_approvalflow.showEmpty();
             }
         }

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

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.baidu.mapapi.map.MapView;
@@ -54,6 +55,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     private TextView hidden_location_tv;
     private LinearLayout qzone_map_ll;
     private TextView location_city_tv;
+    private RelativeLayout search_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -107,6 +109,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
         listView.setAdapter(adapter);
         if (!TextUtils.isEmpty(getIntent().getStringExtra("qzoneaddr"))) {
             mapView.setVisibility(View.GONE);
+            search_rl.setVisibility(View.GONE);
         }
         //选择
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -148,6 +151,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     }
 
     private void init() {
+        search_rl = (RelativeLayout) findViewById(R.id.search_rl);
         hidden_location_tv = (TextView) findViewById(R.id.hidden_location_tv);
         qzone_map_ll = (LinearLayout) findViewById(R.id.qzone_map_ll);
         location_city_tv = (TextView) findViewById(R.id.location_city_tv);

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

@@ -48,6 +48,7 @@ public class WorkDailyAddActivity extends BaseActivity {
     private static final int CLEAR_AF_UPDATE_DOC_STATE = 1208;
     private static final int DAILY_RESUBMITTED_SUCCESSFULLY = 1209;  //反提交请求成功后返回
     private static final int LAST_SUBMIT_SUCCESSFULLY = 1210;
+    private static final int GRAB_JOB_CONTENT = 1219;
     private FormEditText add_summary;
     private ImageView share_experience;
     private boolean imOk = false;
@@ -61,19 +62,12 @@ public class WorkDailyAddActivity extends BaseActivity {
     private TextView add_experience;
     private String resubmit;
     private Button add_submit;
+    private String wd_finishedtask;
+    private String wd_unfinishedtask;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case 0x11:
-                    imOk = true;
-                    if (erpOk) {
-                        setResult(0x22, new Intent());
-                        isSbmit = false;
-                        startActivity(new Intent(activity, WorkDailyShowActivity.class));
-                        jumptododetail(mkeyValue);
-                    }
-                    break;
                 case DAILY_SUBMITTED_SUCCESSFULLY:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
@@ -82,19 +76,19 @@ public class WorkDailyAddActivity extends BaseActivity {
                             if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
                                 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");
+                                    mkeyValue= new JSONObject(result).getJSONArray("data").getJSONObject(0).getInt("WD_ID");
+                                    wd_finishedtask = new JSONObject(result).getJSONArray("data").getJSONObject(0).getString("WD_CONTEXT");
+                                    wd_unfinishedtask = new JSONObject(result).getJSONArray("data").getJSONObject(0).getString("WD_UNFINISHEDTASK");
                                     Log.i("First_mkeyValue", mkeyValue + " ");
-//                                    or  mkeyValue= new JSONObject(result).getJSONObject("data").getInt("WD_ID");
+                                    Log.i("wd_context",wd_finishedtask);
+                                    Log.i("wd_context",wd_unfinishedtask);
                                 } catch (JSONException e) {
                                     e.printStackTrace();
                                 }
-                                jumptododetail(mkeyValue);
+                                doGrabJobContent(mkeyValue);
                                 if (imOk) {
                                     isSbmit = false;
-                                    jumptododetail(mkeyValue);
+                                    doGrabJobContent(mkeyValue);
                                 }
 
                             } else {
@@ -109,7 +103,8 @@ public class WorkDailyAddActivity extends BaseActivity {
                             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 ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")) ||
+                                        (!TextUtils.isEmpty(resubmit) && resubmit.equals("unsub_tosub"))) {
                                     ToastMessage("工作日报更新成功");
 
                                     // 更新之后再提交覆盖之前同id单据
@@ -131,13 +126,40 @@ public class WorkDailyAddActivity extends BaseActivity {
                     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();
-                            jumptododetail(mkeyValue);
-//                            startActivity(new Intent(activity,DailydetailsActivity.class)
-//                                    .putExtra("caller", "WorkDaily")
-//                                    .putExtra("ID",mkeyValue)
-//                                    .putExtra("resadd","resadd"));
+                            if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
+                                LogUtil.prinlnLongMsg("LAST_SUBMIT_message", result);
+                                Toast.makeText(ct, "工作日报重新提交成功", Toast.LENGTH_SHORT).show();
+                                try {
+                                    wd_finishedtask = new JSONObject(result).getJSONArray("data").getJSONObject(0).getString("WD_CONTEXT");
+                                    wd_unfinishedtask = new JSONObject(result).getJSONArray("data").getJSONObject(0).getString("WD_UNFINISHEDTASK");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                doGrabJobContent(mkeyValue);
+                            } else {
+                                Crouton.makeText(ct, "工作日报重新提交失败");
+                            }
+
+                        }
+                    }
+                    break;
+                case GRAB_JOB_CONTENT:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            String result = msg.getData().getString("result");
+                            LogUtil.prinlnLongMsg("GRAB_JOB_CONTENT", result);
+                            if (!TextUtils.isEmpty(wd_finishedtask) || !TextUtils.isEmpty(wd_unfinishedtask)){
+                                ToastMessage("工作内容抓取成功");
+                            }else {
+                                ToastMessage("无工作内容");
+                            }
+                            new Handler().postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    jumptododetail(mkeyValue); //延时跳转，确认抓取成功
+                                }
+                            },2000);
+
                         }
                     }
                     break;
@@ -151,6 +173,20 @@ public class WorkDailyAddActivity extends BaseActivity {
             }
         }
     };
+
+
+    public void doGrabJobContent(int mkeyValue) {
+        //跳转之前抓取工作内容
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/oa/persontask/catchWorkContent.action";
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("caller", "WorkDaily");
+        params.put("id", mkeyValue);
+        LogUtil.d(JSON.toJSONString(params));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, params, handler, headers, GRAB_JOB_CONTENT, null, null, "post");
+    }
+
     private String last_change_experience;
     private String last_change_plan;
     private String last_change_summary;
@@ -162,9 +198,11 @@ public class WorkDailyAddActivity extends BaseActivity {
         intent.putExtra("ID", mkeyValue);
         intent.putExtra("fromwhere", "submitdaily");
         intent.putExtra("Content", add_summary.getText().toString());
-        intent.putExtra("Status", "待审批");
+        intent.putExtra("WD_Status", "已提交");
         intent.putExtra("Plan", add_plan.getText().toString());
         intent.putExtra("Experience", add_experience.getText().toString());
+        intent.putExtra("Donetask",wd_finishedtask);
+        intent.putExtra("Undotask",wd_unfinishedtask);
         startActivity(intent);
         finish();
     }
@@ -178,7 +216,7 @@ public class WorkDailyAddActivity extends BaseActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        if ( !TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")){
+        if ( !TextUtils.isEmpty(resubmit) && (resubmit.equals("resubmit") || resubmit.equals("unsub_tosub")) ){
 
         }else {
             getMenuInflater().inflate(R.menu.menu_list, menu);
@@ -211,11 +249,13 @@ public class WorkDailyAddActivity extends BaseActivity {
                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
+                               startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
                                 finish();
                             }
                         }).show();
-            } else {
-//                onFinishOa.onFinish();
+            }
+            else {
+                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
                 finish();
             }
         }
@@ -235,11 +275,13 @@ public class WorkDailyAddActivity extends BaseActivity {
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
+                            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
                             finish();
                         }
                     }).show();
         } else {
-            super.onBackPressed();
+            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+            finish();
         }
 
     }
@@ -319,29 +361,13 @@ public class WorkDailyAddActivity extends BaseActivity {
 
         Intent intent = getIntent();
         resubmit = intent.getStringExtra("resubmit");
-        // 判断有没从详情界面返回的 未提交单据的数据
-        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("UCsubmit")){
-            add_submit.setText("重新提交");
-            if (intent.getStringExtra("UC_Summary") != null) {
-                add_summary.setText(intent.getStringExtra("UC_Summary"));
-            } else {
-                add_summary.setText("");
-            }
-            if (intent.getStringExtra("UC_Plan") != null) {
-                add_plan.setText(intent.getStringExtra("UC_Plan"));
-            } else {
-                add_plan.setText("");
+        // 判断有没从列表界面、详情界面返回的重新提交的数据
+        if (!TextUtils.isEmpty(resubmit)) {
+            if (resubmit.equals("unsub_tosub")){
+                add_submit.setText("提交");
+            }else if(resubmit.equals("resubmit")){
+                add_submit.setText("重新提交");
             }
-            if (intent.getStringExtra("UC_Experience") != null) {
-                add_experience.setText(intent.getStringExtra("UC_Experience"));
-            } else {
-                add_experience.setText("");
-            }
-        }
-
-        // 判断有没从详情界面返回的 重新提交的数据
-        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")) {
-            add_submit.setText("重新提交");
             if (!TextUtils.isEmpty(intent.getStringExtra("rs_summary"))) {
                 add_summary.setText(intent.getStringExtra("rs_summary"));
             }
@@ -356,6 +382,14 @@ public class WorkDailyAddActivity extends BaseActivity {
             } else {
                 add_experience.setText("");
             }
+
+            if (!TextUtils.isEmpty(intent.getStringExtra("rs_donetask"))){
+                wd_finishedtask = intent.getStringExtra("rs_donetask");
+            }
+//            if (!TextUtils.isEmpty(intent.getStringExtra("rs_undotask"))){
+//                wd_unfinishedtask = intent.getStringExtra("rs_undotask");
+//            }
+
         }
         mkeyValue = intent.getIntExtra("id", 0);
         Log.i("resubmit_mkeyValue", mkeyValue + "");
@@ -427,7 +461,7 @@ public class WorkDailyAddActivity extends BaseActivity {
     private void sendWorkDailyByErp(String s1, String s2, String s3) {
         //执行重新提交之更改单据状态操作
         if ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) ||
-                (!TextUtils.isEmpty(resubmit) && resubmit.equals("UCsubmit"))) {
+                (!TextUtils.isEmpty(resubmit) && resubmit.equals("unsub_tosub")&& mkeyValue != 0)) {
             String sb_summary = string2Json(last_change_summary);
             String sb_plan = string2Json(last_change_plan);
             String sb_experience = string2Json(last_change_experience);
@@ -451,6 +485,7 @@ public class WorkDailyAddActivity extends BaseActivity {
             Log.i("flhupdatedaily: ", formStore2);
 
         } else {
+            // 执行第一次直接提交
             s1 = string2Json(s1);
             s2 = string2Json(s2);
             s3 = string2Json(s3);
@@ -459,7 +494,7 @@ public class WorkDailyAddActivity extends BaseActivity {
             formStoreMap.put("wd_comment", s1);
             formStoreMap.put("wd_plan", s2);
             formStoreMap.put("wd_experience", s3);
-            // 第一次直接提交接口
+
             String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/addWorkReport.action";
             HashMap<String, Object> params = new HashMap<>();
             String formStore = StringUtils.mapToJson(formStoreMap);

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

@@ -1,10 +1,12 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -14,8 +16,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
-import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -29,6 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -48,6 +51,7 @@ import java.util.regex.Pattern;
  * Created by FANGlh on 2016/11/1.
  */
 public class WorkDailyShowActivity extends BaseActivity {
+    private static final int DELETE_DOC_REQUEST_SUCCESSFULLY = 1219;
     private ClearEditText mSearchEt;
     private PullToRefreshListView mPullToRefreshListView;
     private int mCurrentPage = 1;
@@ -55,15 +59,11 @@ public class WorkDailyShowActivity extends BaseActivity {
     private WorkDailyAdapter mWorkDailyAdapter;
     private List<WorkDailyBean> mWorkDailyList;  //实体类一般以Bean或Entity结尾
     public EmptyLayout mEmptyLayout;
+    private int mPosition;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-    }
-
-    @Override
-    protected void onResume() {
         initView();
         initData();
         super.onResume();
@@ -86,7 +86,6 @@ public class WorkDailyShowActivity extends BaseActivity {
         mWorkDailyAdapter.setmWorkDailyBeanList(mWorkDailyList);
         mPullToRefreshListView.getRefreshableView().setAdapter(mWorkDailyAdapter);
 
-
         mSearchEt.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -108,7 +107,7 @@ public class WorkDailyShowActivity extends BaseActivity {
                 if (mWorkDailyList == null || mWorkDailyList.size() <= 0) {
                     mEmptyLayout.showEmpty();
                     return;
-                }else{
+                } else {
                     for (WorkDailyBean wd : mWorkDailyList) {
                         boolean b = getResult(wd.getWD_DATE() + wd.getWD_COMMENT() + wd.getSTATUS(), strChche.trim());
                         if (b) {
@@ -118,23 +117,60 @@ public class WorkDailyShowActivity extends BaseActivity {
                 }
 
                 mWorkDailyAdapter.setmWorkDailyBeanList(chche);
-                mPullToRefreshListView.setAdapter(mWorkDailyAdapter);
-//                mWorkDailyAdapter.notifyDataSetChanged();
+//                mPullToRefreshListView.setAdapter(mWorkDailyAdapter);
+                mWorkDailyAdapter.notifyDataSetChanged();
             }
         });
         mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
+
+        //长按item弹出删除未提交对话框
+       /* mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+            @Override
+            public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
+                mPosition = (int) parent.getItemIdAtPosition(position);
+                if (mWorkDailyList.get(position).getWD_STATUS().equals("在录入")){
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认删除该条已保存单据?")
+                            .setNegativeButton("取消", null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    String mCaller = "WorkDaily";
+                                    int mkeyValue = mWorkDailyList.get(position).getWD_ID();
+                                    dodelete(mCaller, mkeyValue);
+                                }
+                            }).show();
+                }
+
+                return true;
+            }
+        });*/
         mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Intent intent = new Intent(WorkDailyShowActivity.this, DailydetailsActivity.class);
-                intent.putExtra("ID",mWorkDailyList.get(position==0?0:(position-1)).getWD_ID());
-                intent.putExtra("Date",mWorkDailyList.get(position==0?0:(position-1)).getWD_DATE());
-                intent.putExtra("Content", mWorkDailyList.get(position==0?0:(position-1)).getWD_COMMENT());
-                intent.putExtra("Status", mWorkDailyList.get(position==0?0:(position-1)).getSTATUS());
-                intent.putExtra("Plan", mWorkDailyList.get(position==0?0:(position - 1)).getWD_PLAN());
-                intent.putExtra("Experience",mWorkDailyList.get(position==0?0:(position - 1)).getWD_EXPERIENCE());
-                intent.putExtra("fromwhere","dailylist");
-                startActivity(intent);
+                mPosition = (int) parent.getItemIdAtPosition(position);
+                if (!TextUtils.isEmpty(mWorkDailyList.get(position-1).getWD_STATUS())
+                        && mWorkDailyList.get(position-1).getWD_STATUS().equals("在录入")){  //列表中在录入状态直接跳到新增界面
+                    startActivity(new Intent(activity, WorkDailyAddActivity.class)
+                            .putExtra("id", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_ID())
+                            .putExtra("rs_summary", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_COMMENT())
+                            .putExtra("rs_plan", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_PLAN())
+                            .putExtra("rs_experience", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_EXPERIENCE())
+                            .putExtra("resubmit", "unsub_tosub"));
+                }else {
+                    Intent intent = new Intent(WorkDailyShowActivity.this, DailydetailsActivity.class);
+                    intent.putExtra("ID", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_ID());
+                    intent.putExtra("Date", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_DATE());
+                    intent.putExtra("Content", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_COMMENT());
+                    intent.putExtra("WD_Status", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_STATUS());
+                    intent.putExtra("Plan", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_PLAN());
+                    intent.putExtra("Experience", mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_EXPERIENCE());
+                    intent.putExtra("Donetask",mWorkDailyList.get(position == 0 ? 0 : (position - 1)).getWD_CONTEXT());
+                    intent.putExtra("fromwhere", "dailylist");
+                    startActivityForResult(intent, 1219);
+                }
             }
         });
         mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -152,6 +188,48 @@ public class WorkDailyShowActivity extends BaseActivity {
         });
     }
 
+    private void dodelete(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);
+        Log.i("dodeleted", mkeyValue + "");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LogUtil.prinlnLongMsg("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, params, handler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
+    }
+
+    private Handler handler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            switch (msg.what){
+                case DELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                        String delete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("delete_result", delete_result);
+                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
+                            mWorkDailyList.remove(mPosition);
+                            mWorkDailyAdapter.notifyDataSetChanged();
+                        }
+                    }
+                    break;
+
+                default:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
+                        }
+                    }
+                    break;
+            }
+        }
+    };
+
     //正则
     private static boolean getResult(String text, String str) {
         Pattern p = Pattern.compile(str);
@@ -181,8 +259,9 @@ public class WorkDailyShowActivity extends BaseActivity {
             putDownInput();
             final  Intent intent = getIntent();
             if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
-                    && (intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                    intent.getStringExtra("fromwhere").equals("dodaily"))){
+                    && ((intent.getStringExtra("fromwhere").equals("submitdaily") ||
+                    intent.getStringExtra("fromwhere").equals("dodaily")) ||
+                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
                 startActivity(new Intent(activity,OAActivity.class));
                 finish();
             }else {
@@ -196,11 +275,12 @@ public class WorkDailyShowActivity extends BaseActivity {
     @Override
     public void onBackPressed() {
         final  Intent intent = getIntent();
-        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
-                && (intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                intent.getStringExtra("fromwhere").equals("dodaily"))){
-            startActivity(new Intent(activity,OAActivity.class));
-            finish();
+        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere")) &&
+              (intent.getStringExtra("fromwhere").equals("submitdaily") ||
+                    intent.getStringExtra("fromwhere").equals("dodaily")||
+                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
+                startActivity(new Intent(activity,OAActivity.class));
+                finish();
         }else {
             finish();
         }
@@ -218,7 +298,7 @@ public class WorkDailyShowActivity extends BaseActivity {
                         ToastMessage("加载完毕");
                     }
                     String result = msg.getData().getString("result");
-                    LogUtil.prinlnLongMsg("handleMessage: ", result);
+                    LogUtil.prinlnLongMsg("dailylist: ", result);
                     // TODO: 2016/11/1 json数据解析
                     mPullToRefreshListView.setVisibility(View.VISIBLE);
                     mPullToRefreshListView.onRefreshComplete();
@@ -231,10 +311,9 @@ public class WorkDailyShowActivity extends BaseActivity {
                             mEmptyLayout.showEmpty();
                         } else {
                           //  Log.i("aaaaa",dailydataArray.toString());
-                            mWorkDailyList.addAll(JSON.parseArray(dailydataArray.toString(),WorkDailyBean.class));
+                            mWorkDailyList.addAll(JSON.parseArray(dailydataArray.toString(), WorkDailyBean.class));
                             mWorkDailyAdapter.setmWorkDailyBeanList(mWorkDailyList);
                             mWorkDailyAdapter.notifyDataSetChanged();
-
                         }
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -245,6 +324,14 @@ public class WorkDailyShowActivity extends BaseActivity {
         }
     };
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+       if (resultCode == DailydetailsActivity.DELETE_SUCCEED){
+           mWorkDailyList.remove(mPosition);
+           mWorkDailyAdapter.notifyDataSetChanged();
+       }
+    }
+
     private void putDownInput() {
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(mSearchEt.getWindowToken(), 0);

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

@@ -18,6 +18,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.AbstractHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
@@ -200,8 +201,8 @@ public class HttpClient {
         if (!TextUtils.isEmpty(MyApplication.getInstance().getJSESSION_B2B())) {
             httpGet.addHeader("Cookie", "JSESSIONID=" + MyApplication.getInstance().getJSESSION_B2B());
         }
-//        httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 20000);
-//        httpclient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 20000);
+        httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 5000);
+        httpclient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 5000);
         HttpResponse response = httpclient.execute(httpGet);
         if (response.getStatusLine().getStatusCode() == 200) {
             String temp = EntityUtils.toString(response.getEntity());

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

@@ -430,7 +430,7 @@ public class ViewUtil {
                     if (mdProcessDialog != null && mdProcessDialog.isShowing()) {
                         mdProcessDialog.dismiss();
                     }
-                    ToastMessage(MyApplication.getInstance(), "网络超时响应！", Style.holoRedLight, 3000);
+                    ToastMessage(MyApplication.getInstance(), "当前网络不佳，请稍等！", Style.holoRedLight, 3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     if (new JsonValidator().validate(msg.getData().getString("result"))) {

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

@@ -226,8 +226,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         VideoFileDao.getInstance().deleteAllVideoFile(
                 VideoFileDao.getInstance().getVideoFiles(
                         MyApplication.getInstance().mLoginUser.getUserId()));
-//        new ClearCacheAsyncTaska(filePath).execute(true);
-        new ClearCacheAsyncTaska(filePath).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,true);
         if (Build.VERSION.SDK_INT >= 11)
             new ClearCacheAsyncTaska(filePath).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,true);
         else

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DownloadUtil.java

@@ -16,7 +16,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import java.io.File;
-import java.net.URLDecoder;
 
 /**
  * 下载类
@@ -60,7 +59,7 @@ public class DownloadUtil {
          */
         String fileName = url.substring(url.lastIndexOf("/") + 1);
         fileName=fileName.split("&")[3].split("=")[1];
-        fileName = URLDecoder.decode(fileName);
+        //fileName ="UU.apk";
          /*
          *系统下载服务类
          */

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

@@ -99,7 +99,8 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_sale_list"
         style="@style/ListViewdoc"
-        android:divider="@drawable/bg_bar"
+       
+        android:background="@color/Transpant"
         android:layout_below="@id/view_v1"/>
 
     <com.github.clans.fab.FloatingActionButton

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

@@ -360,13 +360,17 @@
                     android:textColor="#FF8E57"
                     android:textSize="15sp" />
             </LinearLayout>
-
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
             <com.xzjmyk.pm.activity.view.steps.StepsView
                 android:id="@+id/stepsView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:layout_marginTop="0dp" />
+            </HorizontalScrollView>
         </LinearLayout>
 
         <LinearLayout

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

@@ -6,6 +6,7 @@
     android:orientation="vertical"
     tools:context=".ui.erp.activity.oa.LocationMapActivity">
     <RelativeLayout
+        android:id="@id/search_rl"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@drawable/bg_bar"

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

@@ -120,12 +120,10 @@
                     style="@style/form_relative_right_text1"
                     android:textColor="#575757"
                     android:text="计划啦"/>
-
-
                 </LinearLayout>
 
                 <LinearLayout
-                    android:id="@+id/work_daily_detail_experience_ll"
+                        android:id="@+id/work_daily_detail_experience_ll"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -144,102 +142,86 @@
                         android:textColor="#575757"
                         />
 
-                <TextView
-                    android:id="@+id/work_daily_detail_experience_tv"
-                    style="@style/form_relative_right_text1"
-                    android:textColor="#575757"
-                    android:text="心得啦"
-                    />
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/line"
-                            android:background="@color/item_line"
-                            android:layout_marginRight="5dp"
-                            android:visibility="gone"/>
+                    <TextView
+                        android:id="@+id/work_daily_detail_experience_tv"
+                        style="@style/form_relative_right_text1"
+                        android:textColor="#575757"
+                        android:text="心得啦"
+                        />
+
                  </LinearLayout>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="visible">
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:background="#f6f5f5"
-                        android:visibility="gone">
-                <TextView
+                    android:id="@+id/work_daily_detail_donetask_ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="已完成任务"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="5dp"
-                    android:textSize="18sp"
-                    android:textColor="#575757"
+                    android:orientation="vertical"
                     android:visibility="visible"
-                    />
-                <TextView
-                    android:id="@+id/work_daily_detail_no_task"
-                    style="@style/form_relative_right_text1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="今天暂无分配工作任务"
                     android:layout_marginLeft="10dp"
-                    android:textColor="#575757"
-                    android:visibility="visible"
-                    />
+                    android:layout_marginRight="10dp">
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/line"
+                        android:background="@color/item_line"
+                        android:layout_marginRight="5dp"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="已完成任务"
+                        android:layout_marginTop="5dp"
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        />
+
+                    <TextView
+                        android:id="@+id/work_daily_detail_donetask_tv"
+                        style="@style/form_relative_right_text1"
+                        android:textColor="#575757"
+                        android:text="工作任务"
+                        android:minHeight="10dp"
+                        />
 
+                </LinearLayout>
 
-                <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_completedtask_lv"
+                <LinearLayout
+                    android:id="@+id/work_daily_detail_undotask_ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#f6f5f5"
-                    android:visibility="visible">
-                </com.xzjmyk.pm.activity.view.MyListView>
-
-                    <TextView
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    >
+                    <View
                         android:layout_width="match_parent"
+                        android:layout_height="@dimen/line"
+                        android:background="@color/item_line"
+                        android:layout_marginRight="5dp"/>
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="未完成任务"
-                        android:layout_marginLeft="10dp"
                         android:layout_marginTop="5dp"
                         android:textSize="18sp"
                         android:textColor="#575757"
-                        android:visibility="visible"
                         />
 
-                    <com.xzjmyk.pm.activity.view.MyListView
-                        android:id="@+id/work_daily_detail_uncompletedtask_lv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="#f6f5f5"
-                        android:visibility="visible">
-                    </com.xzjmyk.pm.activity.view.MyListView>
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="5dp"
-                            android:background="#EBE9E9"
-                            android:layout_marginTop="5dp"
-                            android:visibility="visible"/>
-                        </LinearLayout>
+                    <TextView
+                        android:id="@+id/work_daily_detail_undotask_tv"
+                        style="@style/form_relative_right_text1"
+                        android:textColor="#575757"
+                        android:text="未完成任务"
+                        />
 
+                </LinearLayout>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="10dp"
                         android:background="@color/black_gray"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginTop="1dp"
                         android:visibility="visible"/>
-                    <TextView
-                        android:id="@+id/work_daily_detail_back_to_add"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="16sp"
-                        android:text="没提交？快点我去提交"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="5dp"
-                        android:visibility="gone"/>
+
 
                 <com.xzjmyk.pm.activity.view.MyListView
                     android:id="@+id/work_daily_detail_approval_flow_lv"
@@ -250,7 +232,7 @@
                     >
                 </com.xzjmyk.pm.activity.view.MyListView>
 
-                 </LinearLayout>
+
              </LinearLayout>
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>

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

@@ -81,6 +81,17 @@
         android:textSize="14sp"
         android:textColor="#575757"
         />
+
+    <TextView
+        android:id="@+id/unsubmit_delete_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="删 除"
+        android:textColor="@color/titleBlue"
+        android:layout_gravity="right"
+        android:layout_marginRight="10dp"
+        android:visibility="visible"
+        android:layout_marginBottom="5dp"/>
 </LinearLayout>
     <View
         android:layout_width="match_parent"