修改多出闪退和首页bug

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

@@ -280,20 +280,6 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
                 if (model == null || model.getStatus() == 1) return;
                 intent = new Intent(ct, SelectRemarkActivity.class);
                 startActivityForResult(intent, 0x23);
-//                String[] str = new String[]{"客情维护", "业务办理", "其它拜访"};
-//                ArrayList<SelectBean> beans = new ArrayList<>();
-//                SelectBean bean = null;
-//                for (String e : str) {
-//                    bean = new SelectBean();
-//                    bean.setName(e);
-//                    bean.setClick(false);
-//                    beans.add(bean);
-//                }
-//                intent = new Intent(ct, SelectActivity.class);
-//                intent.putExtra("type", 2);
-//                intent.putParcelableArrayListExtra("data", beans);
-//                intent.putExtra("title", "拜访目的");
-//                startActivityForResult(intent, 0x23);
                 break;
             case R.id.item_long_tv:
                 if (2 == 1) {
@@ -312,22 +298,6 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
         if (requestCode == 0x20) {//选择公司
             SelectAimModel entity = data.getParcelableExtra("data");
             showSaveCompany(entity);
-//            MissionModel entity = data.getParcelableExtra("data");
-//            if (entity == null) return;
-//            if (ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= position)
-//                return;
-//            adapter.getModels().get(position).setCompanyName(StringUtils.isEmpty(entity.getCompanyName()) ? "" : entity.getCompanyName());
-//            adapter.getModels().get(position).setCompanyAddr(StringUtils.isEmpty(entity.getCompanyAddr()) ? "" : entity.getCompanyAddr());
-//            adapter.getModels().get(position).setVisitcount(1 + entity.getVisitcount());
-//            if (entity.getLatLng() != null) {
-//                adapter.getModels().get(position).setLatLng(entity.getLatLng());
-//                adapter.getModels().get(position).setDistance(BaiduMapUtil.getInstence().distance(adapter.getModels().get(position).getLatLng()
-//                        , new LatLng(MyApplication.getInstance().getBdLocationHelper().getLatitude(),
-//                                MyApplication.getInstance().getBdLocationHelper().getLongitude())));
-//            }
-//            adapter.notifyItemChanged(position);
-//            if (entity.getLatLng() != null)
-//                setEndTime(entity.getLatLng(), entity.getDistance());
         } else if (requestCode == 0x21) {//选择地址
             PoiInfo info = data.getParcelableExtra("resultName");
             if (info == null) {
@@ -357,10 +327,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
             }
         } else if (0x22 == requestCode) {//外勤设置
             boolean isAuto = data.getBooleanExtra("isAuto", true);
-            if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-                setResult(0x20);
-                finish();
-            } else if (!isAuto) {
+            if (!isAuto && !(ApiUtils.getApiModel() instanceof ApiPlatform)) {
                 if (flag == 1) {
                     //启动手动外勤
                     Intent intent = new Intent(ct, OutofficeActivity.class);
@@ -374,10 +341,8 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
             }
         } else if (0x23 == requestCode) {
             String message = data.getStringExtra("data");
-//            SelectBean b = data.getParcelableExtra("data");
-//            if (b == null) return;
-            String mudi = StringUtils.isEmpty(message) ? "客情维护" : message;
-            adapter.getModels().get(position).setRemark(mudi);
+            String remark = StringUtils.isEmpty(message) ? "客情维护" : message;
+            adapter.getModels().get(position).setRemark(remark);
             adapter.notifyItemChanged(position);
         }
     }