1、单公司多地址，拜访报告的需求完成

2、限制安捷诚账套在工作日历页面不能点击列表进入详情
3、隐藏正式客户，以及新建正式客户以及拜访报告

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

@@ -316,6 +316,11 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         oa_listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                String master = CommonUtil.getMaster();
+                if ("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master)) {
+                    return;
+                }
+
                 if (adapter == null || ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= i)
                     return;
                 OAModel e = adapter.getModels().get(i);
@@ -436,7 +441,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         emptyLayout.setShowLoadingButton(false);
         emptyLayout.setShowEmptyButton(false);
         emptyLayout.setShowErrorButton(false);
-        ViewGroup view= (ViewGroup) LayoutInflater.from(ct).inflate(R.layout.oa_empty_list,null);
+        ViewGroup view = (ViewGroup) LayoutInflater.from(ct).inflate(R.layout.oa_empty_list, null);
         otherEmptyView = view.findViewById(R.id.otherView);
         meEmptyEView = view.findViewById(R.id.meView);
         emptyLayout.setEmptyView(view);
@@ -745,16 +750,17 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         setAdapterBeans(isMe ? meModels : otherModels);
     }
 
-    private void showEmpty(){
-        if (isMe){
+    private void showEmpty() {
+        if (isMe) {
             meEmptyEView.setVisibility(View.VISIBLE);
             otherEmptyView.setVisibility(View.GONE);
-        }else{
+        } else {
             meEmptyEView.setVisibility(View.GONE);
             otherEmptyView.setVisibility(View.VISIBLE);
         }
         emptyLayout.showEmpty();
     }
+
     private void setAdapterBeans(List<OAModel> showModel) {
         if (ListUtils.isEmpty(showModel)) {
             adapter.setModels(showModel);
@@ -775,7 +781,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                     ok++;
             }
         }
-        if (ListUtils.isEmpty(filterModels)){
+        if (ListUtils.isEmpty(filterModels)) {
             showEmpty();
         }
         CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   " + size, size + "", getResources().getColor(R.color.approval_select_tab));
@@ -800,7 +806,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_crm_list, null);
-            ListView plist =  view.findViewById(R.id.mList);
+            ListView plist = view.findViewById(R.id.mList);
             SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
                     R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
             plist.setAdapter(adapter);
@@ -837,16 +843,16 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                                     .putExtra("title", name);
                             break;
                     }
-                    if (intent != null){
+                    if (intent != null) {
                         startActivityForResult(intent, 0x20);
                     }
                 }
             });
-            popupWindow =new PopupWindow(view);
+            popupWindow = new PopupWindow(view);
 //                    new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
-            popupWindow.setWidth(DisplayUtil.dip2px(ct,140));
-            popupWindow.setHeight(DisplayUtil.dip2px(ct,135));
-            }
+            popupWindow.setWidth(DisplayUtil.dip2px(ct, 140));
+            popupWindow.setHeight(DisplayUtil.dip2px(ct, 135));
+        }
         // 使其聚集
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
@@ -862,7 +868,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.top_bubble));
 //        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
-        popupWindow.showAsDropDown(parent, -DisplayUtil.dip2px(ct,50), 0);
+        popupWindow.showAsDropDown(parent, -DisplayUtil.dip2px(ct, 50), 0);
     }
 
     private List<Map<String, Object>> getPopData() {

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

@@ -498,7 +498,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 
     private void turn2CaptureActivity() {
         Intent intent = new Intent(getActivity(), CaptureActivity.class);
-        getActivity().startActivityForResult(intent, REQUEST_CODE);
+        startActivityForResult(intent, REQUEST_CODE);
     }
 
     @Override

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sun Dec 23 21:00:28 CST 2018
+#Sat Dec 29 10:01:39 CST 2018
 debugName=971
-versionName=654
+versionName=660
 debugCode=971
-versionCode=209
+versionCode=215

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -106,7 +106,7 @@ public class CommonUtil {
 //            baseUrl="http://192.168.253.243:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.12/APP/";
-//        baseUrl = "http://192.168.253.12/ERP/";
+//        baseUrl = "http://192.168.253.52:8080/ERP/";
 //        baseUrl = "http://192.168.253.63:8080/ERP/";
         return baseUrl;
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -27,6 +27,7 @@ import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
 import com.core.utils.WorkHandlerUtil;
 import com.uas.applocation.UasLocationHelper;
 import com.uas.applocation.utils.LocationDistanceUtils;
@@ -82,17 +83,18 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         }
         if (intent != null) {
             modelIntent = intent.getParcelableExtra("model");
-            if (modelIntent != null&&modelIntent.getStatus()!=5)
+            if (modelIntent != null && modelIntent.getStatus() != 5)
                 modelIntent.setStatus(4);
         }
-        if (modelIntent==null){
+        if (modelIntent == null) {
             if (MyApplication.getInstance().isNetworkActive()) {
                 loadMissionPlan();
             } else {
-                loadMissionByDB();
+//                loadMissionByDB();
+                ToastUtil.showToast(MyApplication.getInstance(), R.string.networks_out);
             }
-        }else{
-            List<MissionModel> models=new ArrayList<>();
+        } else {
+            List<MissionModel> models = new ArrayList<>();
             models.add(modelIntent);
             iMission.showModels(models);
         }
@@ -307,8 +309,8 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         formStore.put("Md_visittime", entity.getVisitTime());//预计时间
         formStore.put("Md_longitude", entity.getLatLng().longitude);//经度
         formStore.put("Md_latitude", entity.getLatLng().latitude);//纬度
-        String emcode= CommonUtil.getEmcode();
-        formStore.put("Md_emcode",emcode);//纬度
+        String emcode = CommonUtil.getEmcode();
+        formStore.put("Md_emcode", emcode);//纬度
         if (isB2b) {
             formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
             formStore.put("emcode", emcode);
@@ -374,7 +376,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
                     }
                 }
                 if (modelIntent != null) {
-                    if (modelIntent.getStatus()!=5){
+                    if (modelIntent.getStatus() != 5) {
                         modelIntent.setStatus(0);
                     }
                     models.add(modelIntent);
@@ -383,7 +385,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
             }
         } else {
             if (modelIntent != null) {
-                if (modelIntent.getStatus()!=5){
+                if (modelIntent.getStatus() != 5) {
                     modelIntent.setStatus(0);
                 }
                 models.add(modelIntent);
@@ -396,7 +398,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 
     //获取外勤计划列表
     public void loadMissionPlan() {
-        if (!isB2b){
+        if (!isB2b) {
             iMission.showLoading();
         }
         Map<String, Object> param = new HashMap<>();
@@ -404,7 +406,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
                 "mobile/mobileoutplan.action";
-        LogUtil.i("url="+url);
+        LogUtil.i("url=" + url);
         Request request = new Request.Bulider()
                 .setUrl(url)
                 .setWhat(LOAD_PLAN)
@@ -629,9 +631,9 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         isSubmiting = false;
         if (what == LOAD_PLAN && !StringUtil.isEmpty(StringUtil.getChinese(message)) && StringUtil.getChinese(message).equals("程序错误")) {
             loadMissionByDB();
-        }else if (what==SUBMIT){
+        } else if (what == SUBMIT) {
 
-        }else {
+        } else {
             String showMessage = StringUtil.getChinese(message);
             if (iMission != null) iMission.dimssLoading();
             if (StringUtil.isEmpty(showMessage)) return;
@@ -649,7 +651,8 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
     private void handlerData(JSONArray array) throws Exception {
         if (ListUtils.isEmpty(array)) {
             if (iMission != null) {
-                loadMissionByDB();
+//                loadMissionByDB();
+
 //                iMission.dimssLoading();
 //                iMission.showModels(models);
             }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerManageActivity.java

@@ -237,20 +237,22 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
-        map.put("item_name", "正式客户");
-        list.add(map);
+
+        /*map.put("item_name", "正式客户");
+        list.add(map);*/
 
         map = new HashMap<>();
         map.put("item_name", "预录入客户");
         list.add(map);
 
-//        map = new HashMap<>();
-//        map.put("item_name", "客户联系人");
-//        list.add(map);
-
         map = new HashMap<>();
-        map.put("item_name", "拜访报告");
+        map.put("item_name", "客户联系人");
         list.add(map);
+
+        /*map = new HashMap<>();
+        map.put("item_name", "拜访报告");
+        list.add(map);*/
+
 //        map = new HashMap<>();
 //        map.put("item_name", "正式客户");
 //        list.add(map);
@@ -261,9 +263,9 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
     private List<EasyBaseModel> getAddItems() {
         List<EasyBaseModel> models = new ArrayList<>();
 //        models.add(new EasyBaseModel().setTitle("新建客户").setIconId(R.drawable.icon_customer_manage_add));
-        models.add(new EasyBaseModel().setTitle("正式客户").setIconId(R.drawable.icon_customer_manage_formal));
+//        models.add(new EasyBaseModel().setTitle("正式客户").setIconId(R.drawable.icon_customer_manage_formal));
         models.add(new EasyBaseModel().setTitle("预录入客户").setIconId(R.drawable.icon_customer_manage_entry));
-//        models.add(new EasyBaseModel().setTitle("客户联系人").setIconId(R.drawable.icon_customer_manage_contact));
+        models.add(new EasyBaseModel().setTitle("客户联系人").setIconId(R.drawable.icon_customer_manage_contact));
         models.add(new EasyBaseModel().setTitle("拜访报告").setIconId(R.drawable.icon_customer_manage_visit_report));
         return models;
     }
@@ -332,17 +334,17 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
 
     private void toListPager(int position) {
         switch (position) {
-            case 0:
+            /*case 0:
                 startActivity(new Intent(ct, CustomerListActivity.class)
                         .putExtra(Constants.Intents.CALLER, "Customer!Base")
                         .putExtra(Constants.Intents.TITLE, "正式客户"));
-                break;
-            case 1:
+                break;*/
+            case 0:
                 startActivity(new Intent(ct, CustomerListActivity.class)
                         .putExtra(Constants.Intents.CALLER, "PreCustomer")
                         .putExtra(Constants.Intents.TITLE, "预录入客户"));
                 break;
-            case 3:
+            case 1:
                 String emCode = CommonUtil.getEmcode();
                 ArrayList<BillListConfig> billListConfigs = new ArrayList<>();
                 BillListConfig mBillListConfig = new BillListConfig();
@@ -404,17 +406,17 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
         Class clazz = null;
         HashMap<String, String> dbfindCondition = null;
         switch (position) {
-            case 0:
+            /*case 0:
                 mCaller = "Customer!Base";
                 mTitle = "正式客户";
                 clazz = CustomerBillInputActivity.class;
-                break;
-            case 1:
+                break;*/
+            case 0:
                 mCaller = "PreCustomer";
                 mTitle = "预录入客户";
                 clazz = CustomerBillInputActivity.class;
                 break;
-            case 3:
+            case 1:
                 dbfindCondition = new HashMap<>();
                 dbfindCondition.put("cu_code", "cu_sellercode='" + CommonUtil.getEmcode() + "'");
                 mCaller = "Contact";
@@ -422,11 +424,11 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                 mId = -1;
                 clazz = CustomerContactActivity.class;
                 break;
-            case 2:
+            /*case 2:
                 mCaller = "VisitRecord";
                 mTitle = "拜访报告";
                 clazz = VisitRecordBillInputActivity.class;
-                break;
+                break;*/
         }
         startActivity(new Intent(ct, clazz)
                 .putExtra(Constants.Intents.CALLER, mCaller)

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitBillInputActivity.java

@@ -30,6 +30,7 @@ import com.uas.applocation.UasLocationHelper;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.CustomerVisitBillAdapter;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,16 +60,27 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.saveAndSubmit) {
-            if (address != null && address.getLatLng() != null) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("company", address.getName());
-                map.put("companyAddress", address.getAddress());
-                map.put("visitTime", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
-                map.put("latitude", address.getLatLng().latitude);
-                map.put("longitude", address.getLatLng().longitude);
-                saveOutAddress(map);
+            String mp_cuname = "";
+            String mp_address = "";
+            List<BillGroupModel.BillModel> showBillModels = mBillAdapter.getShowBillModels();
+            for (BillGroupModel.BillModel billModel : showBillModels) {
+                if ("mp_address".equals(billModel.getField())) {
+                    mp_address = billModel.getValue();
+                }
+                if (StringUtil.hasOneEqual(billModel.getField(), "mp_cuname", "mp_xmmc_user")) {
+                    mp_cuname = billModel.getValue();
+                }
+            }
+
+            if (!StringUtil.isEmpty(mp_cuname) || !StringUtil.isEmpty(mp_address)) {
+                if (address == null) {
+                    address = new SelectAimModel();
+                }
+                address.setName(mp_cuname);
+                address.setAddress(mp_address);
             }
-            mBillPresenter.saveAndSubmit(mBillAdapter.getBillGroupModels());
+
+            loadLatLng(StringUtil.isEmpty(mp_address) ? mp_cuname : mp_address);
         } else if (item.getItemId() == com.modular.apputils.R.id.list) {
             toDataFormList();
         }
@@ -177,16 +189,6 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
     @Override
     protected void handlerSelectDbFind(JSONObject object, int groupId) {
         super.handlerSelectDbFind(object, groupId);
-        String mp_cuname = JSONUtil.getText(object, "mp_cuname");
-        String mp_address = JSONUtil.getText(object, "mp_address");
-        if (!StringUtil.isEmpty(mp_cuname) || !StringUtil.isEmpty(mp_address)) {
-            if (address == null) {
-                address = new SelectAimModel();
-            }
-            address.setName(mp_cuname);
-            address.setAddress(mp_address);
-            loadLatLng(StringUtil.isEmpty(mp_address) ? mp_cuname : mp_address);
-        }
     }
 
 
@@ -265,7 +267,7 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
                         && mTagMap.get("visitTime") != null
                         && mTagMap.get("longitude") != null
                         && mTagMap.get("latitude") != null
-                        ) {
+                ) {
                     saveOutAddress(mTagMap);
                     hasSubmit = true;
                     mBillGroupModel.setTagMap(null);
@@ -349,6 +351,34 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
                         LatLng latLng = new LatLng(lat, lng);
                         address.setLatLng(latLng);
                     }
+
+                    List<BillGroupModel> billGroupModels = mBillAdapter.getBillGroupModels();
+                    if (address != null && address.getLatLng() != null) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("company", address.getName());
+                        map.put("companyAddress", address.getAddress());
+                        map.put("visitTime", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
+                        map.put("latitude", address.getLatLng().latitude);
+                        map.put("longitude", address.getLatLng().longitude);
+                        saveOutAddress(map);
+
+                        BillGroupModel latLngGroupModel = new BillGroupModel();
+                        latLngGroupModel.setForm(true);
+
+                        BillGroupModel.BillModel latBillModel = new BillGroupModel.BillModel();
+                        latBillModel.setField("mp_latitude");
+                        latBillModel.setDisplay(address.getLatLng().latitude + "");
+                        BillGroupModel.BillModel lngBillModel = new BillGroupModel.BillModel();
+                        lngBillModel.setField("mp_longitude");
+                        lngBillModel.setDisplay(address.getLatLng().longitude + "");
+
+                        latLngGroupModel.addHide(latBillModel);
+                        latLngGroupModel.addHide(lngBillModel);
+
+                        billGroupModels.add(latLngGroupModel);
+                    }
+
+                    mBillPresenter.saveAndSubmit(billGroupModels);
                     break;
                 case 13:
                     saveAddress();

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitDetailsActivity.java

@@ -222,7 +222,8 @@ public class CustomerVisitDetailsActivity extends OABaseActivity {
         if (!ListUtils.isEmpty(formdatas)) {
             JSONObject formdata = formdatas.getJSONObject(0);//主表数据
             mBillStatus = JSONUtil.getText(formdata, "mp_status");
-            if (isMe && (TextUtils.isEmpty(mBillStatus) || !mBillStatus.equals("已审核"))) {
+//            if (isMe && (TextUtils.isEmpty(mBillStatus) || !mBillStatus.equals("已审核"))) {
+            if (false) {
                 optionMenuOn = true;
                 checkOptionMenu();
             }