Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into draft

# Conflicts:
#	app_core/common/src/main/java/com/core/app/AppConstant.java

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.xzjmyk.pm.activity"
-          android:versionCode="114"
-          android:versionName="5.9.0">
+          package="com.xzjmyk.pm.activity">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -212,8 +210,7 @@
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />
         <activity android:name=".ui.erp.activity.ErpMenActivity" />
-        <activity android:name=".ui.erp.activity.DbfindListActivity" />
-        <activity android:name=".ui.erp.activity.DbfindList2Activity" />
+
         <activity android:name=".ui.circle.view.CardInfoActivity">
             <intent-filter>
                 <action android:name="com.modular.view.CardInfoActivity" />
@@ -374,9 +371,7 @@
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity android:name=".CaptureResultActivity" />
         <!-- Tool Activity -->
-        <activity
-            android:name=".ui.tool.MultiImagePreviewActivity"
-            android:configChanges="orientation|screenSize" />
+
         <activity
             android:name="com.uas.appme.other.activity.SelectAreaActivity"
             android:screenOrientation="portrait" />
@@ -570,26 +565,6 @@
         <activity android:name=".ApplySubscribeActivity" />
         <!-- android:theme="@style/Theme.AppCompat.NoActionBar" /> -->
 
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessActivity"
-            android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessDetailActivty"
-            android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessDetailInfoActivity"
-            android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessLessActivity"
-            android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessTransferActivity"
-            android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessSelectCustomerActivity"
-            android:launchMode="singleTask"
-            android:theme="@style/CrmThemeBlue"
-            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"
             android:launchMode="singleTask" />
@@ -614,11 +589,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.crm.CustomerAddActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeBlue"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+
         <activity
             android:name=".ui.erp.activity.crm.CustomerDetailActivity"
             android:theme="@style/CrmThemeCustomer" />
@@ -637,17 +608,18 @@
         <activity
             android:name=".ui.erp.activity.crm.TaskAddActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" >
+            <intent-filter>
+                <action android:name="com.modular.appworks.TaskAddActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.crm.VisitReportPlanActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessAddActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeBlue"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+
         <activity
             android:name=".ui.erp.activity.crm.CustomerListSelectActivity"
             android:theme="@style/CrmThemeCustomer" />
@@ -687,10 +659,7 @@
         <activity
             android:name=".ui.erp.activity.oa.UserSelectActivity"
             android:label="@string/select_user" />
-        <activity
-            android:name=".ui.erp.activity.crm.BusinessStateActivity"
-            android:launchMode="singleTask"
-            android:theme="@style/CrmThemeBlue" />
+
 
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
@@ -1047,10 +1016,7 @@
         <activity
             android:name=".ui.erp.activity.oa.AddVisitReportActivity"
             android:label="@string/visitrecord" />
-        <activity
-            android:name=".ui.erp.activity.crm.AddBusinessActivity"
-            android:label="@string/crm_creat_business" />
-        <activity android:name=".ui.erp.activity.oa.SearchSelectActivity" />
+
         <activity
             android:name=".ui.me.InfoCodeActivity"
             android:label="@string/info_2dcode" />

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

@@ -44,6 +44,7 @@ import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest.HttpMethod;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.im.RecordUtil;

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

@@ -16,18 +16,19 @@ import android.widget.RelativeLayout;
 
 import com.andreabaccega.widget.FormEditText;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.SingleDialog;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraLeaveEntity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

@@ -24,32 +24,32 @@ import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.SingleDialog;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
-import com.core.model.SelectBean;
-import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveEntity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
-
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
-import com.core.utils.RecognizerDialogUtil;
-import com.core.utils.time.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -36,14 +36,16 @@ import com.core.utils.FlexJsonUtil;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.SingleDialog;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelAddItems;
@@ -53,7 +55,6 @@ import com.xzjmyk.pm.activity.ui.erp.model.TravelUpdateEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.UpdateTravelAddItems;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.TravelPageActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -38,14 +38,16 @@ import com.core.utils.FlexJsonUtil;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.SingleDialog;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraAddWork;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraAddWorkItems;
@@ -55,7 +57,6 @@ import com.xzjmyk.pm.activity.ui.erp.model.ExtraWorkItems;
 import com.xzjmyk.pm.activity.ui.erp.model.UpdateExtraAddWorkItems;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.WorkPageActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -34,6 +34,7 @@ import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
+import com.core.utils.time.wheel.DatePicker;
 import com.github.mikephil.charting.charts.BarChart;
 import com.github.mikephil.charting.components.Legend;
 import com.github.mikephil.charting.components.XAxis;
@@ -47,13 +48,16 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.AddBusinessActivity;
+import com.uas.appworks.CRM.erp.activity.BusinessActivity;
+import com.uas.appworks.CRM.erp.activity.BusinessAddActivity;
+import com.uas.appworks.CRM.erp.activity.CustomerAddActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddVisitReportActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.core.utils.time.wheel.DatePicker;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;

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

@@ -25,14 +25,15 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.widget.MyListView;
+import com.core.widget.view.HorizontalStepsView;
+import com.core.widget.view.steps.StepsView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.CustomerAddActivity;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.widget.MyListView;
-import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;
-import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -31,6 +31,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.dao.DBManager;
+import com.core.model.Employees;
 import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.helper.AvatarHelper;
@@ -40,9 +41,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.settings.model.Business;
+import com.uas.appworks.CRM.erp.activity.CustomerAddActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -33,6 +33,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.settings.model.Business;
+import com.uas.appworks.CRM.erp.activity.CustomerAddActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

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

@@ -35,7 +35,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
+import com.core.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -47,6 +47,7 @@ import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.SingleDialog;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
@@ -58,7 +59,6 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 

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

@@ -23,11 +23,11 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.SingleDialog;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 

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

@@ -23,7 +23,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.core.widget.SingleDialog;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -74,7 +74,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OAAdapter;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
+import com.core.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;

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

@@ -10,21 +10,21 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import com.baidu.mapapi.map.MapView;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.InputMethodUtil;
+import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
+import com.core.widget.view.model.SelectAimModel;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
+import com.uas.appworks.CRM.erp.adapter.SelectAimAdapter;
+import com.uas.appworks.CRM.erp.imp.ISelectAim;
+import com.uas.appworks.CRM.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectAimAdapter;
-import com.core.widget.listener.EditChangeListener;
-import com.core.widget.view.model.SelectAimModel;
-import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
-import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
-import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 
 import java.util.ArrayList;

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

@@ -21,7 +21,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.core.widget.SingleDialog;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -36,7 +36,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
+import com.core.model.Employees;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.xzjmyk.pm.activity.view.FunnelView
+                <com.uas.appworks.CRM.erp.view.FunnelView
                     android:id="@+id/funnelview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -359,7 +359,7 @@
                         android:textStyle="bold"/>
                 </LinearLayout>
 
-                <com.xzjmyk.pm.activity.view.steps.StepsView
+                <com.core.widget.view.steps.StepsView
                     android:id="@+id/stepsView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -373,7 +373,7 @@
                     android:text="@string/Stage_requirements"
                     android:textColor="@color/titleBlue"/>
 
-                <com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
                     android:id="@+id/lv_business"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

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

@@ -376,7 +376,7 @@
                 android:fillViewport="true"
                 android:visibility="gone">
 
-                <com.xzjmyk.pm.activity.view.steps.StepsView
+                <com.core.widget.view.steps.StepsView
                     android:id="@+id/stepsView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -71,7 +71,7 @@
             android:textColor="@color/gray_light"
             android:textSize="15sp" />
 
-        <com.xzjmyk.pm.activity.view.steps.HorizontalStepsView
+        <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
             android:layout_height="80dp" />

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

@@ -20,7 +20,7 @@
             android:text="@string/business_stage"
             android:textSize="15sp" />
 
-        <com.xzjmyk.pm.activity.view.steps.HorizontalStepsView
+        <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
             android:layout_height="80dp" />

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

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <com.xzjmyk.pm.activity.view.steps.StepsViewIndicator
+    <com.core.widget.view.steps.StepsViewIndicator
         android:id="@+id/steps_indicator_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app_core/common/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.core.app"
-    android:versionCode="111"
-    android:versionName="5.8.9">
+    package="com.core.app">
 
 
     <uses-permission android:name="android.permission.CALL_PHONE"/>
@@ -24,6 +22,8 @@
         <activity
             android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity"
             android:label="@string/title_activity_select_calendar"/>
-        <activity android:name="com.core.widget.view.Activity.MultiImagePreviewActivity"/>
+        <activity
+            android:name="com.core.widget.view.Activity.MultiImagePreviewActivity"
+            android:configChanges="orientation|screenSize" />
     </application>
 </manifest>

app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -69,4 +69,6 @@ public class AppConstant {
     public static final String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
 
     public static final String UPDATA_UUHELPER = "UPDATA_UUHELPER";
+
+    public static final int RESULT_CODE = 0x865;
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/Employees.java → app_core/common/src/main/java/com/core/model/Employees.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model;
+package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

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

@@ -14,14 +14,19 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.MediaStore;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.andreabaccega.formedittext.BuildConfig;
+import com.andreabaccega.widget.FormEditText;
 import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -37,6 +42,9 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -615,4 +623,75 @@ public class CommonUtil {
         }
 
     }
+
+    public static boolean isBiteman() {
+        String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
+        return !StringUtil.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");
+    }
+
+
+    public static void getCommonId(Context ct, String seq, Handler mHandler, int codeWhat) {
+        getCommonId(CommonUtil.getAppBaseUrl(ct), ct, seq, mHandler, codeWhat);
+    }
+
+    public static void getCommonId(String action, Context ct, String seq, Handler mHandler, int codeWhat) {
+        String url = action + "/common/getId.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("seq", seq);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        com.core.net.http.ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+    }
+    /**
+     * 去除字符串中的换行符，空格
+     *
+     * @param s
+     * @return
+     */
+    public static String removeStringMark(String s) {
+        String result = "";
+        if (!TextUtils.isEmpty(s)) {
+            Pattern pattern = Pattern.compile("\\s*|\t|\r|\n");
+//            Pattern pattern = Pattern.compile("\r|\n");
+            Matcher matcher = pattern.matcher(s);
+            result = matcher.replaceAll("");
+        }
+        return result;
+    }
+    /**
+     * 返回输入框内去除换行符和空格之后的字符串
+     *
+     * @param et
+     * @return
+     */
+    public static String getNoMarkEditText(FormEditText et) {
+        String temp = "";
+        temp = et.getText().toString().trim();
+        temp = removeStringMark(temp);
+        return StringUtil.toHttpString(temp);
+    }
+    /**
+     * @desc:修改textView样式
+     * @author：Arison on 2016/8/3
+     */
+    public static void textSpanForStyle(
+            TextView view,
+            String input,
+            String match,
+            int color) {
+        SpannableStringBuilder style = new SpannableStringBuilder(input);
+        Pattern highlight = Pattern.compile(match);
+        Matcher m = highlight.matcher(style.toString());
+        while (m.find()) {
+//            style.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), m.start(), m.end(),
+//                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+            style.setSpan(new ForegroundColorSpan(color), m.start(), m.end(),
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+//            style.setSpan(new StrikethroughSpan(), m.start(), m.end(),
+//                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+//            style.setSpan(new UnderlineSpan(), m.start(), m.end(),
+//                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        }
+        view.setText(style);
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/SingleDialog.java → app_core/common/src/main/java/com/core/widget/SingleDialog.java

@@ -1,8 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
+package com.core.widget;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -17,7 +13,10 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
+import com.core.app.R;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author LiuJie
@@ -34,7 +33,7 @@ public class SingleDialog extends Dialog {
 	private LinearLayout blend_dialog_preview;
 	
 	public PickDialogListener pickDialogListener;
-	public SingleDialog(Context context,String title,PickDialogListener listener) {
+	public SingleDialog(Context context, String title, PickDialogListener listener) {
 		super(context, R.style.blend_theme_dialog);
 		this.context=context;
 		this.title=title;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/HorizontalStepsView.java → app_core/common/src/main/java/com/core/widget/view/HorizontalStepsView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.steps;
+package com.core.widget.view;
 
 import android.content.Context;
 import android.graphics.Canvas;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsView.java → app_core/common/src/main/java/com/core/widget/view/steps/StepsView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.steps;
+package com.core.widget.view.steps;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -12,8 +12,8 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.app.R;
+import com.core.utils.CommonUtil;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsViewIndicator.java → app_core/common/src/main/java/com/core/widget/view/steps/StepsViewIndicator.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.steps;
+package com.core.widget.view.steps;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,8 +9,8 @@ import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.app.R;
+import com.core.utils.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app_core/common/src/main/res/layout/activity_business.xml

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.xzjmyk.pm.activity.view.FunnelView
+                <com.uas.appworks.CRM.erp.view.FunnelView
                     android:id="@+id/funnelview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app_core/common/src/main/res/layout/activity_business_detail_info.xml

@@ -356,7 +356,7 @@
                         android:textStyle="bold"/>
                 </LinearLayout>
 
-                <com.xzjmyk.pm.activity.view.steps.StepsView
+                <com.core.widget.view.steps.StepsView
                     android:id="@+id/stepsView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -370,7 +370,7 @@
                     android:text="@string/Stage_requirements"
                     android:textColor="@color/titleBlue"/>
 
-                <com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
                     android:id="@+id/lv_business"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"/>

app_core/common/src/main/res/layout/activity_customer_detail.xml

@@ -376,7 +376,7 @@
                 android:fillViewport="true"
                 android:visibility="gone">
 
-                <com.xzjmyk.pm.activity.view.steps.StepsView
+                <com.core.widget.view.steps.StepsView
                     android:id="@+id/stepsView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app_core/common/src/main/res/layout/item_business.xml

@@ -71,7 +71,7 @@
             android:textColor="@color/gray_light"
             android:textSize="15sp" />
 
-        <com.xzjmyk.pm.activity.view.steps.HorizontalStepsView
+        <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
             android:layout_height="80dp" />

app_core/common/src/main/res/layout/item_steps.xml

@@ -20,7 +20,7 @@
             android:text="@string/business_stage"
             android:textSize="15sp" />
 
-        <com.xzjmyk.pm.activity.view.steps.HorizontalStepsView
+        <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
             android:layout_height="80dp" />

app_core/common/src/main/res/layout/widget_steps_view.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <com.xzjmyk.pm.activity.view.steps.StepsViewIndicator
+    <com.core.widget.view.steps.StepsViewIndicator
         android:id="@+id/steps_indicator_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -108,7 +108,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
                 IntentUtils.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
             }
         }else if (v.getId() ==  R.id.me_function){
-            String url="https://www.taobao.com/";
+            String url="";
             url=  "http://113.105.74.140:8080/new/";
             IntentUtils.webLinks(ct, url, getString(R.string.about_function));
         }else if (v.getId() ==  R.id.me_QRcode){

app_modular/appworks/src/main/AndroidManifest.xml

@@ -65,5 +65,47 @@
             android:name="com.uas.appworks.OA.erp.activity.AddMeetTaskActivity"
             android:label="@string/meet_task"
             android:theme="@style/OAThemeMeet" />
+
+        <activity android:name="com.uas.appworks.CRM.erp.activity.DbfindListActivity" />
+        <activity android:name="com.uas.appworks.CRM.erp.activity.DbfindList2Activity" />
+
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessActivity"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessDetailActivty"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessDetailInfoActivity"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessLessActivity"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessTransferActivity"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessSelectCustomerActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/CrmThemeBlue"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.CustomerAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/CrmThemeBlue"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessAddActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/CrmThemeBlue"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.BusinessStateActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/CrmThemeBlue" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.AddBusinessActivity"
+            android:label="@string/crm_creat_business" />
+        <activity android:name="com.uas.appworks.CRM.erp.activity.SearchSelectActivity" />
     </application>
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/AddBusinessActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/AddBusinessActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,6 +14,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
@@ -21,20 +22,16 @@ import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonInterface;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.adapter.AddBusinessAdapter;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.oa.AddBusinessAdapter;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -53,18 +50,11 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     private final int SAVE_BUSINESS = 0x763;
     private final int LOAD_BUSINESS_CHANCESTAGE = 0x764;
     private final int UPDATE_BUSINESS = 0x765;
-    @ViewInject(R.id.company_tv)
     private TextView company_tv;
-    @ViewInject(R.id.company_add_tv)
     private TextView company_add_tv;
-    @ViewInject(R.id.remark_tv)
     private TextView remark_tv;
-    @ViewInject(R.id.business_stage_tv)
     private TextView business_stage_tv;//商机阶段
-    @ViewInject(R.id.business_Library_tv)
     private TextView business_Library_tv;//商机库
-
-    @ViewInject(R.id.contact_lv)
     private MyListView contact_lv;
     private AddBusinessAdapter adapter;
     private LatLng latLng;
@@ -76,11 +66,20 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_business);
-        ViewUtils.inject(this);
+        initIDS();
         initEvent();
         initView();
     }
 
+    private void initIDS() {
+        company_tv = (TextView) findViewById(R.id.company_tv);
+        company_add_tv = (TextView) findViewById(R.id.company_add_tv);
+        remark_tv = (TextView) findViewById(R.id.remark_tv);
+        business_stage_tv = (TextView) findViewById(R.id.business_stage_tv);
+        business_Library_tv = (TextView) findViewById(R.id.business_Library_tv);
+        contact_lv = (MyListView) findViewById(R.id.contact_lv);
+    }
+
     private void initView() {
         getSupportActionBar().setTitle(R.string.crm_creat_business);
         Intent intent = getIntent();
@@ -121,31 +120,24 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
         Intent intent = null;
-        switch (v.getId()) {
-            case R.id.company_tv:
-                intent = new Intent(ct, SelectAimActivity.class).putExtra("title", getString(R.string.select) + getString(R.string.Company_Name));
-                startActivityForResult(intent, SELECT_COMPANY);
-                break;
-            case R.id.remark_tv:
-                startActivityForResult(new Intent(ct, SearchSelectActivity.class), SearchSelectActivity.RESULT_CODE);
-                break;
-            case R.id.additem_tv:
-                adapter.getContacts().add(new EmployeesModel());
-                adapter.notifyDataSetChanged();
-                break;
-            case R.id.submit_btn:
-                if (canSubmit()) {
-                    if (isUpdata) updateBusiness();
-                    else
-                        getIdByNet();
-                }
-                break;
-            case R.id.business_Library_tv:
-                loadBusiness();
-                break;
-            case R.id.business_stage_tv:
-                loadJieDuan();
-                break;
+        if (v.getId() == R.id.company_tv){
+            intent = new Intent(ct, SelectAimActivity.class).putExtra("title", getString(R.string.select) + getString(R.string.Company_Name));
+            startActivityForResult(intent, SELECT_COMPANY);
+        }else if (v.getId() == R.id.remark_tv){
+            startActivityForResult(new Intent(ct, SearchSelectActivity.class), AppConstant.RESULT_CODE);
+        }else if (v.getId() ==  R.id.additem_tv){
+            adapter.getContacts().add(new EmployeesModel());
+            adapter.notifyDataSetChanged();
+        }else if (v.getId() == R.id.submit_btn){
+            if (canSubmit()) {
+                if (isUpdata) updateBusiness();
+                else
+                    getIdByNet();
+            }
+        }else if (v.getId() == R.id.business_Library_tv){
+            loadBusiness();
+        }else if (v.getId() == R.id.business_stage_tv){
+            loadJieDuan();
         }
     }
 
@@ -193,8 +185,8 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
                 String remark = StringUtil.isEmpty(message) ? getResources().getString(R.string.maintain_customers) : message;
                 remark_tv.setText(remark);
                 break;
-            case SearchSelectActivity.RESULT_CODE:
-                if (SearchSelectActivity.RESULT_CODE == resultCode) {
+            case AppConstant.RESULT_CODE:
+                if (AppConstant.RESULT_CODE == resultCode) {
                     String result = data.getStringExtra("data");
                     if (!StringUtil.isEmpty(result))
                         remark_tv.setText(result);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -18,7 +18,7 @@ import android.widget.Button;
 import android.widget.HorizontalScrollView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.Scroller;
+import android.widget.ScrollView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
@@ -28,17 +28,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.CalendarUtil;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewOneAdapter;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
+import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.view.ListViewInScroller;
-import com.xzjmyk.pm.activity.view.FunnelView;
+import com.uas.appworks.CRM.erp.adapter.HListViewOneAdapter;
+import com.uas.appworks.CRM.erp.view.FunnelView;
+import com.uas.appworks.R;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -53,21 +51,13 @@ import java.util.Map;
 public class BusinessActivity extends BaseActivity implements View.OnClickListener, AdapterView.OnItemClickListener {
 
     private static final String TAG = "BusinessActivity";
-    @ViewInject(R.id.bt_qiang)
     private Button bt_qiang;
-    @ViewInject(R.id.bt_create)
     private Button bt_create;
-    @ViewInject(R.id.bt_manage)
     private Button bt_manage;
-    @ViewInject(R.id.sv_funnel)
-    private Scroller sv_funnel;
-    @ViewInject(R.id.bt_go)
+    private ScrollView sv_funnel;
     private Button bt_go;
-    @ViewInject(R.id.funnelview)
     private FunnelView funnelView;
-    @ViewInject(R.id.layout)
     private HorizontalScrollView layout;
-    @ViewInject(R.id.lv_grid_dispaly)
     private ListViewInScroller lv_grid_dispaly;
     private HListViewOneAdapter hl_adapter;
     private ArrayList<ArrayList<String>> gridlists = new ArrayList<ArrayList<String>>();
@@ -95,7 +85,15 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
 
     public void initView() {
         getSupportActionBar().setTitle(getString(R.string.crmmain_business));
-        ViewUtils.inject(this);
+
+        bt_qiang = (Button) findViewById(R.id.bt_qiang);
+        bt_create = (Button) findViewById(R.id.bt_create);
+        bt_manage = (Button) findViewById(R.id.bt_manage);
+        bt_go = (Button) findViewById(R.id.bt_go);
+        layout = (HorizontalScrollView) findViewById(R.id.layout);
+        lv_grid_dispaly = (ListViewInScroller) findViewById(R.id.lv_grid_dispaly);
+        sv_funnel = (ScrollView) findViewById(R.id.sv_funnel);
+        funnelView = (FunnelView) findViewById(R.id.funnelview);
     }
 
     private void initListener() {
@@ -126,36 +124,27 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.crm_data_find:
-                View view = getWindow().findViewById(item.getItemId());
-                showPopupWindow(view);
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
-
+        if (item.getItemId() == R.id.crm_data_find){
+            View view = getWindow().findViewById(item.getItemId());
+            showPopupWindow(view);
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.bt_create:
-                if (OAConfig.canShowCrm2_0() && !CommonUtil.isBiteman())
-                    startActivity(new Intent(this, AddBusinessActivity.class));
-                else startActivity(new Intent(this, BusinessAddActivity.class));
-                break;
-            case R.id.bt_qiang:
-                startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 1));
-                break;
-            case R.id.bt_manage:
-                startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 2));
-                break;
-            case R.id.bt_go:
-                startActivity(new Intent(this, BusinessStateActivity.class).putExtra("bt_type", 0));
-                break;
+        if (v.getId() ==  R.id.bt_create){
+            if (OAConfig.canShowCrm2_0() && !CommonUtil.isBiteman())
+                startActivity(new Intent(this, AddBusinessActivity.class));
+            else startActivity(new Intent(this, BusinessAddActivity.class));
+        }else if (v.getId() == R.id.bt_qiang){
+            startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 1));
+        }else if (v.getId() == R.id.bt_manage){
+            startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 2));
+        }else if (v.getId() == R.id.bt_go){
+            startActivity(new Intent(this, BusinessStateActivity.class).putExtra("bt_type", 0));
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessAddActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -16,18 +16,17 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.DatePicker;
+import com.core.widget.SingleDialog;
+import com.core.widget.view.Activity.SelectActivity;
+import com.lidroid.xutils.ViewUtils;
+import com.uas.appworks.R;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -48,169 +47,31 @@ import java.util.Map;
  */
 public class BusinessAddActivity extends BaseActivity implements View.OnClickListener {
 
-    @ViewInject(R.id.et_business_no)
     private FormEditText et_business_no; // 天数
-    @ViewInject(R.id.et_business_name)
     private FormEditText et_business_name;
-    @ViewInject(R.id.et_business_source)
     private FormEditText et_business_source;
-    //    @ViewInject(R.id.et_business_phone)
-//    private FormEditText et_business_phone;
-    @ViewInject(R.id.et_business)
     private FormEditText et_business;
-
-
-    @ViewInject(R.id.et_business_jieDuan)
     private FormEditText et_business_jieDuan;
-    //    @ViewInject(R.id.et_business_enterTime)
-//    private FormEditText et_business_enterTime;
-    @ViewInject(R.id.et_business_enterMan)
     private FormEditText et_business_enterMan;
-    @ViewInject(R.id.et_business_remark)
     private FormEditText et_business_remark;
-    @ViewInject(R.id.et_business_type)
     private FormEditText et_business_type;
-    @ViewInject(R.id.et_company_name)
     private FormEditText et_company_name;
-    @ViewInject(R.id.et_company_address)
     private FormEditText et_company_address;
-    @ViewInject(R.id.et_company_man)
     private FormEditText et_company_man;
-    @ViewInject(R.id.et_company_position)
     private FormEditText et_company_position;
-    @ViewInject(R.id.et_company_tel)
     private FormEditText et_company_tele;
-
-    @ViewInject(R.id.et_company_businesslicense)
     private FormEditText et_company_businesslicense;
-    @ViewInject(R.id.et_company_planmoney)
     private FormEditText et_company_planmoney;
-    @ViewInject(R.id.et_company_plantime)
     private FormEditText et_company_plantime;
-    @ViewInject(R.id.et_company_depart)
     private FormEditText et_company_depart;
-    @ViewInject(R.id.et_bc_factory)
     private FormEditText  et_bc_factory;
-    @ViewInject(R.id.et_bt_tel)
     private FormEditText  et_bc_tel;
 
-
     private List<String> lists = new ArrayList<String>();
     private int et_business_enterCode;
     private int mBcId;
     private String enterManCode;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_business_add);
-        initView();
-        initData();
-        initListener();
-    }
-
-    private void initListener() {
-        et_business.setOnClickListener(this);
-        et_business_jieDuan.setOnClickListener(this);
-        et_business_source.setOnClickListener(this);
-        et_business_enterMan.setOnClickListener(this);
-
-        et_company_plantime.setOnClickListener(this);
-//        et_business_no.setOnClickListener(this);
-        //   et_business.setKeyListener(null);
-//        et_business_no.setKeyListener(null);
-        //et_business_jieDuan.setKeyListener(null);
-        et_business_source.setKeyListener(null);
-        //   et_business_enterMan.setKeyListener(null);
-
-        et_business_type.setOnClickListener(this);
-//        et_business_enterTime.setOnClickListener(this);
-        et_business_type.setKeyListener(null);
-//        et_business_enterTime.setKeyListener(null);
-        et_business_type.setFocusable(false);
-//        et_business_enterTime.setFocusable(false);
-
-        et_business_no.setKeyListener(null);
-        et_business_no.setFocusable(false);
-
-        et_company_plantime.setKeyListener(null);
-        et_company_plantime.setFocusable(false);
-    }
-
-    private void initData() {
-        CommonUtil.getCommonId(this, "BUSINESSCHANCE_SEQ", mHandler, GET_BC_ID);
-        getCodeByNet();
-    }
-
-    private void initView() {
-        ViewUtils.inject(this);
-        getSupportActionBar().setTitle("创建商机");
-        if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
-            et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct, "erp_emname"));
-        } else {
-            et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
-        }
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.et_business:
-                loadBusiness();
-                break;
-            case R.id.et_business_source:
-                loadSource();
-                break;
-            case R.id.et_business_enterMan:
-                loadManGenJin();
-                break;
-            case R.id.et_business_no:
-
-                break;
-            case R.id.et_business_jieDuan:
-                loadJieDuan();
-                break;
-            case R.id.et_business_type:
-                onPopupButtonClick(v);
-                break;
-            case R.id.et_company_plantime:
-                showDateDialog((FormEditText) v.findViewById(R.id.et_company_plantime));
-                break;
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
-        menu.findItem(R.id.btn_save).setTitle(getString(R.string.common_save_button));
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-                if (et_business_name.testValidity() &&
-                        et_business_source.testValidity() &&
-                        et_business.testValidity() &&
-                        et_business_jieDuan.testValidity() &&
-                        et_company_tele.testValidity() &&
-                        et_company_businesslicense.testValidity() &&
-                        et_company_address.testValidity() &&
-                        et_company_name.testValidity()&&
-                        et_bc_tel.testValidity()&&
-                        et_bc_factory.testValidity()) {
-                    sendHttpResquest();
-                }
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
-        }
-        return true;
-    }
-
     private static final int codeWhat = 0x11;
     private static final int LOAD_SOURCE = 2;
     private static final int LOAD_BUSINESS = 3;
@@ -219,7 +80,15 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private static final int GET_BC_ID = 6;
     private JSONArray jsons;
     private JSONArray enterArray;
-
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_business_add);
+        initIDS();
+        initView();
+        initData();
+        initListener();
+    }
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -323,7 +192,115 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
             }
         }
     };
+    private void initIDS() {
+        et_business_no = (FormEditText) findViewById(R.id.et_business_no);
+        et_business_name = (FormEditText) findViewById(R.id.et_business_name);
+        et_business_source = (FormEditText) findViewById(R.id.et_business_source);
+        et_business = (FormEditText) findViewById(R.id.et_business);
+        et_business_jieDuan = (FormEditText) findViewById(R.id.et_business_jieDuan);
+        et_business_enterMan = (FormEditText) findViewById(R.id.et_business_enterMan);
+        et_business_remark  = (FormEditText) findViewById(R.id.et_business_remark);
+        et_business_type = (FormEditText) findViewById(R.id.et_business_type);
+        et_company_name = (FormEditText) findViewById(R.id.et_company_name);
+        et_company_address = (FormEditText) findViewById(R.id.et_company_address);
+        et_company_man = (FormEditText) findViewById(R.id.et_company_man);
+        et_company_position = (FormEditText) findViewById(R.id.et_company_position);
+        et_company_tele= (FormEditText) findViewById(R.id.et_company_tel);
+        et_company_businesslicense= (FormEditText) findViewById(R.id.et_company_businesslicense);
+        et_company_planmoney= (FormEditText) findViewById(R.id.et_company_planmoney);
+        et_company_plantime = (FormEditText) findViewById(R.id.et_company_plantime);
+        et_company_depart = (FormEditText) findViewById(R.id.et_company_depart);
+        et_bc_factory= (FormEditText) findViewById(R.id.et_bc_factory);
+        et_bc_tel = (FormEditText) findViewById(R.id.et_bt_tel);
+    }
 
+    private void initListener() {
+        et_business.setOnClickListener(this);
+        et_business_jieDuan.setOnClickListener(this);
+        et_business_source.setOnClickListener(this);
+        et_business_enterMan.setOnClickListener(this);
+
+        et_company_plantime.setOnClickListener(this);
+//        et_business_no.setOnClickListener(this);
+        //   et_business.setKeyListener(null);
+//        et_business_no.setKeyListener(null);
+        //et_business_jieDuan.setKeyListener(null);
+        et_business_source.setKeyListener(null);
+        //   et_business_enterMan.setKeyListener(null);
+
+        et_business_type.setOnClickListener(this);
+//        et_business_enterTime.setOnClickListener(this);
+        et_business_type.setKeyListener(null);
+//        et_business_enterTime.setKeyListener(null);
+        et_business_type.setFocusable(false);
+//        et_business_enterTime.setFocusable(false);
+
+        et_business_no.setKeyListener(null);
+        et_business_no.setFocusable(false);
+
+        et_company_plantime.setKeyListener(null);
+        et_company_plantime.setFocusable(false);
+    }
+
+    private void initData() {
+        CommonUtil.getCommonId(this, "BUSINESSCHANCE_SEQ", mHandler, GET_BC_ID);
+        getCodeByNet();
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle("创建商机");
+        if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
+            et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct, "erp_emname"));
+        } else {
+            et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        }
+
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.et_business){
+            loadBusiness();
+        }else if (v.getId() == R.id.et_business_source){
+            loadSource();
+        }else if (v.getId() == R.id.et_business_enterMan){
+            loadManGenJin();
+        }else if (v.getId() == R.id.et_business_jieDuan){
+            loadJieDuan();
+        }else if (v.getId() == R.id.et_business_type){
+            onPopupButtonClick(v);
+        }else if (v.getId() == R.id.et_company_plantime){
+            showDateDialog((FormEditText) v.findViewById(R.id.et_company_plantime));
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        menu.findItem(R.id.btn_save).setTitle(getString(R.string.common_save_button));
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.btn_save) {
+            if (et_business_name.testValidity() &&
+                    et_business_source.testValidity() &&
+                    et_business.testValidity() &&
+                    et_business_jieDuan.testValidity() &&
+                    et_company_tele.testValidity() &&
+                    et_company_businesslicense.testValidity() &&
+                    et_company_address.testValidity() &&
+                    et_company_name.testValidity() &&
+                    et_bc_tel.testValidity() &&
+                    et_bc_factory.testValidity()) {
+                sendHttpResquest();
+            }
+        }else if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+        }
+            return true;
+        }
 
     private String getEditText(FormEditText et) {
         String temp = "";
@@ -566,48 +543,41 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     @Override
                     public void onListItemClick(int position, String value) {
                         if (StringUtil.isEmpty(value)) return;
-                        switch (et.getId()) {
-                            case R.id.et_business_enterMan:
-                                et.setText(value);
-                                for (int i = 0; i < enterArray.size(); i++) {
-                                    if (value.equals(enterArray.getJSONObject(i).getString("BC_DOMAN"))) {
-                                        //获取跟进人编号
-                                        enterManCode = enterArray.getJSONObject(i).getString("EM_CODE");
-                                    }
+                        if (et.getId() == R.id.et_business_enterMan){
+                            et.setText(value);
+                            for (int i = 0; i < enterArray.size(); i++) {
+                                if (value.equals(enterArray.getJSONObject(i).getString("BC_DOMAN"))) {
+                                    //获取跟进人编号
+                                    enterManCode = enterArray.getJSONObject(i).getString("EM_CODE");
                                 }
-                                break;
-                            case R.id.et_business_source:
-                                et.setText(value);
-                                break;
-                            case R.id.et_business:
-                                et.setText(value);
-                                for (int i = 0; i < jsons.size(); i++) {
-                                    if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
-                                        String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
-                                        if (bd_prop.equals(getString(R.string.business_common))
-                                                || bd_prop.equals(getString(R.string.business_get_split))) {
-                                            //跟进人不可编辑，不可点击
-                                            et_business_enterMan.setClickable(false);
-                                            et_business_enterMan.setEnabled(false);
-                                            et_business_enterMan.setText("");
-                                            et_business_enterCode = 0;
-                                        } else {
-                                            //跟进人可编辑
-                                            et_business_enterCode = 1;
-                                            et_business_enterMan.setEnabled(true);
-                                            et_business_enterMan.setClickable(true);
-                                            jsons.getJSONObject(i).getString("BD_PROP");
-                                            // et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
-                                        }
+                            }
+                        }else if (et.getId() == R.id.et_business_source){
+                            et.setText(value);
+                        }else if (et.getId() == R.id.et_business){
+                            et.setText(value);
+                            for (int i = 0; i < jsons.size(); i++) {
+                                if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
+                                    String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
+                                    if (bd_prop.equals(getString(R.string.business_common))
+                                            || bd_prop.equals(getString(R.string.business_get_split))) {
+                                        //跟进人不可编辑，不可点击
+                                        et_business_enterMan.setClickable(false);
+                                        et_business_enterMan.setEnabled(false);
+                                        et_business_enterMan.setText("");
+                                        et_business_enterCode = 0;
+                                    } else {
+                                        //跟进人可编辑
+                                        et_business_enterCode = 1;
+                                        et_business_enterMan.setEnabled(true);
+                                        et_business_enterMan.setClickable(true);
+                                        jsons.getJSONObject(i).getString("BD_PROP");
+                                        // et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
                                     }
                                 }
-                                break;
-                            default:
-                                et.setText(value);
-                                break;
+                            }
+                        }else {
+                            et.setText(value);
                         }
-
-
                     }
                 });
         singleDialog.show();
@@ -639,23 +609,16 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
 
     public void onPopupButtonClick(View button) {
         popup = new PopupMenu(this, button);
-        switch (button.getId()) {
-            case R.id.et_business_type:
-                getMenuInflater().inflate(R.menu.menu_business_type, popup.getMenu());
-                break;
+        if (button.getId() == R.id.et_business_type){
+            getMenuInflater().inflate(R.menu.menu_business_type, popup.getMenu());
         }
-
         popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                switch (item.getItemId()) {
-                    case R.id.items_public:
-                        et_business_type.setText(item.getTitle());
-                        break;
-                    case R.id.items_private:
-                        et_business_type.setText(item.getTitle());
-                        break;
-                }
+                if (item.getItemId() == R.id.items_public)
+                    et_business_type.setText(item.getTitle());
+                else if (item.getItemId() == R.id.items_private)
+                    et_business_type.setText(item.getTitle());
                 return true;
             }
         });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailActivty.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -33,19 +33,16 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
+import com.core.widget.crouton.Crouton;
+import com.core.widget.crouton.Style;
+import com.core.widget.view.HorizontalStepsView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appme.settings.model.Business;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;
+import com.uas.appworks.CRM.erp.model.Business;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -63,13 +60,10 @@ public class BusinessDetailActivty extends BaseActivity {
 
     private final int LOAD_JIEDUAN = 0x210;
     private BussinessDetailAdapter mAdapter;
-    @ViewInject(R.id.ll_top_state)
     private LinearLayout ll_top_state;
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
-    private ArrayList<Business> mData = new ArrayList<Business>();
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
+    private ArrayList<Business> mData = new ArrayList<Business>();
 
     private String formCondition;
     private String gridCondition;
@@ -104,7 +98,10 @@ public class BusinessDetailActivty extends BaseActivity {
     }
 
     private void initView() {
-        ViewUtils.inject(this);
+        ll_top_state = (LinearLayout) findViewById(R.id.ll_top_state);
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -45,24 +45,21 @@ import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.location.BdLocationHelper;
+import com.core.utils.BaiduMapUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
+import com.core.widget.crouton.Crouton;
+import com.core.widget.crouton.Style;
+import com.core.widget.view.steps.StepsView;
+import com.uas.appworks.CRM.erp.adapter.StickyListAdapter;
+import com.uas.appworks.CRM.erp.model.SimpleData;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.StickyListAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.list.SimpleData;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.xzjmyk.pm.activity.view.steps.StepsView;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -70,9 +67,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
+
 import static com.alibaba.fastjson.JSON.parseObject;
 import static com.core.utils.HeightUtils.setListViewHeightBasedOnChildren1;
-import static com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil.getInstence;
 
 
 /**
@@ -88,72 +86,37 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     private static final int LOAD_NICHEHOUSE = 0x278;
     private static final int DELETE_NICHEHOUSE = 0x279;//删除商机
     private final int LOAD_COMTACT = 0x280;//获取联系人接口
-    @ViewInject(R.id.bt_fenpei)
     private Button bt_fenpei;
-    @ViewInject(R.id.bt_qiang)
     private Button bt_qiang;
-    @ViewInject(R.id.bt_manage_date)
     private Button bt_manage_date;
-    @ViewInject(R.id.bt_zhuanyi)
     private Button bt_zhuanyi;
-
-    @ViewInject(R.id.bt_manage_go)
     private Button bt_manage_go;
-    @ViewInject(R.id.crm_ll_followup)
     private LinearLayout crm_ll_followup;
-    @ViewInject(R.id.crm_ll_qiang)
     private LinearLayout crm_ll_qiang;
-    @ViewInject(R.id.crm_ll_manage)
     private LinearLayout crm_ll_manage;
-
-    @ViewInject(R.id.ll_card_num)
     private TextView ll_card_num;
-    @ViewInject(R.id.ll_card_line)
     private View ll_card_line;
-    @ViewInject(R.id.bc_from)
     private TextView bc_from;
-    @ViewInject(R.id.bc_remark)
     private TextView bc_remark;
-    @ViewInject(R.id.bc_recorder)
     private TextView bc_recorder;
-    @ViewInject(R.id.bc_recorddate)
     private TextView bc_recorddate;
-
-    @ViewInject(R.id.bc_code)
     private TextView bc_code;
-    @ViewInject(R.id.bc_description)
     private TextView bc_description;
-    @ViewInject(R.id.bc_nichehouse)
     private TextView bc_nichehouse;
-    @ViewInject(R.id.bc_type)
     private TextView bc_type;
-    @ViewInject(R.id.bc_currentprocess)
     private TextView bc_currentprocess;
-    @ViewInject(R.id.bc_lastdate)
     private TextView bc_lastdate;
-    @ViewInject(R.id.bc_doman)
     private TextView bc_doman;
-    @ViewInject(R.id.bc_custname)
     private TextView bc_custname;
-    @ViewInject(R.id.bc_address)
     private TextView bc_address;
-    @ViewInject(R.id.bc_contact)
     private TextView bc_contact;
-    @ViewInject(R.id.bc_position)
     private TextView bc_position;
-    @ViewInject(R.id.bt_tel)
     private TextView bt_tel;
-    @ViewInject(R.id.myListView)
     private MyListView myListView;
-
-    @ViewInject(R.id.stepsView)
     private StepsView mStepsView;
-
-    @ViewInject(R.id.lv_business)
     private StickyListHeadersListView mList;
 
     private StickyListAdapter mAapter;
-
     private int type = 0;
     private int id = 0;
     private String formCondition;
@@ -171,10 +134,43 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_business_detail_info);
+        initIDS();
         initView();
         initListener();
     }
 
+    private void initIDS() {
+        bt_fenpei = (Button) findViewById(R.id.bt_fenpei);
+        bt_qiang = (Button) findViewById(R.id.bt_qiang);
+        bt_manage_date   = (Button) findViewById(R.id.bt_manage_date);
+        bt_zhuanyi  = (Button) findViewById(R.id.bt_zhuanyi);
+        bt_manage_go  = (Button) findViewById(R.id.bt_manage_go);
+        crm_ll_followup = (LinearLayout) findViewById(R.id.crm_ll_followup);
+        crm_ll_qiang = (LinearLayout) findViewById(R.id.crm_ll_qiang);
+        crm_ll_manage = (LinearLayout) findViewById(R.id.crm_ll_manage);
+        ll_card_num = (TextView) findViewById(R.id.ll_card_num);
+        ll_card_line = findViewById(R.id.ll_card_line);
+        bc_from = (TextView) findViewById(R.id.bc_from);
+        bc_remark = (TextView) findViewById(R.id.bc_remark);
+        bc_recorder  = (TextView) findViewById(R.id.bc_recorder);
+        bc_recorddate = (TextView) findViewById(R.id.bc_recorddate);
+        bc_code = (TextView) findViewById(R.id.bc_code);
+        bc_description = (TextView) findViewById(R.id.bc_description);
+        bc_nichehouse = (TextView) findViewById(R.id.bc_nichehouse);
+        bc_type = (TextView) findViewById(R.id.bc_type);
+        bc_currentprocess = (TextView) findViewById(R.id.bc_currentprocess);
+        bc_lastdate= (TextView) findViewById(R.id.bc_lastdate);
+        bc_doman = (TextView) findViewById(R.id.bc_doman);
+        bc_custname = (TextView) findViewById(R.id.bc_custname);
+        bc_address= (TextView) findViewById(R.id.bc_address);
+        bc_contact = (TextView) findViewById(R.id.bc_contact);
+        bc_position = (TextView) findViewById(R.id.bc_position);
+        bt_tel = (TextView) findViewById(R.id.bt_tel);
+        myListView = (MyListView) findViewById(R.id.myListView);
+        mStepsView = (StepsView) findViewById(R.id.stepsView);
+        mList = (StickyListHeadersListView) findViewById(R.id.lv_business);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -223,7 +219,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     }
 
     private void initView() {
-        ViewUtils.inject(this);
         getSupportActionBar().setTitle(getString(R.string.business_detail));
         Intent intent = getIntent();
         if (intent != null) {
@@ -278,45 +273,37 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.bt_manage_go:
-                showPopupWindow(v);
-                break;
-            case R.id.stage_follow:
-                startActivityForResult(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class)
-                        .putExtra("type", 2)
-                        .putExtra("code", bt_code)
-                        .putExtra("process", bt_process)
-                        .putExtra("doman", bt_doman), BUSINESS_FOLLOW_REQUEST);
-                break;
-            case R.id.bt_manage_date:
-                isEnableClick(bt_code, 5);
-                break;
-            case R.id.add_mission:
-                if (destination == null) {
-                    ToastUtil.showToast(ct, getString(R.string.crmmain_business) + getString(R.string.location_error_try_agen));
-                    return;
-                }
-                float dis = Float.valueOf(getInstence().getDistance(destination));
-                setEndTime(destination, dis);
-                progressDialog.show();
-                break;
-            case R.id.bt_qiang:
-                progressDialog.show();
-                String url = CommonUtil.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
-                Map<String, Object> stringMap = new HashMap<String, Object>();
-                stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-                stringMap.put("type", "0");
-                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-                ViewUtil.httpSendRequest(ct, url, stringMap, mHandler, headers, CAN_QIANG_NOT, null, null, "post");
-                break;
-            case R.id.bt_fenpei:
-                startActivityForResult(new Intent(ct, DbfindList2Activity.class), 1);
-                break;
-            case R.id.bt_zhuanyi:
-                startActivity(new Intent(ct, BusinessTransferActivity.class).putExtra("code", bt_code).putExtra("name", bc_nichehouse.getText().toString().trim()));
-                break;
+        if (v.getId() == R.id.bt_manage_go){
+            showPopupWindow(v);
+        }else if (v.getId() == R.id.stage_follow){
+            startActivityForResult(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class)
+                    .putExtra("type", 2)
+                    .putExtra("code", bt_code)
+                    .putExtra("process", bt_process)
+                    .putExtra("doman", bt_doman), BUSINESS_FOLLOW_REQUEST);
+        }else if (v.getId() == R.id.bt_manage_date){
+            isEnableClick(bt_code, 5);
+        }else if (v.getId() == R.id.add_mission){
+            if (destination == null) {
+                ToastUtil.showToast(ct, getString(R.string.crmmain_business) + getString(R.string.location_error_try_agen));
+                return;
+            }
+            float dis = Float.valueOf(BaiduMapUtil.getInstence().getDistance(destination));
+            setEndTime(destination, dis);
+            progressDialog.show();
+        }else if (v.getId() == R.id.bt_qiang){
+            progressDialog.show();
+            String url = CommonUtil.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
+            Map<String, Object> stringMap = new HashMap<String, Object>();
+            stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+            stringMap.put("type", "0");
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            ViewUtil.httpSendRequest(ct, url, stringMap, mHandler, headers, CAN_QIANG_NOT, null, null, "post");
+        }else if (v.getId() == R.id.bt_fenpei){
+            startActivityForResult(new Intent(ct, DbfindList2Activity.class), 1);
+        }else if (v.getId() == R.id.bt_zhuanyi){
+            startActivity(new Intent(ct, BusinessTransferActivity.class).putExtra("code", bt_code).putExtra("name", bc_nichehouse.getText().toString().trim()));
         }
     }
 
@@ -601,7 +588,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         if (items.size() > 0) {
                             Crouton.makeText(BusinessDetailInfoActivity.this, "不能重复添加到日程！", Style.holoRedLight, 2000).show();
                         } else {
-                            Intent intent = new Intent(ct, TaskAddActivity.class);
+                            Intent intent = new Intent("com.modular.appworks.TaskAddActivity");
                             intent.putExtra("type", 1);
                             intent.putExtra("from", "BusinessDetailInfo");
                             intent.putExtra("data", bt_code);
@@ -965,7 +952,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
      * @update by 2017/1/11
      */
     private void setEndTime(LatLng location, final double dis) {
-        getInstence().getDrivingRoute(MyApplication.getInstance().getBdLocationHelper().getLocation(), location,
+        BaiduMapUtil.getInstence().getDrivingRoute(MyApplication.getInstance().getBdLocationHelper().getLocation(), location,
                 new OnGetDrivingRouteResult() {
                     @Override
                     public void onGetDrivingRouteResult(DrivingRouteResult drivingRouteResult) {
@@ -1001,7 +988,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         mission.setStatus(0);
         mission.setCompanyName(bc_custname.getText().toString());
         mission.setCompanyAddr(bc_address.getText().toString());
-        mission.setDistance(Float.valueOf(getInstence().getDistance(destination)));
+        mission.setDistance(Float.valueOf(BaiduMapUtil.getInstence().getDistance(destination)));
         mission.setLatLng(destination);
         mission.setVisitTime(realTime);//预计到达时间
         mission.setLocation(locationHelper.getName());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessLessActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,23 +22,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
 import com.core.utils.CommonInterface;
+import com.core.utils.CommonUtil;
+import com.core.widget.SingleDialog;
+import com.core.widget.crouton.Crouton;
+import com.core.widget.crouton.Style;
 import com.core.widget.view.ListViewInScroller;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.core.utils.time.wheel.DatePicker;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -52,24 +48,14 @@ import java.util.Map;
  * @return:
  */
 public class BusinessLessActivity extends BaseActivity implements View.OnClickListener {
-    @ViewInject(R.id.ll_moment)
     private LinearLayout ll_moment;
-    @ViewInject(R.id.ll_leader)
     private LinearLayout ll_leader;
-    @ViewInject(R.id.ll_date)
     private LinearLayout ll_date;
-
-    @ViewInject(R.id.et_remark)
     private EditText et_remark;
-    @ViewInject(R.id.tv_business_state)
     private TextView tv_business_state;
-    @ViewInject(R.id.tv_leader)
     private TextView tv_leader;
-    @ViewInject(R.id.tv_date)
     private TextView tv_date;
-
     private ArrayList<Data> datas = new ArrayList<>();
-    @ViewInject(R.id.lv_datas)
     private ListViewInScroller mList;
 
     private JSONArray array;//商机阶段全局变量
@@ -88,7 +74,14 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
 
 
     private void initView() {
-        ViewUtils.inject(this);
+        ll_moment = (LinearLayout) findViewById(R.id.ll_moment);
+        ll_leader = (LinearLayout) findViewById(R.id.ll_leader);
+        ll_date = (LinearLayout) findViewById(R.id.ll_date);
+        et_remark = (EditText) findViewById(R.id.et_remark);
+        tv_business_state = (TextView) findViewById(R.id.tv_business_state);
+        tv_leader = (TextView) findViewById(R.id.tv_leader);
+        tv_date = (TextView) findViewById(R.id.tv_date);
+        mList = (ListViewInScroller) findViewById(R.id.lv_datas);
     }
 
     private void initListener() {
@@ -138,45 +131,41 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-                if (type == 1) {
-                    CommonInterface.getInstance().getCodeByNet("BusinessChanceData", new CommonInterface.OnResultListener() {
-                        @Override
-                        public void result(boolean isOk, int result, String message) {
-                            bcd_code = message;
-                            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "失效");
-                        }
-                    });
+        if (item.getItemId() == R.id.btn_save){
+            if (type == 1) {
+                CommonInterface.getInstance().getCodeByNet("BusinessChanceData", new CommonInterface.OnResultListener() {
+                    @Override
+                    public void result(boolean isOk, int result, String message) {
+                        bcd_code = message;
+                        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "失效");
+                    }
+                });
 
-                }
-                if (type == 2) {
-                    boolean falg = true;
-                    for (int i = 0; i < datas.size(); i++) {
-                        if (datas.get(i).getIsNeed() == 1 && mEditText.get(i) == null) {
-                            falg = false;
-                            ToastMessage(datas.get(i).getName() + "为必填项");
-                        } else {
-                            if (mEditText.get(i) != null) {
-                                if (StringUtil.isEmpty(mEditText.get(i).toString())) {
-                                    falg = false;
-                                    ToastMessage(datas.get(i).getName() + "为必填项");
-                                }
+            }
+            if (type == 2) {
+                boolean falg = true;
+                for (int i = 0; i < datas.size(); i++) {
+                    if (datas.get(i).getIsNeed() == 1 && mEditText.get(i) == null) {
+                        falg = false;
+                        ToastMessage(datas.get(i).getName() + "为必填项");
+                    } else {
+                        if (mEditText.get(i) != null) {
+                            if (StringUtil.isEmpty(mEditText.get(i).toString())) {
+                                falg = false;
+                                ToastMessage(datas.get(i).getName() + "为必填项");
                             }
                         }
                     }
-                    if (falg) {
-                        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "继续跟进");
-                    }
-                    for (int i = 0; i < mEditText.size(); i++) {
+                }
+                if (falg) {
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "继续跟进");
+                }
+                for (int i = 0; i < mEditText.size(); i++) {
 //                        Log.i(TAG, "onOptionsItemSelected:" + datas.get(i).getFormStoreKey() + ":" + mEditText.get(i));
-                    }
                 }
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
-
+            }
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
@@ -314,28 +303,6 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
 
-    private void showDateWheel(final int resId) {
-        DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH_DAY);
-        picker.setRange(1950, 2030);
-        //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
-        picker.setSelectedItem(
-                Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1,
-                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
-            @Override
-            public void onDatePicked(String year, String month, String day) {
-                switch (resId) {
-                    case R.id.tv_date://排名
-                        tv_date.setText(year + "-" + month + "-" + day);
-                        break;
-                }
-            }
-        });
-        picker.show();
-    }
-
-
     /**
      * @desc:加载阶段
      * @author：Arison on 2016/7/20
@@ -367,17 +334,10 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     }*/
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tv_leader:
-                loadLeader(2);
-                break;
-            case R.id.tv_date:
-                // showDateWheel(R.id.tv_date);
-                break;
-            case R.id.tv_business_state:
-                loadJieDuan(5);
-                break;
-        }
+        if (v.getId() == R.id.tv_leader)
+            loadLeader(2);
+        else if (v.getId() ==  R.id.tv_business_state)
+            loadJieDuan(5);
     }
 
     private List<String> lists = new ArrayList<String>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessSelectCustomerActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,20 +29,18 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
+import com.core.widget.crouton.Crouton;
+import com.core.widget.crouton.Style;
 import com.core.widget.listener.EditChangeListener;
 import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appme.settings.model.Business;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
+import com.uas.appworks.CRM.erp.model.Business;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -51,12 +49,10 @@ import java.util.Map;
 
 public class BusinessSelectCustomerActivity extends BaseActivity {
     private BussinessDetailAdapter mAdapter;
-    @ViewInject(R.id.list_business)
-    private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String code;
-    @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
+    private PullToRefreshListView mlist;
 
     private EmptyLayout mEmptyLayout;
 
@@ -73,7 +69,8 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     }
 
     private void initView() {
-        ViewUtils.inject(this);
+        search_edit = (ClearEditText) findViewById(R.id.search_edit);
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
         getSupportActionBar().setTitle("选择客户");
         if (getIntent() != null) {
             code = getIntent().getStringExtra("code");
@@ -154,16 +151,13 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-                if (canSave()) {
-                    LogUtil.prinlnLongMsg("Arison", code + "|" + cu_code + "|" + cu_name);
-                    sendHttpResquest(2, code, cu_code, cu_name);
-                }
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.btn_save){
+            if (canSave()) {
+                LogUtil.prinlnLongMsg("Arison", code + "|" + cu_code + "|" + cu_name);
+                sendHttpResquest(2, code, cu_code, cu_name);
+            }
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessStateActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -30,18 +30,15 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
+import com.core.widget.view.HorizontalStepsView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appme.settings.model.Business;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;
+import com.uas.appworks.CRM.erp.model.Business;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,23 +52,16 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
 
     private final int LOAD_JIEDUAN = 0x451;
     private BussinessDetailAdapter mAdapter;
-    @ViewInject(R.id.ll_top_state)
     private LinearLayout ll_top_state;
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
     private String formCondition;
     private String gridCondition;
     private int page = 1;
-    @ViewInject(R.id.tv_unmanger)
     private TextView tv_unmanger;
-    @ViewInject(R.id.tv_manged)
     private TextView tv_manged;
-    @ViewInject(R.id.tv_timeout)
     private TextView tv_timeout;
-    @ViewInject(R.id.tv_transtered)
     private TextView tv_transtered;
     private EmptyLayout mEmptyLayout;
     private int business_state = 0;//商机状态
@@ -87,7 +77,13 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
     }
 
     private void initView() {
-        ViewUtils.inject(this);
+        ll_top_state = (LinearLayout) findViewById(R.id.ll_top_state);
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        tv_unmanger = (TextView) findViewById(R.id.tv_unmanger);
+        tv_timeout = (TextView) findViewById(R.id.tv_timeout);
+        tv_transtered = (TextView) findViewById(R.id.tv_transtered);
+        tv_manged= (TextView) findViewById(R.id.tv_manged);
         updateTabSelectState(tv_unmanger);
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
@@ -102,33 +98,27 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
     }
 
     private void updateTabSelectState(TextView view) {
-        switch (view.getId()) {
-            case R.id.tv_unmanger:
-                tv_unmanger.setSelected(true);
-                tv_manged.setSelected(false);
-                tv_timeout.setSelected(false);
-                tv_transtered.setSelected(false);
-                break;
-            case R.id.tv_manged:
-                tv_unmanger.setSelected(false);
-                tv_manged.setSelected(true);
-                tv_timeout.setSelected(false);
-                tv_transtered.setSelected(false);
-                break;
-            case R.id.tv_timeout:
-                tv_unmanger.setSelected(false);
-                tv_manged.setSelected(false);
-                tv_timeout.setSelected(true);
-                tv_transtered.setSelected(false);
-                break;
-            case R.id.tv_transtered:
-                tv_unmanger.setSelected(false);
-                tv_manged.setSelected(false);
-                tv_timeout.setSelected(false);
-                tv_transtered.setSelected(true);
-                break;
+        if (view.getId() == R.id.tv_unmanger){
+            tv_unmanger.setSelected(true);
+            tv_manged.setSelected(false);
+            tv_timeout.setSelected(false);
+            tv_transtered.setSelected(false);
+        }else if (view.getId() == R.id.tv_manged){
+            tv_unmanger.setSelected(false);
+            tv_manged.setSelected(true);
+            tv_timeout.setSelected(false);
+            tv_transtered.setSelected(false);
+        }else if (view.getId() == R.id.tv_timeout){
+            tv_unmanger.setSelected(false);
+            tv_manged.setSelected(false);
+            tv_timeout.setSelected(true);
+            tv_transtered.setSelected(false);
+        }else if (view.getId() == R.id.tv_transtered){
+            tv_unmanger.setSelected(false);
+            tv_manged.setSelected(false);
+            tv_timeout.setSelected(false);
+            tv_transtered.setSelected(true);
         }
-
     }
 
     private void initListener() {
@@ -208,35 +198,30 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tv_unmanger:
-                updateTabSelectState((TextView) v.findViewById(R.id.tv_unmanger));
-                business_state = 0;
-                page = 1;
-                //  mAdapter=null;
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
-                break;
-            case R.id.tv_manged:
-                updateTabSelectState((TextView) v.findViewById(R.id.tv_manged));
-                business_state = 1;
-                page = 1;
-                // mAdapter=null;
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
-                break;
-            case R.id.tv_timeout:
-                updateTabSelectState((TextView) v.findViewById(R.id.tv_timeout));
-                business_state = 2;
-                page = 1;
-                // mAdapter=null;
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
-                break;
-            case R.id.tv_transtered:
-                updateTabSelectState((TextView) v.findViewById(R.id.tv_transtered));
-                business_state = 3;
-                page = 1;
-                // mAdapter=null;
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
-                break;
+        if (v.getId() == R.id.tv_unmanger){
+            updateTabSelectState((TextView) v.findViewById(R.id.tv_unmanger));
+            business_state = 0;
+            page = 1;
+            //  mAdapter=null;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+        }else if (v.getId() == R.id.tv_manged){
+            updateTabSelectState((TextView) v.findViewById(R.id.tv_manged));
+            business_state = 1;
+            page = 1;
+            // mAdapter=null;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+        }else if (v.getId() == R.id.tv_timeout){
+            updateTabSelectState((TextView) v.findViewById(R.id.tv_timeout));
+            business_state = 2;
+            page = 1;
+            // mAdapter=null;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+        }else if (v.getId() == R.id.tv_transtered){
+            updateTabSelectState((TextView) v.findViewById(R.id.tv_transtered));
+            business_state = 3;
+            page = 1;
+            // mAdapter=null;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessTransferActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessTransferActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -21,14 +21,12 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appme.settings.model.Business;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.CRM.erp.model.Business;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,7 +42,6 @@ import java.util.Map;
 public class BusinessTransferActivity extends BaseActivity {
 
     private BussinessDetailAdapter mAdapter;
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
 
@@ -58,8 +55,8 @@ public class BusinessTransferActivity extends BaseActivity {
     }
 
     private void initView() {
-        ViewUtils.inject(this);
         getSupportActionBar().setTitle("转移到商机库");
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
     }
 
     private void initListener() {
@@ -122,19 +119,14 @@ public class BusinessTransferActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-                if (StringUtil.isEmpty(nicehouse)) {
-                    ToastMessage("请选择一种商机库");
-                } else {
-                    sendHttpResquestTransfer(BUSSINE_TRANSFER, code, nicehouse);
-                }
-
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
-        }
+        if (item.getItemId() == R.id.btn_save){
+            if (StringUtil.isEmpty(nicehouse)) {
+                ToastMessage("请选择一种商机库");
+            } else {
+                sendHttpResquestTransfer(BUSSINE_TRANSFER, code, nicehouse);
+            }
+        }else if (item.getItemId() == android.R.id.home)
+            onBackPressed();
         return true;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerAddActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.app.AlertDialog;
 import android.content.Intent;
@@ -23,18 +23,15 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
-import com.core.widget.view.Activity.SelectActivity;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.core.utils.CommonUtil;
+import com.core.widget.SingleDialog;
+import com.core.widget.view.Activity.SelectActivity;
+import com.uas.appworks.R;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -51,61 +48,35 @@ import java.util.Map;
  */
 public class CustomerAddActivity extends BaseActivity implements View.OnClickListener {
 
-    @ViewInject(R.id.et_cu_code)
     private FormEditText et_cu_code;
-    @ViewInject(R.id.et_cu_name)
     private FormEditText et_cu_name;
-    @ViewInject(R.id.et_cu_shortname)
     private FormEditText et_cu_shortname;
-    @ViewInject(R.id.tv_cu_address)
     private FormEditText tv_cu_address;
-    @ViewInject(R.id.et_cu_kind)
     private FormEditText et_cu_kind;
-    @ViewInject(R.id.et_cu_district)
     private FormEditText et_cu_district;
-    @ViewInject(R.id.et_cu_payments)
     private FormEditText et_cu_payments;
-    @ViewInject(R.id.et_cu_sellername)
     private FormEditText et_cu_sellername;
-    @ViewInject(R.id.tv_cu_contact)
     private FormEditText tv_cu_contact;
-    @ViewInject(R.id.tv_cu_degree)
     private FormEditText tv_cu_degree;
-    @ViewInject(R.id.tv_cu_mobile)
     private FormEditText tv_cu_mobile;
-    @ViewInject(R.id.tv_cu_email)
     private FormEditText tv_cu_email;
-    @ViewInject(R.id.tv_cu_remark)
     private FormEditText tv_cu_remark;
-
-    @ViewInject(R.id.tv_cu_businesscode)
     private FormEditText tv_cu_businesscode;
-    @ViewInject(R.id.tv_cu_currency)
     private FormEditText tv_cu_currency;
-    @ViewInject(R.id.tv_cu_taxrate)
     private FormEditText tv_cu_taxrate;
-    @ViewInject(R.id.tv_cu_nichestep)
     private FormEditText tv_cu_nichestep;
-
-    @ViewInject(R.id.ll_infomal)
     private LinearLayout ll_infomal;
-
-    private String tv_code;
-    private int type;//预录入客户，正式客户
-
-    PopupMenu popup = null;
-
-    @ViewInject(R.id.bt_save)
     private TextView bt_save;
-    @ViewInject(R.id.bt_commit)
     private TextView bt_commit;
-    @ViewInject(R.id.bt_uncommit)
     private TextView bt_uncommit;
 
     private List<String> mLists = new ArrayList<String>();
     private String et_cu_sellercode;
     private String mCuId;
 
+    private String tv_code;
+    private int type;//预录入客户，正式客户
+    PopupMenu popup = null;
     private final int COMMIT = 9;
     private final int UNCOMMIT = 10;
     private final int UPDATE = 11;
@@ -170,21 +141,15 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
         tv_cu_remark.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) {
                 if (!StringUtil.isEmpty(s.toString())) {
                     tv_cu_remark.testValidity();
                 }
             }
-
             @Override
-            public void afterTextChanged(Editable s) {
-
-            }
+            public void afterTextChanged(Editable s) {}
         });
     }
 
@@ -206,7 +171,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
 
     private void initView() {
-        ViewUtils.inject(this);
+        initIDS();
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 0);
@@ -258,6 +223,31 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         }
     }
 
+    private void initIDS() {
+        et_cu_code = (FormEditText) findViewById(R.id.et_cu_code);
+        et_cu_name = (FormEditText) findViewById(R.id.et_cu_name);
+        et_cu_shortname= (FormEditText) findViewById(R.id.et_cu_shortname);
+        tv_cu_address = (FormEditText) findViewById(R.id.tv_cu_address);
+        et_cu_kind = (FormEditText) findViewById(R.id.et_cu_kind);
+        et_cu_district = (FormEditText) findViewById(R.id.et_cu_district);
+        et_cu_payments= (FormEditText) findViewById(R.id.et_cu_payments);
+        et_cu_sellername = (FormEditText) findViewById(R.id.et_cu_sellername);
+        tv_cu_contact= (FormEditText) findViewById(R.id.tv_cu_contact);
+        tv_cu_degree= (FormEditText) findViewById(R.id.tv_cu_degree);
+        tv_cu_mobile = (FormEditText) findViewById(R.id.tv_cu_mobile);
+        tv_cu_email = (FormEditText) findViewById(R.id.tv_cu_email);
+        tv_cu_remark = (FormEditText) findViewById(R.id.tv_cu_remark);
+        tv_cu_businesscode = (FormEditText) findViewById(R.id.tv_cu_businesscode);
+        tv_cu_businesscode = (FormEditText) findViewById(R.id.tv_cu_businesscode);
+        tv_cu_taxrate = (FormEditText) findViewById(R.id.tv_cu_taxrate);
+        tv_cu_nichestep= (FormEditText) findViewById(R.id.tv_cu_nichestep);
+        ll_infomal = (LinearLayout) findViewById(R.id.ll_infomal);
+        bt_save = (TextView) findViewById(R.id.bt_save);
+        bt_commit= (TextView) findViewById(R.id.bt_commit);
+        bt_uncommit = (TextView) findViewById(R.id.bt_uncommit);
+        tv_cu_currency = (FormEditText) findViewById(R.id.tv_cu_currency);
+    }
+
     private Menu mMenu;
 
     @Override
@@ -282,16 +272,13 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-                createStore();
-                if (!TextUtils.isEmpty(formStore)) {
-                    update(UPDATE, formStore);
-                }
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.btn_save){
+            createStore();
+            if (!TextUtils.isEmpty(formStore)) {
+                update(UPDATE, formStore);
+            }
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
@@ -688,20 +675,15 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 new SingleDialog.PickDialogListener() {
                     @Override
                     public void onListItemClick(int position, String value) {
-
-                        switch (et.getId()) {
-                            case R.id.et_cu_payments:
-                                for (int i = 0; i < array.size(); i++) {
-                                    if (value.equals(array.getJSONObject(i).getString("pa_name"))) {
-                                        pa_code = array.getJSONObject(i).getString("pa_code");
-                                    }
+                        if (et.getId() == R.id.et_cu_payments){
+                            for (int i = 0; i < array.size(); i++) {
+                                if (value.equals(array.getJSONObject(i).getString("pa_name"))) {
+                                    pa_code = array.getJSONObject(i).getString("pa_code");
                                 }
-                                et.setText(value);
-                                break;
-                            default:
-                                et.setText(value);
-                                break;
-
+                            }
+                            et.setText(value);
+                        }else {
+                            et.setText(value);
                         }
                     }
                 });
@@ -1044,51 +1026,40 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.et_cu_kind:
-                loadCustomerType();
-                break;
-            case R.id.et_cu_district:
-                onPopupButtonClick(v);
-
-                break;
-            case R.id.tv_cu_nichestep:
-                loadJieDuan();
-                break;
-            case R.id.et_cu_payments:
-                loadPayments();
-                break;
-            case R.id.tv_cu_currency:
-                loadCurrency();
-                break;
-            case R.id.et_cu_sellername:
-                Intent intent = new Intent();
-                intent.setClass(this, DbfindListActivity.class);
-                startActivityForResult(intent, REQUEST_CLERK);
-                break;
-            case R.id.bt_save:
-                saveData();
-                break;
-            case R.id.bt_commit:
-                if (isStrEquals(cu_code, et_cu_code) && isStrEquals(mCompanyName, et_cu_name)
-                        && isStrEquals(mShortName, et_cu_shortname) && isStrEquals(mCompanyAddress, tv_cu_address)
-                        && isStrEquals(mCuKind, et_cu_kind) && isStrEquals(mCuDistrict, et_cu_district)
-                        && isStrEquals(mPayments, et_cu_payments) && isStrEquals(mSellerMan, et_cu_sellername)
-                        && isStrEquals(mContact, tv_cu_contact) && isStrEquals(mPosition, tv_cu_degree)
-                        && isStrEquals(mTelephone, tv_cu_mobile) && isStrEquals(mEmail, tv_cu_email)
-                        && isStrEquals(mBusinessCode, tv_cu_businesscode) && isStrEquals(mCurrency, tv_cu_currency)
-                        && isStrEquals(mTaxrate, tv_cu_taxrate) && isStrEquals(mNicheStep, tv_cu_nichestep)
-                        && isStrEquals(mRemark, tv_cu_remark)) {
-                    commit(COMMIT, mCuId);
-                } else {
-                    new AlertDialog.Builder(this).setTitle(getString(R.string.common_notice))
-                            .setMessage(getString(R.string.CRM_current_page_change_ecet))
-                            .setPositiveButton(getString(R.string.common_sure), null).show();
-                }
-                break;
-            case R.id.bt_uncommit:
-                unCommit(UNCOMMIT, mCuId);
-                break;
+        if (v.getId() == R.id.et_cu_kind){
+            loadCustomerType();
+        }else if (v.getId() == R.id.et_cu_district){
+            onPopupButtonClick(v);
+        }else if (v.getId() == R.id.tv_cu_nichestep){
+            loadJieDuan();
+        }else if (v.getId() ==  R.id.et_cu_payments){
+            loadPayments();
+        }else if (v.getId() == R.id.tv_cu_currency){
+            loadCurrency();
+        }else if (v.getId() ==  R.id.et_cu_sellername){
+            Intent intent = new Intent();
+            intent.setClass(this, DbfindListActivity.class);
+            startActivityForResult(intent, REQUEST_CLERK);
+        }else if (v.getId() == R.id.bt_save){
+            saveData();
+        }else if (v.getId() == R.id.bt_commit){
+            if (isStrEquals(cu_code, et_cu_code) && isStrEquals(mCompanyName, et_cu_name)
+                    && isStrEquals(mShortName, et_cu_shortname) && isStrEquals(mCompanyAddress, tv_cu_address)
+                    && isStrEquals(mCuKind, et_cu_kind) && isStrEquals(mCuDistrict, et_cu_district)
+                    && isStrEquals(mPayments, et_cu_payments) && isStrEquals(mSellerMan, et_cu_sellername)
+                    && isStrEquals(mContact, tv_cu_contact) && isStrEquals(mPosition, tv_cu_degree)
+                    && isStrEquals(mTelephone, tv_cu_mobile) && isStrEquals(mEmail, tv_cu_email)
+                    && isStrEquals(mBusinessCode, tv_cu_businesscode) && isStrEquals(mCurrency, tv_cu_currency)
+                    && isStrEquals(mTaxrate, tv_cu_taxrate) && isStrEquals(mNicheStep, tv_cu_nichestep)
+                    && isStrEquals(mRemark, tv_cu_remark)) {
+                commit(COMMIT, mCuId);
+            } else {
+                new AlertDialog.Builder(this).setTitle(getString(R.string.common_notice))
+                        .setMessage(getString(R.string.CRM_current_page_change_ecet))
+                        .setPositiveButton(getString(R.string.common_sure), null).show();
+            }
+        }else if (v.getId() == R.id.bt_uncommit){
+            unCommit(UNCOMMIT, mCuId);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindList2Activity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DbfindList2Activity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,17 +25,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.model.Employees;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.ClearEditText;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -53,9 +52,7 @@ import java.util.regex.PatternSyntaxException;
 
 public class DbfindList2Activity extends BaseActivity{
     private static final int WHAT_LOAD = 0x11;
-    @ViewInject(R.id.listview)
     private PullToRefreshListView listview;
-    @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
     private boolean isSingle = true;
     private boolean isNet = false;
@@ -141,6 +138,9 @@ public class DbfindList2Activity extends BaseActivity{
     }
     public void initView(){
         View view = LayoutInflater.from(this).inflate(R.layout.view_empty, null);
+
+        listview = (PullToRefreshListView) findViewById(R.id.listview);
+        search_edit = (ClearEditText) findViewById(R.id.search_edit);
         listview.setEmptyView(view);
         getSupportActionBar().setTitle("选择同事");
         adapter = new DistributionSelectAdapter();
@@ -316,7 +316,7 @@ public class DbfindList2Activity extends BaseActivity{
             holder.name_tv.setText(users.get(i).getEm_name());
             holder.encode=users.get(i).getEm_code();
             if (users.get(i).getEm_id() == 0){
-                holder.head_img.setImageResource(com.xzjmyk.pm.activity.R.drawable.avatar_normal);
+                holder.head_img.setImageResource(R.drawable.avatar_normal);
             }else {
                 AvatarHelper.getInstance().display(users.get(i).getEm_id() + "", holder.head_img, true, true);
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindListActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DbfindListActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -29,17 +29,15 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.model.Employees;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,22 +52,14 @@ import java.util.Map;
 public class DbfindListActivity extends BaseActivity {
     private EmptyLayout mEmptyLayout;
 
-    @ViewInject(R.id.lv_employee)
     private PullToRefreshListView lv_employee;
     private EmployeeAdatper adapter;
     private List<Employees> lists;
-
-    @ViewInject(R.id.et_Search)
     private ClearEditText et_Search;
     private  ModeCallback mCallback;//多选模式
-
     private Context ct;
-
-    @ViewInject(R.id.iv_DeleteText)
     private ImageView iv_DeleteText;
-
     private List<Employees> selectedItems = new ArrayList<>();
-
     private final static int SUCCESS_LOADDATA = 1;
     private Handler handler = new Handler() {
         public void handleMessage(android.os.Message msg) {
@@ -127,7 +117,9 @@ public class DbfindListActivity extends BaseActivity {
 
     public void initView() {
         setContentView(R.layout.act_list_dbfind_employee);
-        ViewUtils.inject(this);
+        iv_DeleteText = (ImageView) findViewById(R.id.iv_DeleteText);
+        et_Search = (ClearEditText) findViewById(R.id.et_Search);
+        lv_employee = (PullToRefreshListView) findViewById(R.id.lv_employee);
         ct = this;
         getSupportActionBar().setTitle("选择同事");
         

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/SearchSelectActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -21,6 +21,7 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 import com.core.base.BaseActivity;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
@@ -30,9 +31,8 @@ import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,12 +40,8 @@ import java.util.List;
 import java.util.Map;
 
 public class SearchSelectActivity extends BaseActivity {
-    public static final int RESULT_CODE = 0x865;
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
-    @ViewInject(R.id.pullToRefreshListView)
     private PullToRefreshListView pullToRefreshListView;
-    @ViewInject(R.id.empty_rl)
     private RelativeLayout empty_rl;
 
     private int page = 1;
@@ -58,13 +54,17 @@ public class SearchSelectActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search_select);
-        ViewUtils.inject(this);
         initView();
         initEvent();
     }
 
     private void initView() {
         getSupportActionBar().setTitle(R.string.describe);
+
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        pullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pullToRefreshListView);
+        empty_rl = (RelativeLayout) findViewById(R.id.empty_rl);
+
         voiceSearchView.setHineText(getString(R.string.search_select_hint));
         pullToRefreshListView.setMode(PullToRefreshBase.Mode.PULL_FROM_END);
         seachResult = new ArrayList<>();
@@ -96,7 +96,7 @@ public class SearchSelectActivity extends BaseActivity {
                 LogUtil.i("result=" + result);
                 Intent intent = new Intent();
                 intent.putExtra("data", result);
-                setResult(RESULT_CODE, intent);
+                setResult(AppConstant.RESULT_CODE, intent);
                 finish();
             }
         });

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/SelectAimActivity.java

@@ -0,0 +1,149 @@
+package com.uas.appworks.CRM.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.baidu.mapapi.map.MapView;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.system.InputMethodUtil;
+import com.core.app.MyApplication;
+import com.core.base.OABaseActivity;
+import com.core.utils.BaiduMapUtil;
+import com.core.widget.RecycleViewDivider;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
+import com.core.widget.view.model.SelectAimModel;
+import com.lidroid.xutils.ViewUtils;
+import com.uas.appworks.CRM.erp.adapter.SelectAimAdapter;
+import com.uas.appworks.CRM.erp.imp.ISelectAim;
+import com.uas.appworks.CRM.erp.presenter.SelectAimPresenter;
+import com.uas.appworks.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/*选择拜访目的地*/
+public class SelectAimActivity extends OABaseActivity implements ISelectAim {
+
+//    @ViewInject(R.id.search_edit)
+    private VoiceSearchView voiceSearchView;
+    private MapView mapView;
+    private RecyclerView listview;
+    private SelectAimAdapter adapter;
+    private SelectAimPresenter presenter;
+
+    private String lastInput = "";
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_aim);
+        ViewUtils.inject(this);
+        initView();
+        initEvent();
+        initData();
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        int type = 0;
+        if (intent != null) {
+            type = intent.getIntExtra("type", 0);
+            String title = intent.getStringExtra("title");
+            if (!StringUtil.isEmpty(title))
+                getSupportActionBar().setTitle(title);
+        }
+        presenter = new SelectAimPresenter(this);
+        presenter.start(type);
+    }
+
+    private void initEvent() {
+        voiceSearchView.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable s) {
+                String input = s.toString();
+                input = input.replaceAll(" ", "").replaceAll("\n", "");
+                if (lastInput.equals(input)) return;
+                lastInput = input;
+                presenter.seachByKey(input);
+            }
+        });
+//        search_edit.addTextChangedListener(new EditChangeListener() {
+//            @Override
+//            public void afterTextChanged(Editable editable) {
+//                String input = editable.toString();
+//                input = input.replaceAll(" ", "").replaceAll("\n", "");
+//                if (lastInput.equals(input)) return;
+//                lastInput = input;
+//                presenter.seachByKey(input);
+//            }
+//        });
+        adapter.setOnitemClickListener(new SelectAimAdapter.OnitemClickListener() {
+            @Override
+            public void click(SelectAimModel model) {
+                if (model.getType() == 1) return;
+                Intent intent = new Intent();
+                intent.putExtra("data", model);
+                setResult(0x20, intent);
+                finish();
+            }
+        });
+
+        listview.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
+                    InputMethodUtil.hideInput(ct, voiceSearchView.getSearch_edit());
+                }
+            }
+
+        });
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle(R.string.activity_select_aims);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        mapView = (MapView) findViewById(R.id.mapView);
+        listview = (RecyclerView) findViewById(R.id.listview);
+
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, MyApplication.getInstance().getBdLocationHelper().getLocation());
+        listview.setLayoutManager(new LinearLayoutManager(this));
+        RecycleViewDivider viewDivider = new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light));
+        adapter = new SelectAimAdapter();
+        listview.addItemDecoration(viewDivider);
+        listview.setAdapter(adapter);
+    }
+
+
+    //唯一
+    @Override
+    public synchronized void showModel(List<SelectAimModel> models) {
+        if (!TextUtils.isEmpty(voiceSearchView.getSearch_edit().getText())) {
+            mapView.setVisibility(View.GONE);
+        } else mapView.setVisibility(View.VISIBLE);
+        if (ListUtils.isEmpty(models)) {
+            models = new ArrayList<>();
+            SelectAimModel model = new SelectAimModel();
+            model.setType(1);
+            models.add(model);
+        } else if (models.size() > 1) {
+            for (int i = 0; i < models.size(); i++) {
+                if (models.get(i).getType() == 1) {
+                    models.remove(i);
+                    i--;
+                }
+            }
+        }
+        adapter.setModels(models);
+        adapter.notifyDataSetChanged();
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/AddBusinessAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/AddBusinessAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter.oa;
+package com.uas.appworks.CRM.erp.adapter;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -17,7 +17,7 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.widget.listener.EditChangeListener;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
-import com.xzjmyk.pm.activity.R;
+import com.uas.appworks.R;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/HListViewOneAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/HListViewOneAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.uas.appworks.CRM.erp.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,8 +14,8 @@ import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.utils.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/SelectAimAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/SelectAimAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter.oa;
+package com.uas.appworks.CRM.erp.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -7,12 +7,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.utils.BaiduMapUtil;
 import com.core.widget.view.model.SelectAimModel;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.uas.appworks.R;
 
 import java.text.DecimalFormat;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/StickyListAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/StickyListAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.uas.appworks.CRM.erp.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,12 +7,12 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersAdapter;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.list.SimpleData;
+import com.uas.appworks.CRM.erp.model.SimpleData;
+import com.uas.appworks.R;
 
 import java.util.List;
 
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 
 /**
@@ -23,7 +23,7 @@ public class StickyListAdapter extends BaseAdapter implements StickyListHeadersA
     private List<SimpleData> simpleDatas;
     private LayoutInflater inflater;
 
-    public StickyListAdapter(Context context,List<SimpleData> datas) {
+    public StickyListAdapter(Context context, List<SimpleData> datas) {
         inflater = LayoutInflater.from(context);
         this.simpleDatas=datas;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/ISelectAim.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/imp/ISelectAim.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
+package com.uas.appworks.CRM.erp.imp;
 
 import com.core.base.HttpImp;
 import com.core.widget.view.model.SelectAimModel;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/model/Business.java

@@ -0,0 +1,142 @@
+package com.uas.appworks.CRM.erp.model;
+
+/**
+ * Created by Arisono on 2016/6/24.
+ */
+public class Business {
+    /*商机编号： XXXX
+    商机名称： XXX
+    负责人：    XXXX
+    线索来源： XXXX
+    联系方式： XXXX
+    备注：        XXXX*/
+    private int bc_id;
+    private String code;
+    private String num;
+    private String steps;
+    private String name;
+    private String leader;
+    private String source;
+    private String phone;
+    private String note;
+    private String date;
+    private String currentprocess;//商机阶段
+    private int type;//抢，分配
+    public boolean isChecked;
+
+
+    private final int BUSINESS_QIANG = 1;
+    private final int BUSINESS_FENPEI = 2;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLeader() {
+        return leader;
+    }
+
+    public void setLeader(String leader) {
+        this.leader = leader;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getBUSINESS_QIANG() {
+        return BUSINESS_QIANG;
+    }
+
+    public int getBUSINESS_FENPEI() {
+        return BUSINESS_FENPEI;
+    }
+
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    public void setIsChecked(boolean isChecked) {
+        this.isChecked = isChecked;
+    }
+
+    public int getBc_id() {
+        return bc_id;
+    }
+
+    public void setBc_id(int bc_id) {
+        this.bc_id = bc_id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSteps() {
+        return steps;
+    }
+
+    public void setSteps(String steps) {
+        this.steps = steps;
+    }
+
+    public String getCurrentprocess() {
+        return currentprocess;
+    }
+
+    public void setCurrentprocess(String currentprocess) {
+        this.currentprocess = currentprocess;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/list/SimpleData.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/model/SimpleData.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model.list;
+package com.uas.appworks.CRM.erp.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/SelectAimPresenter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.presenter;
+package com.uas.appworks.CRM.erp.presenter;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -10,22 +10,22 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.baidu.mapapi.search.core.SearchResult;
 import com.baidu.mapapi.search.poi.PoiResult;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.widget.view.model.SelectAimModel;
-import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
+import com.core.utils.BaiduMapUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
+import com.core.widget.view.model.SelectAimModel;
+import com.uas.appworks.CRM.erp.imp.ISelectAim;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/FunnelView.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/view/FunnelView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view;
+package com.uas.appworks.CRM.erp.view;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;