处理关于消息首页代办工作没有消息提醒问题

修改首页网络请求方式

WeiChat/build.gradle

@@ -112,14 +112,14 @@ dependencies {
     compile('com.facebook.stetho:stetho:1.4.1') {
         force = true
     }
+    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.alibaba:fastjson:1.2.24'
     compile project(':library-refreshlayout')
     compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
     compile files('libs/lite-orm-1.7.0.jar')
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.alibaba:fastjson:1.2.24'
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'com.alibaba:fastjson:1.2.24'
     compile 'joda-time:joda-time:2.9.4'
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     compile 'com.android.support:support-v4:22.2.1'
@@ -133,7 +133,6 @@ dependencies {
     compile 'cat.ereza:customactivityoncrash:1.5.0'
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.github.TonicArtos:StickyGridHeaders:1.0.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'

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

@@ -335,7 +335,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     };
 
     private void endActivity() {
-        CommonInterface.getInstance().endMission(vp_id, true);
+        if (isOutplan)
+            CommonInterface.getInstance().endMission(vp_id, true);
         Intent intent = new Intent();
         intent.putExtra("data", "data");
         setResult(0x20, intent);
@@ -384,6 +385,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             Crouton.makeText(ct, "开始时间不能大于截止时间");
             return false;
         }
+        if (TextUtils.isEmpty(tv_visit_content.getText())) {
+            Crouton.makeText(ct, "请输入拜访内容");
+            return false;
+        }
         return tv_customer_login.testValidity() && tv_linksman_login.testValidity() && tv_address_login.testValidity()
                 && tv_visit_theme.testValidity();
     }

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

@@ -131,14 +131,13 @@ public class NavigationActivity extends BaseActivity {
 
 
     private void userOtherMap() {
-        userBaiduWebMap();
-//        if (isInstallBaidu()) {
-//            LogUtil.i("百度地图客户端已经安装");
-//            userBauduMap();
-//        } else {
-//            LogUtil.i("百度地图客户端没有安装");
-//            userBaiduWebMap();
-//        }
+        if (isInstallBaidu()) {
+            LogUtil.i("百度地图客户端已经安装");
+            userBauduMap();
+        } else {
+            LogUtil.i("百度地图客户端没有安装");
+            userBaiduWebMap();
+        }
     }
 
     private boolean isInstallBaidu() {
@@ -166,12 +165,12 @@ public class NavigationActivity extends BaseActivity {
                 "&destination=latlng:" + toLocation.latitude + "," + toLocation.longitude + "|name:终点" +
                 "&mode=driving&region=深圳&output=html&src=com.xzjmyk.pm.activity";
         String title = "导航";
+        url = "www.baidu.com";
         LogUtil.i(url);
-        Intent intent=new Intent(ct,NavigationWebActivity.class);
-        intent.putExtra("title",title)
-        .putExtra("url",url);
+        Intent intent = new Intent(ct, NavigationWebActivity.class);
+        intent.putExtra("title", title)
+                .putExtra("url", url);
         startActivity(intent);
     }
 
-
 }

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

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -14,9 +13,11 @@ import com.handmark.pulltorefresh.library.PullToRefreshWebView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
-public class NavigationWebActivity extends AppCompatActivity {
+public class NavigationWebActivity extends BaseActivity {
     @ViewInject(R.id.loading_pb)
     private ProgressBar loading_pb;
     @ViewInject(R.id.webView)
@@ -31,15 +32,16 @@ public class NavigationWebActivity extends AppCompatActivity {
     }
 
     private void initView() {
-        Intent intent = new Intent();
+        Intent intent =getIntent();
         if (intent != null) {
             String title = intent.getStringExtra("title");
             if (!StringUtils.isEmpty(title))
                 getSupportActionBar().setTitle(title);
             String url = intent.getStringExtra("url");
             if (!StringUtils.isEmpty(url)) {
-                loadWebView(url);
+                LogUtil.i(url);
                 webEvent();
+                loadWebView(url);
             }
         }
     }

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

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -78,7 +78,8 @@ public class PlatWDdetailyActivity extends BaseActivity {
     @ViewInject(R.id.work_daily_detail_plan_ll)
     private LinearLayout plan_ll;
     @ViewInject(R.id.work_daily_detail_experience_ll)
-    private LinearLayout experience_ll; ;
+    private LinearLayout experience_ll;
+    ;
     @ViewInject(R.id.work_daily_detail_approval_flow_lv)
     private MyListView approval_flowlv;
     @ViewInject(R.id.work_daily_unsubmit_iv)
@@ -151,24 +152,24 @@ public class PlatWDdetailyActivity extends BaseActivity {
         Intent intent = getIntent();
         fromwhere = intent.getStringExtra("fromwhere");
 //        fromwhere = "examine_and_approve";
-        if (!StringUtils.isEmpty(fromwhere) && "examine_and_approve".equals(fromwhere)){
-            deal_id = intent.getIntExtra("deal_id",-1); // TODO 用来操作：同意，不同意，变更
-            detail_id = intent.getIntExtra("detail_id",-1); //
-            deal_type = intent.getIntExtra("deal_type",-1);
+        if (!StringUtils.isEmpty(fromwhere) && "examine_and_approve".equals(fromwhere)) {
+            deal_id = intent.getIntExtra("deal_id", -1); // TODO 用来操作：同意，不同意，变更
+            detail_id = intent.getIntExtra("detail_id", -1); //
+            deal_type = intent.getIntExtra("deal_type", -1);
             resanddel_ll.setVisibility(View.GONE);
             a_and_disa_ll.setVisibility(View.VISIBLE);
             Log.i("deal_id,detail_id", deal_id + "," + detail_id);
 
-            if (deal_type == 1){  //待审批界面进去传值
+            if (deal_type == 1) {  //待审批界面进去传值
                 a_and_disa_ll.setVisibility(View.VISIBLE);
-            }else {
+            } else {
                 a_and_disa_ll.setVisibility(View.GONE);
             }
 
-            if(detail_id!= -1){
-                if (MyApplication.getInstance().isNetworkActive()){
+            if (detail_id != -1) {
+                if (MyApplication.getInstance().isNetworkActive()) {
                     loadeapData(detail_id);// 用来获取单据详情数据
-                }else {
+                } else {
                     ToastMessage(getResources().getString(R.string.networks_out));
                     hide_above_af.setVisibility(View.GONE);
                     a_and_disa_ll.setVisibility(View.GONE);
@@ -176,13 +177,13 @@ public class PlatWDdetailyActivity extends BaseActivity {
                     progressDialog.dismiss();
                 }
 
-            }else{
+            } else {
                 approval_flowlv.setVisibility(View.GONE);
                 hide_above_af.setVisibility(View.GONE);
                 progressDialog.dismiss();
                 csv_hide.setVisibility(View.GONE);
             }
-        }else {
+        } else {
             csv_hide.setVisibility(View.VISIBLE);
             mkeyValue = intent.getIntExtra("ID", -1);
             a_and_disa_ll.setVisibility(View.GONE);
@@ -193,11 +194,11 @@ public class PlatWDdetailyActivity extends BaseActivity {
 
     private void loadeapData(int mkeyValue) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_doc_detaily_url;
-        Map<String,Object> param = new HashMap<>();
-        param.put("id",mkeyValue);
-        param.put("whichpage",4);
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", mkeyValue);
+        param.put("whichpage", 4);
         param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-        param.put("emcode",CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+        param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, COMMON_DOC_DETAILY, null, null, "get");
@@ -209,7 +210,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
         final Intent intent = getIntent();
         date = intent.getStringExtra("Date");
         summary = intent.getStringExtra("Content");
-        if (!TextUtils.isEmpty(intent.getStringExtra("WD_Status"))){
+        if (!TextUtils.isEmpty(intent.getStringExtra("WD_Status"))) {
             wd_status = intent.getStringExtra("WD_Status");
         }
         if (!TextUtils.isEmpty(intent.getStringExtra("Plan"))) {
@@ -227,12 +228,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
         wdd_plan.setText(plan);
         wdd_experience.setText(experience);
 
-        Log.i("platwd_status",wd_status);
-        if("已审核".equals(wd_status) || "已审批".equals(wd_status)){
+        Log.i("platwd_status", wd_status);
+        if ("已审核".equals(wd_status) || "已审批".equals(wd_status)) {
             wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
             wdd_status.setText("已审批");
             resanddel_ll.setVisibility(View.GONE);
-        }else if (wd_status.equals("已提交")){
+        } else if (wd_status.equals("已提交")) {
             wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
             wdd_status.setText("待审批");
             resanddel_ll.setVisibility(View.VISIBLE);
@@ -246,16 +247,16 @@ public class PlatWDdetailyActivity extends BaseActivity {
 //        }
 
         // 当获取到正确的单据caller和单据id时 请求获取审批流数据
-        if(!TextUtils.isEmpty(mCaller)&&mkeyValue!= -1){
-           progressDialog.dismiss();
+        if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
+            progressDialog.dismiss();
             //TODO 请求获取审批流数据
-            if (MyApplication.getInstance().isNetworkActive()){
-                loadPlatAppFlow(mCaller,mkeyValue);
-            }else {
+            if (MyApplication.getInstance().isNetworkActive()) {
+                loadPlatAppFlow(mCaller, mkeyValue);
+            } else {
                 ToastMessage(getResources().getString(R.string.networks_out));
             }
 
-        }else{
+        } else {
             approval_flowlv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
         }
@@ -264,8 +265,8 @@ public class PlatWDdetailyActivity extends BaseActivity {
 
     private void loadPlatAppFlow(String mCaller, int mkeyValue) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_app_flow_nodes_url;
-        Map<String,Object> param = new HashMap<>();
-        param.put("id",mkeyValue);
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", mkeyValue);
         param.put("caller", "工作日报");
         param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
@@ -274,7 +275,9 @@ public class PlatWDdetailyActivity extends BaseActivity {
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, PLAT_APP_FLOW_NODES, null, null, "get");
 
     }
-private int agree_type = 0;
+
+    private int agree_type = 0;
+
     private void clickEvent() {
         resubmit_ll.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -339,7 +342,9 @@ private int agree_type = 0;
         });
 
     }
+
     private PopupWindow popupWindow = null;
+
     private void doDealDescribe(final int agree_type, final int deal_id) {
         View contentView = LayoutInflater.from(ct).inflate(
                 R.layout.common_edit_window, null);
@@ -357,7 +362,7 @@ private int agree_type = 0;
             @Override
             public void onClick(View v) {
                 String describe = "";
-                doAgreeorDisAgree(agree_type, deal_id,describe);
+                doAgreeorDisAgree(agree_type, deal_id, describe);
                 popupWindow.dismiss();
             }
         });
@@ -384,6 +389,7 @@ private int agree_type = 0;
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);
     }
+
     private void setbg(float alpha) {
         setBackgroundAlpha(this, alpha);
         if (popupWindow == null) return;
@@ -394,6 +400,7 @@ private int agree_type = 0;
             }
         });
     }
+
     /**
      * 设置页面的透明度
      * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
@@ -410,57 +417,70 @@ private int agree_type = 0;
         }
         activity.getWindow().setAttributes(lp);
     }
+
     private void doSelectDealMan() {
-        HashMap param = new HashMap<>();
-        param.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
-        Bundle bundle = new Bundle();
-        bundle.putSerializable("param", param);
-        Intent intent = new Intent(ct, SelectActivity.class);
-        intent.putExtra("type", 1);
-        intent.putExtra("isSingle",true);
-        intent.putExtra("reid", R.style.OAThemeMeet);
-        intent.putExtras(bundle);
-        intent.putExtra("key", "data");
-        intent.putExtra("method", "get");
-        intent.putExtra("showKey", "emname");
-        intent.putExtra("action", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo);//
+//        HashMap param = new HashMap<>();
+//        param.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
+//        Bundle bundle = new Bundle();
+//        bundle.putSerializable("param", param);
+//        Intent intent = new Intent(ct, SelectActivity.class);
+//        intent.putExtra("type", 1);
+//        intent.putExtra("isSingle",true);
+//        intent.putExtra("reid", R.style.OAThemeMeet);
+//        intent.putExtras(bundle);
+//        intent.putExtra("key", "data");
+//        intent.putExtra("method", "get");
+//        intent.putExtra("showKey", "emname");
+//        intent.putExtra("action", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo);//
+//        startActivityForResult(intent, 0x01);
+
+        Intent intent = new Intent(ct, SelectCollisionActivity.class);
+        intent.putExtra("title", "选择执行人");
+        intent.putExtra("single", true);
         startActivityForResult(intent, 0x01);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) {
-            if (resultCode == 0x333 ){
+            if (resultCode == 0x333) {
                 loadPlatAppFlow(mCaller, detail_id);
                 myAdapter.notifyDataSetChanged();
                 a_and_disa_ll.setVisibility(View.GONE);
                 ToastMessage("变更成功，刷新审批节点");
-            }else {
+            } else {
                 return;
             }
-        }else if(requestCode == 0x01 && resultCode == 0x20){
-            SelectBean d=data.getParcelableExtra("data");
-            if (d != null){
-                String single_man_name = d.getName();
-                int single_man_emcode = JSON.parseObject(d.getJson()).getInteger("emcode");
+        } else if (requestCode == 0x01 && resultCode == 0x20) {
+            SelectEmUser d = data.getParcelableExtra("data");
+            if (d != null) {
+                String single_man_name = d.getEmName();
+                int single_man_emcode = -1;
+                String emcode = d.getEmCode();
+                try {
+                    single_man_emcode = Integer.valueOf(emcode);
+                } catch (ClassCastException e) {
+
+                }
                 startActivityForResult(new Intent(getApplicationContext(), ChangeDealManActivity.class)
-                        .putExtra("deal_id", deal_id)
-                        .putExtra("single_man_emcode", single_man_emcode)
-                        .putExtra("single_man_name", single_man_name)
-                        ,0x325);
+                                .putExtra("deal_id", deal_id)
+                                .putExtra("single_man_emcode", single_man_emcode)
+                                .putExtra("single_man_name", single_man_name)
+                        , 0x325);
             }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
-    private void doAgreeorDisAgree(int agree_type, int deal_id,String describe) {
+
+    private void doAgreeorDisAgree(int agree_type, int deal_id, String describe) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_doc_examine_and_approve_url;
-        Map<String,Object> param = new HashMap<>();
-        param.put("id",deal_id);
-        param.put("description",describe);
-        param.put("dealtype",agree_type);
-        param.put("whichpage",4);
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", deal_id);
+        param.put("description", describe);
+        param.put("dealtype", agree_type);
+        param.put("whichpage", 4);
         param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-        param.put("emcode",CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+        param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, AGREE_OR_DISAGREE, null, null, "post");
@@ -471,25 +491,26 @@ private int agree_type = 0;
         progressDialog.show();
         HashMap<String, Object> params = new HashMap<>();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_delete_approval_flow_url;//这个接口仅仅是反提交操作
-        Map<String,Object> param = new HashMap<>();
-        param.put("id",mkeyValue);
-        param.put("whichpage",4);
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", mkeyValue);
+        param.put("whichpage", 4);
         param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        if (retype.equals("reforsub")){  //反提交之重新提交请求
+        if (retype.equals("reforsub")) {  //反提交之重新提交请求
             ViewUtil.httpSendRequest(this, url, param, handler, headers, RESUBMIT_OF_DELETEAPPFL, null, null, "post");
-        }else if (retype.equals("refordelete")){ //反提交之删除请求
+        } else if (retype.equals("refordelete")) { //反提交之删除请求
             ViewUtil.httpSendRequest(this, url, param, handler, headers, DELETE_OF_DELETEAPPFL, null, null, "post");
         }
     }
+
     private void doPlatDeleteByid(int mkeyValue) {
         //删除
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().delete_work_daily;
-        Map<String,Object> param = new HashMap<>();
-        param.put("id",mkeyValue);
-        param.put("whichpage",4);
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", mkeyValue);
+        param.put("whichpage", 4);
         param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -497,24 +518,24 @@ private int agree_type = 0;
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, PLAT_DELETE_DAILY, null, null, "post");
 
     }
-    
-    private Handler handler = new Handler(){
+
+    private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            switch (msg.what){
+            switch (msg.what) {
                 case PLAT_APP_FLOW_NODES:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String app_flow_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("app_flow_result",app_flow_result);
+                        LogUtil.prinlnLongMsg("app_flow_result", app_flow_result);
                         doPlatComAfShow(app_flow_result);
                         progressDialog.dismiss();
                     }
                     break;
                 case RESUBMIT_OF_DELETEAPPFL:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String r_for_s_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("r_for_s_result",r_for_s_result);
+                        LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
                         ToastMessage("反提交成功");
                         startActivity(new Intent(activity, WorkDailyAddActivity.class)
                                 .putExtra("caller", mCaller)
@@ -528,19 +549,20 @@ private int agree_type = 0;
                     }
                     break;
                 case DELETE_OF_DELETEAPPFL:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String r_for_d_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("r_for_d_result",r_for_d_result); ToastMessage("反提交成功");
+                        LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result);
+                        ToastMessage("反提交成功");
                         doPlatDeleteByid(mkeyValue);
                     }
                     break;
 
-                case  COMMON_DOC_DETAILY: // 审批人进去详情界面进行审批
-                    if (msg.getData() != null){
+                case COMMON_DOC_DETAILY: // 审批人进去详情界面进行审批
+                    if (msg.getData() != null) {
                         String com_doc_details = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("com_doc_details", com_doc_details);
-                        JSONObject dataObject  = JSON.parseObject(com_doc_details).getJSONObject("data");
-                        if (dataObject != null){
+                        JSONObject dataObject = JSON.parseObject(com_doc_details).getJSONObject("data");
+                        if (dataObject != null) {
                             try {
                                 mkeyValue = dataObject.getIntValue("wd_id");
                                 long plat_date = dataObject.getLongValue("wd_date");
@@ -550,36 +572,36 @@ private int agree_type = 0;
                                 experience = dataObject.getString("wd_experience");
                                 wd_status = dataObject.getString("wd_status");
                                 dodetailsShow(date, summary, plan, experience, wd_status);
-                            }catch (Exception e){
+                            } catch (Exception e) {
                                 e.printStackTrace();
                             }
-                        }else {
+                        } else {
                             ToastMessage("单据详情已被删除");
                             ly_head_display.setVisibility(View.GONE);
                             a_and_disa_ll.setVisibility(View.GONE);
                             csv_hide.setVisibility(View.GONE);
                         }
-                    }else {
+                    } else {
                         ly_head_display.setVisibility(View.GONE);
                         a_and_disa_ll.setVisibility(View.GONE);
                         ToastMessage("单据详情已被删除");
                         csv_hide.setVisibility(View.GONE);
                     }
-                    Log.d("DailyData",summary + "," + plan + "," + experience + "," + date + "," + wd_status);
+                    Log.d("DailyData", summary + "," + plan + "," + experience + "," + date + "," + wd_status);
                     loadPlatAppFlow(mCaller, mkeyValue);
                     break;
                 case PLAT_DELETE_DAILY:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String delete_result = msg.getData().getString("result");
-                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")){
+                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
                             Toast.makeText(mContext, "删除成功", Toast.LENGTH_LONG);
-                            if (!TextUtils.isEmpty(fromwhere) && "submitdaily".equals(fromwhere)){
-                                startActivity(new Intent(activity,PlatDailyShowActivity.class));
+                            if (!TextUtils.isEmpty(fromwhere) && "submitdaily".equals(fromwhere)) {
+                                startActivity(new Intent(activity, PlatDailyShowActivity.class));
                                 finish();
-                            }else if (!TextUtils.isEmpty(fromwhere) && "dailylist".equals(fromwhere)){
+                            } else if (!TextUtils.isEmpty(fromwhere) && "dailylist".equals(fromwhere)) {
                                 Intent intent = new Intent();
-                                intent.putExtra("delete_succeed","delete_succeed");
-                                intent.putExtra("deleted_id",mkeyValue);
+                                intent.putExtra("delete_succeed", "delete_succeed");
+                                intent.putExtra("deleted_id", mkeyValue);
                                 setResult(DELETE_SUCCEED, intent);
                                 progressDialog.dismiss();
                                 finish();
@@ -591,17 +613,17 @@ private int agree_type = 0;
                     break;
 
                 case AGREE_OR_DISAGREE:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String agree_or_disagree_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("agree_or_disagree_result", agree_or_disagree_result);
-                        Toast.makeText(getApplicationContext(),"操作成功",Toast.LENGTH_LONG).show();
+                        Toast.makeText(getApplicationContext(), "操作成功", Toast.LENGTH_LONG).show();
                         setResult(0x41701);
                         finish();
                     }
                     break;
 
                 case CHANGE_DEAL_MAN:
-                    if (msg.getData() != null){
+                    if (msg.getData() != null) {
                         String change_deal_man_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("change_deal_man_result", change_deal_man_result);
                     }
@@ -621,15 +643,15 @@ private int agree_type = 0;
     private void dodetailsShow(String date, String summary, String plan, String experience, String wd_status) {
         csv_hide.setVisibility(View.VISIBLE);
         resanddel_ll.setVisibility(View.GONE);
-        if (!StringUtils.isEmpty(plan)){
+        if (!StringUtils.isEmpty(plan)) {
             wdd_plan.setText(plan);
-        }else {
+        } else {
             plan_ll.setVisibility(View.GONE);
         }
 
-        if (!StringUtils.isEmpty(experience)){
+        if (!StringUtils.isEmpty(experience)) {
             wdd_experience.setText(experience);
-        }else {
+        } else {
             experience_ll.setVisibility(View.GONE);
         }
         wdd_status.setText(wd_status);
@@ -639,36 +661,36 @@ private int agree_type = 0;
 
     private void doPlatComAfShow(String app_flow_result) {
         JSONObject resultJsonObject = JSON.parseObject(app_flow_result);
-        if (resultJsonObject == null){
+        if (resultJsonObject == null) {
             approval_flowlv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
-        }else {
-            mPlatComAfBean = JSON.parseObject(resultJsonObject.toString(),PlatComAfBean.class);
+        } else {
+            mPlatComAfBean = JSON.parseObject(resultJsonObject.toString(), PlatComAfBean.class);
             //TODO 获取数据审批人姓名，头像,审批状态
-            if (!ListUtils.isEmpty(mPlatComAfBean.getData()) || !ListUtils.isEmpty(mPlatComAfBean.getNodes())){
+            if (!ListUtils.isEmpty(mPlatComAfBean.getData()) || !ListUtils.isEmpty(mPlatComAfBean.getNodes())) {
                 int datas_size = mPlatComAfBean.getData().size();
                 int nodes_size = mPlatComAfBean.getNodes().size();
-                if (nodes_size == 0 && datas_size > 0){
+                if (nodes_size == 0 && datas_size > 0) {
                     for (int i = 0; i < datas_size; i++) {
-                        if (!StringUtils.isEmpty(mPlatComAfBean.getData().get(i).getJp_nodename())){
+                        if (!StringUtils.isEmpty(mPlatComAfBean.getData().get(i).getJp_nodename())) {
                             afpeople_names.add(mPlatComAfBean.getData().get(i).getJp_nodename());
-                        }else {
+                        } else {
                             afpeople_names.add("");
                         }
                     }
-                }else if (nodes_size > 0 && nodes_size <= datas_size){
+                } else if (nodes_size > 0 && nodes_size <= datas_size) {
                     for (int i = 0; i < nodes_size; i++) {
-                        if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(i).getJn_dealManName())){
+                        if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(i).getJn_dealManName())) {
                             afpeople_names.add(mPlatComAfBean.getNodes().get(i).getJn_dealManName());
-                        }else {
+                        } else {
                             afpeople_names.add("");
                         }
                     }
 
                     for (int i = nodes_size; i < datas_size; i++) {
-                        if (!StringUtils.isEmpty(mPlatComAfBean.getData().get(i).getJp_nodename())){
+                        if (!StringUtils.isEmpty(mPlatComAfBean.getData().get(i).getJp_nodename())) {
                             afpeople_names.add(mPlatComAfBean.getData().get(i).getJp_nodename());
-                        }else {
+                        } else {
                             afpeople_names.add("");
                         }
                     }
@@ -691,24 +713,24 @@ private int agree_type = 0;
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            if (!TextUtils.isEmpty(fromwhere) && fromwhere.equals("submitdaily"))
-            {startActivity(new Intent(activity, PlatDailyShowActivity.class)
+            if (!TextUtils.isEmpty(fromwhere) && fromwhere.equals("submitdaily")) {
+                startActivity(new Intent(activity, PlatDailyShowActivity.class)
                         .putExtra("fromwhere", "dodaily"));
                 finish();
-            }else {
+            } else {
                 finish();
             }
-        }return true;
+        }
+        return true;
     }
 
     @Override
     public void onBackPressed() {
-        if (!TextUtils.isEmpty(fromwhere) && fromwhere.equals("submitdaily"))
-        {
+        if (!TextUtils.isEmpty(fromwhere) && fromwhere.equals("submitdaily")) {
             startActivity(new Intent(activity, PlatDailyShowActivity.class)
                     .putExtra("fromwhere", "dodaily"));
             finish();
-        }else {
+        } else {
             super.onBackPressed();
             finish();
         }

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

@@ -28,6 +28,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 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;
@@ -59,6 +60,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
     private boolean isClickCb = true;
     private EmptyLayout emptyLayout;
     private String tag;
+    private boolean single;
 
 
     @Override
@@ -82,6 +84,8 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
             String title = getIntent().getStringExtra("title");
             if (!StringUtils.isEmpty(title))
                 getSupportActionBar().setTitle(title);
+            single = getIntent().getBooleanExtra("single", false);
+            select_rl.setVisibility(single ? View.GONE : View.VISIBLE);
         }
         if (getIntent() != null)
             tag = getIntent().getStringExtra("tag");
@@ -137,10 +141,18 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 if (adapter == null) return;
-                boolean isClicked = !adapter.getListData().get(position).isClick();
-                setSelectNumber(isClicked);
-                adapter.getListData().get(position).setClick(isClicked);
-                adapter.notifyDataSetChanged();
+                if (single) {
+                    if (ListUtils.isEmpty(adapter.getListData()) || position >= adapter.getListData().size()) {
+                        LogUtil.i("选择错误");
+                        return;
+                    }
+                    presenter.sureSingle(SelectCollisionActivity.this, adapter.getListData().get(position).bean);
+                } else {
+                    boolean isClicked = !adapter.getListData().get(position).isClick();
+                    setSelectNumber(isClicked);
+                    adapter.getListData().get(position).setClick(isClicked);
+                    adapter.notifyDataSetChanged();
+                }
             }
         });
         final VoiceToWord voice = new VoiceToWord(SelectCollisionActivity.this, "534e3fe2");
@@ -170,7 +182,8 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
             select_rl.setVisibility(View.GONE);
         } else {
             sidebar.setVisibility(View.VISIBLE);
-            select_rl.setVisibility(View.VISIBLE);
+            if (!single)
+                select_rl.setVisibility(View.VISIBLE);
         }
 //        if (adapter == null) {
 //            adapter = new SelectCollisionAdapter(models);

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

@@ -178,7 +178,12 @@ public class OAModel {
 
     /*获取显示时间，yyyy-MM-dd*/
     public String getFilterTime() {
-        long time = startdate > 0 ? startdate : (recorddate > 0 ? recorddate : enddate);
+        long time = 0;
+        if (startdate > 0)
+            time = startdate;
+        else if (enddate > 0)
+            time = enddate;
+        else time =recorddate;
         return TimeUtils.s_long_2_str(time);
     }
 

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

@@ -31,7 +31,9 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
@@ -54,7 +56,7 @@ import java.util.Map;
  * Created by Bitliker on 2017/3/1.
  */
 
-public class MessagePresenter implements HttpHandler.OnResultListener {
+public class MessagePresenter implements OnHttpResultListener {
     private final int LOAD_EMNEWS = 0x11;
     private final int LOAD_SUBS = 0x12;
     private final int LOAD_PROCESS = 0x13;
@@ -122,7 +124,13 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
 
     private void loadB2bNewsCount() {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getTaskCounts;
-        HttpHandler.getInstance().loadB2BByNet(LOAD_B2B_COUNT, url, new HashMap<String, Object>(), null, this, "get");
+        Request request = new Request.Bulider()
+                .setParam(new HashMap<String, Object>())
+                .setUrl(url)
+                .setMode(Request.Mode.GET)
+                .setWhat(LOAD_B2B_COUNT)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
 
@@ -135,7 +143,14 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         param.put("count", 100);
         param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + TimeUtils.int_long_2_str(System.currentTimeMillis()) + "'");
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        HttpHandler.getInstance().loadERPByNet(LOAD_SUBS, "common/desktop/subs/getSubs.action", param, null, this, "get");
+
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl("common/desktop/subs/getSubs.action")
+                .setMode(Request.Mode.GET)
+                .setWhat(LOAD_SUBS)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     /**
@@ -151,7 +166,14 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         } else
             param.put("emcode", CommonUtil.getEmcode());
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().releaseCount : "mobile/queryEmNews.action";
-        HttpHandler.getInstance().loadByNet(LOAD_EMNEWS, url, param, null, "get", this);
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl(url)
+                .setMode(Request.Mode.GET)
+                .setWhat(LOAD_EMNEWS)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
+
     }
 
     /**
@@ -170,14 +192,29 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         Bundle bundle = new Bundle();
         bundle.putString("type", type);
         bundle.putBoolean("isReaded", isReaded);
-        HttpHandler.getInstance().loadERPByNet(LOAD_EMNEWS_DETAILS, "mobile/queryEmNewsDetails.action", param, bundle, this, "get");
+
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl("mobile/queryEmNewsDetails.action")
+                .setMode(Request.Mode.GET)
+                .setBundle(bundle)
+                .setWhat(LOAD_EMNEWS_DETAILS)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     private void postReadNews(String ids) {
         Map<String, Object> param = new HashMap<>();
         param.put("ids", ids);
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().countBack;
-        HttpHandler.getInstance().loadByNet(LOAD_EMNEWS_DETAILS, url, param, null, "post", this);
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl(url)
+                .setMode(Request.Mode.POST)
+                .setBundle(null)
+                .setWhat(LOAD_EMNEWS_DETAILS)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     /**
@@ -189,13 +226,20 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         param.put("_noc", 1);
         param.put("page", 1);
         param.put("pageSize", 100);
+        param.put("status", "");
         param.put("caller", "ResourceAssignment");
         String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
-        String erp_emid = CommonUtil.getSharedPreferences(ct, "erp_emid");
-        String condition = "(ra_statuscode='UNCONFIRMED' and recorderid='" + erp_emid + "') or (ra_resourcecode='" + em_code + "' and ra_statuscode='START') and nvl(class,' ')<>'projecttask'";
+        String condition = "ra_resourcecode='" + em_code + "'" + " and ra_status='进行中'" + " and nvl(class,' ')<>'projecttask'";
         param.put("condition", condition);
-        HttpHandler.getInstance().loadERPByNet(LOAD_TASK, "common/datalist/data.action",
-                param, null, this, "get");
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl("common/datalist/data.action")
+                .setMode(Request.Mode.GET)
+                .setBundle(null)
+                .setWhat(LOAD_TASK)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
+
     }
 
     /**
@@ -206,7 +250,15 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         Map<String, Object> param = new HashMap<>();
         param.put("count", "1000");
         param.put("page", 1);//默认获取第一页
-        HttpHandler.getInstance().loadERPByNet(LOAD_PROCESS, "common/desktop/process/toDo.action", param, null, this, "get");
+
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setUrl("common/desktop/process/toDo.action")
+                .setMode(Request.Mode.GET)
+                .setBundle(null)
+                .setWhat(LOAD_PROCESS)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
 
@@ -266,7 +318,7 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
 
 
     @Override
-    public void error(int what, int statuCode, String message, Bundle bundle) {
+    public void error(int what, String message, Bundle bundle) {
     }
 
 
@@ -436,7 +488,7 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
                 if (!ListUtils.isEmpty(models))
                     MessageDao.getInstance().createOrinstart(models, true);
                 final List<BaseSortModel<Friend>> chche = loadDataByImAsync();//loadDataByImAsync()
-                HttpHandler.getInstance().post(new Runnable() {
+                OAHttpHelper.getInstance().post(new Runnable() {
                     @Override
                     public void run() {
                         if (mFriendList == null) mFriendList = new ArrayList<>();

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

@@ -20,6 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 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.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CompanyHandlerInfoUtil;
@@ -31,6 +32,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static com.xzjmyk.pm.activity.R.id.position;
+
 /**
  * Created by Bitliker on 2017/2/14.
  */
@@ -40,6 +43,7 @@ public class SelectCollisionPresenter {
     private List<BaseSortModel<SelectEmUser>> allList;
     private BaseComparator<SelectEmUser> mBaseComparator;
     private String selectName;
+
     private boolean backClicked;//确定时候是否返回选中的，如果不是，就是返回不选中的
 
     public SelectCollisionPresenter(ISelectActiveView iSelectActiveView) {
@@ -125,6 +129,14 @@ public class SelectCollisionPresenter {
         ct.finish();
     }
 
+    public void sureSingle(BaseActivity ct, SelectEmUser user) {
+
+        Intent intent = new Intent();
+        intent.putExtra("data", user);
+        ct.setResult(0x20, intent);
+        ct.finish();
+    }
+
     private ArrayList<SelectEmUser> getClickNumber() {
         ArrayList<SelectEmUser> chche = new ArrayList<>();
         for (BaseSortModel<SelectEmUser> e : allList) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/ISelectActiveView.java

@@ -19,4 +19,5 @@ public interface ISelectActiveView extends HttpImp {
     void showSureText(String text);
 
     void isAllClicked(boolean clickAll);
+
 }

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

@@ -11,6 +11,8 @@ import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -59,8 +61,8 @@ public class OAHttpUtil {
             model = new OAModel();
             model.setType(type);
             model.setMe(isMe);
-            model.setStartdate(getTimeMillis(o, "startdate", "mpd_actdate", "mp_firsttime"));
-            model.setEnddate(getTimeMillis(o, "enddate", "mpd_outdate", "mp_lasttime"));
+            model.setStartdate(getTimeMillis(o, "vr_startdate", "startdate", "mpd_actdate", "mp_firsttime"));
+            model.setEnddate(getTimeMillis(o, "enddate", "vr_enddate", "mpd_outdate", "mp_lasttime"));
             //录入时间作为选择时间，如果没有录入，使用实际到达时间或是预计到达时间或开始时间
             model.setRecorddate(getTimeMillis(o, "recorddate", "vr_recorddate", "vr_date", "mpd_arrivedate", "startdate", "mpd_actdate"));
             model.setTitle(OACheckUtil.getJson2Text(o, "mpd_company", "name", "vr_cuname", "taskname", "custname"));
@@ -73,6 +75,14 @@ public class OAHttpUtil {
             model.setJson(o.toString());
             models.add(model);
         }
+        if (!ListUtils.isEmpty(models)) {
+            Collections.sort(models, new Comparator<OAModel>() {
+                @Override
+                public int compare(OAModel lhs, OAModel rhs) {
+                    return (int) (rhs.getRecorddate() - lhs.getRecorddate());
+                }
+            });
+        }
         return models;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -35,12 +35,12 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 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.ListUtils;
@@ -376,19 +376,24 @@ public class FormDetailActivity extends BaseActivity {
     }
 
     private void doSelectDealMan() {
-        HashMap param = new HashMap<>();
-        param.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
-        Bundle bundle = new Bundle();
-        bundle.putSerializable("param", param);
-        Intent intent = new Intent(ct, SelectActivity.class);
-        intent.putExtra("type", 1);
-        intent.putExtra("isSingle", true);
-        intent.putExtra("reid", R.style.OAThemeMeet);
-        intent.putExtras(bundle);
-        intent.putExtra("key", "data");
-        intent.putExtra("method", "get");
-        intent.putExtra("showKey", "emname");
-        intent.putExtra("action", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo);//
+        //TODO 修改，自行删除
+//        HashMap param = new HashMap<>();
+//        param.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
+//        Bundle bundle = new Bundle();
+//        bundle.putSerializable("param", param);
+//        Intent intent = new Intent(ct, SelectActivity.class);
+//        intent.putExtra("type", 1);
+//        intent.putExtra("isSingle", true);
+//        intent.putExtra("reid", R.style.OAThemeMeet);
+//        intent.putExtras(bundle);
+//        intent.putExtra("key", "data");
+//        intent.putExtra("method", "get");
+//        intent.putExtra("showKey", "emname");
+//        intent.putExtra("action", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo);//
+//        startActivityForResult(intent, 0x01);
+        Intent intent = new Intent(ct, SelectCollisionActivity.class);
+        intent.putExtra("title", "选择执行人");
+        intent.putExtra("single", true);
         startActivityForResult(intent, 0x01);
     }
 
@@ -404,10 +409,16 @@ public class FormDetailActivity extends BaseActivity {
                 return;
             }
         } else if (requestCode == 0x01 && resultCode == 0x20) {
-            SelectBean d = data.getParcelableExtra("data");
+            SelectEmUser d = data.getParcelableExtra("data");
             if (d != null) {
-                String single_man_name = d.getName();
-                int single_man_emcode = JSON.parseObject(d.getJson()).getInteger("emcode");
+                String single_man_name = d.getEmName();
+                int single_man_emcode = -1;
+                String emcode = d.getEmCode();
+                try {
+                    single_man_emcode = Integer.valueOf(emcode);
+                } catch (ClassCastException e) {
+
+                }
                 startActivityForResult(new Intent(getApplicationContext(), ChangeDealManActivity.class)
                                 .putExtra("deal_id", deal_id)
                                 .putExtra("single_man_emcode", single_man_emcode)

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

@@ -7,7 +7,7 @@
     <ProgressBar
         android:id="@+id/loading_pb"
         style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="5dip"
         android:animationResolution="100"
         android:indeterminate="false"

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

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
     <RelativeLayout
-        android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
         android:layout_height="50dp"
+        android:background="@drawable/bg_bar"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
@@ -30,16 +29,16 @@
 
         <ImageView
             android:id="@+id/voice_search_iv"
-            android:background="@drawable/btn_yuyin_nor"
-            android:visibility="visible"
-            android:layout_marginRight="25dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignRight="@+id/search_edit"
             android:layout_width="20dp"
             android:layout_height="20dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignRight="@+id/search_edit"
+            android:layout_marginRight="25dp"
             android:layout_marginTop="8dp"
-            />
+            android:background="@drawable/btn_yuyin_nor"
+            android:visibility="visible" />
     </RelativeLayout>
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_process"
         android:layout_width="match_parent"
@@ -47,7 +46,6 @@
         android:divider="@color/gray_light"
         android:dividerPadding="1px"
         android:listSelector="#00000000"
-        android:scrollingCache="false"
-        android:scrollbars="none" >
-    </com.handmark.pulltorefresh.library.PullToRefreshListView>
+        android:scrollbars="none"
+        android:scrollingCache="false"></com.handmark.pulltorefresh.library.PullToRefreshListView>
 </LinearLayout>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }