修改通讯录选择人员逻辑处理过程备份

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

@@ -283,9 +283,9 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 
                 break;
             case R.id.item_long_tv:
-                    intent = new Intent(ct, NavigationActivity.class);
-                    intent.putExtra("toLocation", model.getLatLng());
-                    startActivityForResult(intent, 0x23);
+                intent = new Intent(ct, NavigationActivity.class);
+                intent.putExtra("toLocation", model.getLatLng());
+                startActivityForResult(intent, 0x23);
                 break;
         }
     }
@@ -294,6 +294,14 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode != 0x20 || data == null) return;
+        try {
+            onResult(requestCode, resultCode, data);
+        } catch (Exception e) {
+
+        }
+    }
+
+    private void onResult(int requestCode, int resultCode, Intent data) throws Exception {
         if (requestCode == 0x20) {//选择公司
             SelectAimModel entity = data.getParcelableExtra("data");
             showSaveCompany(entity);
@@ -348,7 +356,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 
     private PopupWindow popupWindow = null;
 
-    private void showSaveCompany(final SelectAimModel entity) {
+    private void showSaveCompany(final SelectAimModel entity) throws Exception {
         // 一个自定义的布局，作为显示的内容
         View contentView = LayoutInflater.from(ct).inflate(
                 R.layout.item_select_aim_pop, null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -266,8 +266,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         getSupportActionBar().setTitle("新增任务");
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
-
-        et_task_people.setTags(people);
+        if (!StringUtils.isEmpty(people))
+            et_task_people.setTags(people);
         et_task_people.setOnKeyListener(null);
 
 
@@ -312,10 +312,10 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         switch (v.getId()) {
             case R.id.et_startime:
 //                CommonUtil.showDateDialog(mContext, v);
-                showDateDialog(this,et_startime);
+                showDateDialog(this, et_startime);
                 break;
             case R.id.et_task_startime:
-                showDateDialog(this,et_task_startime);
+                showDateDialog(this, et_task_startime);
                 break;
             case R.id.iv_find:
                 Intent intent = new Intent(ct, SelectCollisionActivity.class);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -65,7 +65,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class TaskB2BActivity extends BaseActivity implements RecognizerDialogListener,View.OnClickListener{
+public class TaskB2BActivity extends BaseActivity implements RecognizerDialogListener, View.OnClickListener {
 
 
     private EmptyLayout mEmptyLayout;
@@ -146,7 +146,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                     }
                 }
 
-                if (msg.what == 3){
+                if (msg.what == 3) {
                     progressDialog.dismiss();
                     String isendresult = msg.getData().getString("result");
                     JSONObject dataroot = JSON.parseObject(isendresult);
@@ -186,18 +186,18 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             process.setEndTime(item.getString("enddate"));
                             isendList.add(process);
 
-                            if (i == data.size() - 1){
+                            if (i == data.size() - 1) {
                                 LogUtil.prinlnLongMsg("isendList3", JSON.toJSONString(isendList));
                                 doShowListData();
                             }
                         }
-                    }else {
+                    } else {
                         doShowListData();
                     }
                 }
                 if (msg.what == Constants.APP_SOCKETIMEOUTEXCEPTION) {
                     String exception = msg.getData().getString("result");
-                    mEmptyLayout.setErrorMessage(exception + ",请刷新重试！");
+                    mEmptyLayout.setErrorMessage(exception);
                     mEmptyLayout.showError();
                     listview_main.onRefreshComplete();
 
@@ -210,22 +210,22 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     };
 
     private void doShowListData() {
-        if (tab_type == 1){
+        if (tab_type == 1) {
             adapter = new NewSchedultAdapter(TaskB2BActivity.this, waitList);
             real_List = waitList;
         }
 
-        if (tab_type == 2){
+        if (tab_type == 2) {
             adapter = new NewSchedultAdapter(TaskB2BActivity.this, doneList);
             real_List = doneList;
         }
 
-        if (tab_type == 3){
+        if (tab_type == 3) {
             adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
             real_List = isendList;
             adapter.setiSend("iSend");
         }
-        LogUtil.prinlnLongMsg("tab_type ,real_List",tab_type +","+JSON.toJSONString(real_List));
+        LogUtil.prinlnLongMsg("tab_type ,real_List", tab_type + "," + JSON.toJSONString(real_List));
         listview_main.setAdapter(adapter);
         if (adapter.getCount() != 0) {
             sendHomeBroadcast(adapter.getCount());
@@ -243,14 +243,14 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             ToastMessage("加载完毕");
         }
         listview_main.onRefreshComplete();
-        LogUtil.prinlnLongMsg("login_Name,allList",login_Name + JSON.toJSONString(allList));
+        LogUtil.prinlnLongMsg("login_Name,allList", login_Name + JSON.toJSONString(allList));
         if (ListUtils.isEmpty(allList)) return;
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
                     "进行中".equals(allList.get(i).getStatus()))
                     || (login_Name.equals(allList.get(i).getRecorder()) &&
-                    "待确认".equals(allList.get(i).getStatus()))){
+                    "待确认".equals(allList.get(i).getStatus()))) {
                 waitList.add(allList.get(i));
             }
 
@@ -258,21 +258,21 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
                     "已完成".equals(allList.get(i).getStatus()))
                     || (login_Name.equals(allList.get(i).getDealpersoncode()) &&
-                    "待确认".equals(allList.get(i).getStatus()))){
+                    "待确认".equals(allList.get(i).getStatus()))) {
                 doneList.add(allList.get(i));
             }
 
             //我发起的
             if ((login_Name.equals(allList.get(i).getRecorder()) &&
-                    "进行中".equals(allList.get(i).getStatus()) )||
+                    "进行中".equals(allList.get(i).getStatus())) ||
                     (login_Name.equals(allList.get(i).getRecorder()) &&
-                            "已完成".equals(allList.get(i).getStatus()))){
+                            "已完成".equals(allList.get(i).getStatus()))) {
                 isendList.add(allList.get(i));
             }
 
-            if (i == allList.size() -1){
-                LogUtil.prinlnLongMsg("waitList",JSON.toJSONString(waitList));
-                LogUtil.prinlnLongMsg("doneList",JSON.toJSONString(doneList));
+            if (i == allList.size() - 1) {
+                LogUtil.prinlnLongMsg("waitList", JSON.toJSONString(waitList));
+                LogUtil.prinlnLongMsg("doneList", JSON.toJSONString(doneList));
                 LogUtil.prinlnLongMsg("isendList", JSON.toJSONString(isendList));
 
                 sendServiceForISend(mCurrentPage);  //  进来请求我发起的任务数据
@@ -393,8 +393,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-               mCurrentPage++;
-               initData();
+                mCurrentPage++;
+                initData();
             }
         });
     }
@@ -407,16 +407,23 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     private void initSearchEvent() {
         edt_search.addTextChangedListener(new TextWatcher() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
             @Override
             public void afterTextChanged(Editable editable) {
                 LogUtil.prinlnLongMsg("real_List", real_List + "");
                 String strChche = editable.toString().replace(" ", "");//去除空格
-                if (ListUtils.isEmpty(real_List)) {mEmptyLayout.showEmpty(); return;}
+                if (ListUtils.isEmpty(real_List)) {
+                    mEmptyLayout.showEmpty();
+                    return;
+                }
 
-                if (StringUtils.isEmpty(strChche)){
+                if (StringUtils.isEmpty(strChche)) {
                     adapter = new NewSchedultAdapter(TaskB2BActivity.this, real_List);
                     listview_main.setAdapter(adapter);
                     if (adapter.getCount() != 0) {
@@ -427,7 +434,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                     listview_main.onRefreshComplete();
                 }
                 strChche = strChche.replace(" ", " ");//去除空格
-                List<AllProcess>  chche = new ArrayList<>();
+                List<AllProcess> chche = new ArrayList<>();
                 if (StringUtils.isEmpty(strChche)) return;
 
                 for (int i = 0; i < real_List.size(); i++) {
@@ -435,10 +442,10 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             + real_List.get(i).getStatus() + real_List.get(i).getTaskname()
                             + real_List.get(i).getEndTime() + real_List.get(i).getDatetime(), strChche.trim());
 
-                    if (b){
+                    if (b) {
                         chche.add(real_List.get(i));
                     }
-                    if (i == real_List.size() - 1){
+                    if (i == real_List.size() - 1) {
                         adapter = new NewSchedultAdapter(TaskB2BActivity.this, chche);
                         listview_main.setAdapter(adapter);
                         if (adapter.getCount() != 0) {
@@ -449,16 +456,18 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                         listview_main.onRefreshComplete();
                     }
                 }
-                Log.v("chche",JSON.toJSONString(chche));
+                Log.v("chche", JSON.toJSONString(chche));
             }
         });
     }
+
     //正则
     private static boolean getResult(String text, String str) {
         Pattern p = Pattern.compile(str);
         Matcher m = p.matcher(text);
         return m.find();
     }
+
     private void initHeaderView() {
         View view = LayoutInflater.from(ct).inflate(R.layout.task_header, null);
         ActionBar bar = this.getSupportActionBar();
@@ -484,7 +493,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 || state_unconfirmed == null) {
             mEmptyLayout.showLoading();
             listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
-            sendResquestForServer("进行中", 2,mCurrentPage);
+            sendResquestForServer("进行中", 2, mCurrentPage);
             return;
         }
         if (state_all.isSelected()) {
@@ -493,13 +502,13 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 //            new Thread(new getallprocess_run()).start();
         }
         if (state_finish.isSelected()) {
-            sendResquestForServer("FINISHED", 2,mCurrentPage);
+            sendResquestForServer("FINISHED", 2, mCurrentPage);
         }
         if (state_start.isSelected()) {
-            sendResquestForServer("进行中", 2,mCurrentPage);
+            sendResquestForServer("进行中", 2, mCurrentPage);
         }
         if (state_unconfirmed.isSelected()) {
-            sendResquestForServer("UNCONFIRMED", 2,mCurrentPage);
+            sendResquestForServer("UNCONFIRMED", 2, mCurrentPage);
         }
 
     }
@@ -567,7 +576,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         state_start.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                sendResquestForServer("进行中", 2,mCurrentPage);
+                sendResquestForServer("进行中", 2, mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(true);
                 state_finish.setSelected(false);
@@ -580,7 +589,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
             @Override
             public void onClick(View v) {
-                sendResquestForServer("已完成", 2,mCurrentPage);
+                sendResquestForServer("已完成", 2, mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(false);
                 state_finish.setSelected(true);
@@ -593,7 +602,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
             @Override
             public void onClick(View v) {
-                sendResquestForServer("待确认", 2,mCurrentPage);
+                sendResquestForServer("待确认", 2, mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(false);
                 state_finish.setSelected(false);
@@ -632,7 +641,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
                 state_all.setSelected(true);
-                sendResquestForServer("", 2,mCurrentPage);
+                sendResquestForServer("", 2, mCurrentPage);
             }
         });
     }
@@ -640,7 +649,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     /**
      * @注释：状态码
      */
-    public void sendResquestForServer(String status, int handlerWhat,int mCurrentPage) {
+    public void sendResquestForServer(String status, int handlerWhat, int mCurrentPage) {
         progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_list;
         Map<String, Object> params = new HashMap<String, Object>();
@@ -656,7 +665,6 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     }
 
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 //        getMenuInflater().inflate(R.menu.menu_state, menu);
@@ -678,17 +686,17 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 0x17 ) {
+        if (requestCode == 0x17) {
 //            refreshing();
             if (!ListUtils.isEmpty(waitList)) waitList.clear();
             if (!ListUtils.isEmpty(doneList)) doneList.clear();
             if (!ListUtils.isEmpty(isendList)) isendList.clear();
             mCurrentPage = 1;
-            sendResquestForServer("", 2,mCurrentPage); // update
+            sendResquestForServer("", 2, mCurrentPage); // update
         }
 
-        if (requestCode == 0x20 && resultCode == 0x20){
-            if (mPosition != -1 && !ListUtils.isEmpty(real_List)){
+        if (requestCode == 0x20 && resultCode == 0x20) {
+            if (mPosition != -1 && !ListUtils.isEmpty(real_List)) {
                 real_List.remove(mPosition);
                 adapter.notifyDataSetChanged();
             }
@@ -697,7 +705,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.wait_tv:
                 tab_type = 1;
                 wait_tv.setSelected(true);
@@ -720,7 +728,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 doShowListData();
                 break;
             case R.id.voice_search_iv:
-                final VoiceToWord voice = new VoiceToWord(TaskB2BActivity.this,"534e3fe2");
+                final VoiceToWord voice = new VoiceToWord(TaskB2BActivity.this, "534e3fe2");
                 voice.setRecognizerDialogListener(this);  //自己调用自己
                 voice.GetWordFromVoice();
                 break;
@@ -741,14 +749,14 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     private void sendServiceForISend(int mCurrentPage) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().plat_isend_task;
         Map<String, Object> params = new HashMap<String, Object>();
-        params=new HashMap<>();
-        params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu"));
+        params = new HashMap<>();
+        params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu"));
         params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
         params.put("pageNumber", mCurrentPage);
         params.put("pageSize", "100");
-        params.put("status","");
+        params.put("status", "");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie",  ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(context, url, params, handler, headers, 3, null, null, "get");
     }