提交类型 编写功能

提交内容  编写客户模块功能，添加选择IP地址功能

app_core/common/src/main/assets/work_menu.json

@@ -268,7 +268,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_customer_manage",
         "menuIcon": "ic_work_customer_manage",
-        "menuActivity": "com.modular.crm.CustomerListActivity",
+        "menuActivity": "com.modular.work.crm3_0.activity.CustomerManageActivity",
         "menuTag": "local_customer_manage",
         "menuUrl": "",
         "caller": "",

app_modular/appworks/src/main/AndroidManifest.xml

@@ -509,7 +509,12 @@
             android:label="@string/crm_customer_visit"/>
         <activity android:name=".crm3_0.activity.CustomerListActivity"/>
         <activity android:name=".crm3_0.activity.ContactsListActivity"></activity>
-        <activity android:name=".crm3_0.activity.CustomerManageActivity"></activity>
+        <activity android:name=".crm3_0.activity.CustomerManageActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.crm3_0.activity.CustomerManageActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".crm3_0.activity.CustomerBillInputActivity"></activity>
         <activity android:name=".crm3_0.activity.CustomerDetails3_0Activity"></activity>
 

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

@@ -3,13 +3,11 @@ package com.uas.appworks.crm3_0.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.RotateAnimation;
@@ -20,28 +18,20 @@ import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
-import com.common.data.JSONUtil;
 import com.common.data.TextUtil;
 import com.common.system.DisplayUtil;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.base.OABaseActivity;
 import com.core.utils.CommonUtil;
-import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.DatePicker;
-import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.MyListView;
 import com.core.widget.view.MyGridView;
 import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.adapter.EasyBaseAdapter;
 import com.modular.apputils.model.EasyBaseModel;
-import com.uas.appworks.CRM.erp.activity.TaskAddErpActivity;
-import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.presenter.CustomerManagePresenter;
 import com.uas.appworks.presenter.imp.ICustomerManage;
@@ -243,9 +233,9 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
         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", "商机");
+//        list.add(map);
         return list;
     }