CRM_客户模块迁移完成

WeiChat/src/main/AndroidManifest.xml

@@ -590,12 +590,7 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.erp.activity.crm.CustomerDetailActivity"
-            android:theme="@style/CrmThemeCustomer" />
-        <activity
-            android:name=".ui.erp.activity.crm.CustomerListActivity"
-            android:theme="@style/CrmThemeCustomer" />
+
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/crmmain_wall_of_fame"
@@ -620,10 +615,6 @@
             android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
 
-        <activity
-            android:name=".ui.erp.activity.crm.CustomerListSelectActivity"
-            android:theme="@style/CrmThemeCustomer" />
-
         <!--
             <activity
             android:name=".ui.erp.activity.oa.AddDailyActivity"
@@ -655,11 +646,6 @@
             android:name=".ui.erp.activity.crm.ContactManAddActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        =
-        <activity
-            android:name=".ui.erp.activity.oa.UserSelectActivity"
-            android:label="@string/select_user" />
-
 
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
@@ -725,9 +711,7 @@
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
 
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.ChangeMobileActivity"
-            android:label="@string/change_mobile" />
+
         <activity
             android:name="com.umeng.socialize.editorpage.ShareActivity"
             android:excludeFromRecents="true"
@@ -843,9 +827,7 @@
         <!-- 百度推送相关结束 -->
 
 
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.MissionSetActivity"
-            android:label="@string/activity_mission_set" />
+
         <activity
             android:name=".ui.erp.activity.oa.DestinationActivity"
             android:label="@string/activity_select_aims" />
@@ -857,9 +839,6 @@
             android:enabled="true"
             android:exported="true" />
 
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.MissionActivity"
-            android:label="@string/activity_mission_plan" />
         <activity android:name=".ui.me.SpeechrecognitionActivity" />
         <activity android:name=".ui.erp.activity.oa.ErpActivity" />
         <activity
@@ -879,33 +858,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.FlightsActivity"
-            android:label="@string/activity_flights" />
 
-        <!-- 打卡2.0模块 -->
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity"
-            android:label="@string/office_addr_setting" />
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity"
-            android:label="@string/super_setting" />
-
-        <activity android:name="com.uas.appworks.OA.erp.activity.AddFlihtsActivity" />
         <activity
             android:name=".ui.erp.activity.oa.FlihtsTimeActivity"
             android:label="@string/work_time_setting" />
         <activity
             android:name=".ui.erp.activity.oa.FlightsDateActivity"
             android:label="@string/work_day_setting" />
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.MyRuleSetActivity"
-            android:label="@string/my_rule_setting" />
-        android:name="com.me.appworks.OA.erp.activity.HolidaysActivity"
-        android:label="@string/holidays"/>
-        <activity
-            android:name="com.uas.appworks.OA.erp.activity.StatisticsActivity"
-            android:label="@string/work_statistics" />
+
         <activity
             android:name=".ui.erp.activity.oa.SelectDepartmentActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -978,14 +938,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.oa.NavigationActivity"
-            android:label="@string/navigation">
-            <intent-filter>
-                <action android:name="com.modular.appworks.NavigationActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+
         <!-- 计步功能 服务 -->
         <service
             android:name="com.uas.appme.pedometer.service.StepService"

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

@@ -52,6 +52,7 @@ 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.uas.appworks.CRM.erp.activity.CustomerListActivity;
 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;

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

@@ -24,6 +24,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.model.Employees;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
@@ -33,9 +34,8 @@ import com.core.utils.time.wheel.OptionPicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.activity.UserSelectActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-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/oa/OAActivity.java

@@ -44,6 +44,7 @@ import com.core.app.AppConfig;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.model.Employees;
 import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
@@ -58,6 +59,7 @@ 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.UserSelectActivity;
 import com.uas.appworks.OA.erp.activity.AddMeetingActivity;
 import com.uas.appworks.OA.erp.activity.DetailTaskActivity;
 import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
@@ -74,7 +76,6 @@ 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.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/OAMainActivity.java

@@ -30,6 +30,7 @@ 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.UserSelectActivity;
 import com.uas.appworks.OA.erp.activity.MeetingActivity;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;

app_modular/appworks/src/main/AndroidManifest.xml

@@ -40,7 +40,7 @@
             android:label="@string/sign_teams_rank" />
 
         <activity
-            android:name="com.uas.appworks.OA.erp.MeetDetailsActivity"
+            android:name="com.uas.appworks.OA.erp.activity.MeetDetailsActivity"
             android:label="@string/meet_detail"
             android:theme="@style/OAThemeMeet" />
         <activity
@@ -107,5 +107,50 @@
             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" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.CustomerDetailActivity"
+            android:theme="@style/CrmThemeCustomer" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.CustomerListActivity"
+            android:theme="@style/CrmThemeCustomer" />
+
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.CustomerListSelectActivity"
+            android:theme="@style/CrmThemeCustomer" />
+        <activity
+            android:name="com.uas.appworks.CRM.erp.activity.UserSelectActivity"
+            android:label="@string/select_user" />
+
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.FlightsActivity"
+            android:label="@string/activity_flights" />
+
+        <!-- 打卡2.0模块 -->
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity"
+            android:label="@string/office_addr_setting" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity"
+            android:label="@string/super_setting" />
+
+        <activity android:name="com.uas.appworks.OA.erp.activity.AddFlihtsActivity" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.MyRuleSetActivity"
+            android:label="@string/my_rule_setting" />
+        <activity android:name="com.uas.appworks.OA.erp.activity.HolidaysActivity"
+            android:label="@string/holidays"/>
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.StatisticsActivity"
+            android:label="@string/work_statistics" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.ChangeMobileActivity"
+            android:label="@string/change_mobile" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.MissionSetActivity"
+            android:label="@string/activity_mission_set" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.MissionActivity"
+            android:label="@string/activity_mission_plan" />
+
     </application>
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerDetailActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerDetailActivity.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;
@@ -25,15 +25,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.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.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,56 +45,27 @@ import java.util.Map;
  * @return:
  */
 public class CustomerDetailActivity extends BaseActivity {
-    @ViewInject(R.id.tv_company_name)
     private TextView tv_company_name;
-    @ViewInject(R.id.tv_leader)
     private TextView tv_leader;
-    @ViewInject(R.id.tv_state)
     private TextView tv_state;
-    @ViewInject(R.id.tv_lastDate)
     private TextView tv_lastDate;
-    @ViewInject(R.id.tv_address)
     private TextView tv_address;
-    //    @ViewInject(R.id.tv_receiveTime)
-//    private TextView tv_receiveTime;
-    @ViewInject(R.id.tv_source)
     private TextView tv_source;
-    @ViewInject(R.id.tv_industry)
     private TextView tv_industry;
-    @ViewInject(R.id.tv_type)
     private TextView tv_type;
-    @ViewInject(R.id.steps_lv)
     private MyListView steps_lv;
-    @ViewInject(R.id.tv_diqu)
     private TextView tv_diqu;
-    @ViewInject(R.id.tv_zhihzhao)
     private TextView tv_zhihzhao;
-    //    @ViewInject(R.id.tv_tel)
-//    private TextView tv_tel;
-    @ViewInject(R.id.tv_email)
     private TextView tv_email;
-    @ViewInject(R.id.tv_name)
     private TextView tv_name;
-    @ViewInject(R.id.tv_position)
     private TextView tv_position;
-    @ViewInject(R.id.tv_mobile)
     private TextView tv_mobile;
-
-
-    @ViewInject(R.id.tv_modifyRecord)
     private TextView tv_modifyRecord;
-    @ViewInject(R.id.tv_visitTimes)
     private TextView tv_visitTimes;
-
-    @ViewInject(R.id.tv_feilv)
     private TextView tv_feilv;
-    @ViewInject(R.id.tv_feiyonged)
     private TextView tv_feiyonged;
-    @ViewInject(R.id.stepsView)
     private StepsView mStepsView;
-    @ViewInject(R.id.customer_detail_add_plan)
     private Button mAddPlanBtn;
-    @ViewInject(R.id.tv_money_kind)
     private TextView tv_money_kind;
 
     private String falg;
@@ -117,7 +85,30 @@ public class CustomerDetailActivity extends BaseActivity {
     }
 
     private void initView() {
-        ViewUtils.inject(this);
+        tv_company_name = (TextView) findViewById(R.id.tv_company_name);
+        tv_money_kind = (TextView) findViewById(R.id.tv_money_kind);
+        mAddPlanBtn = (Button) findViewById(R.id.customer_detail_add_plan);
+        mStepsView = (StepsView) findViewById(R.id.stepsView);
+        tv_feiyonged = (TextView) findViewById(R.id.tv_feiyonged);
+        tv_feilv = (TextView) findViewById(R.id.tv_feilv);
+        tv_visitTimes = (TextView) findViewById(R.id.tv_visitTimes);
+        tv_modifyRecord = (TextView) findViewById(R.id.tv_modifyRecord);
+        tv_mobile = (TextView) findViewById(R.id.tv_mobile);
+        tv_position = (TextView) findViewById(R.id.tv_position);
+        tv_name = (TextView) findViewById(R.id.tv_name);
+        tv_email = (TextView) findViewById(R.id.tv_email);
+        tv_zhihzhao = (TextView) findViewById(R.id.tv_zhihzhao);
+        tv_diqu = (TextView) findViewById(R.id.tv_diqu);
+        steps_lv = (MyListView) findViewById(R.id.steps_lv);
+        tv_type = (TextView) findViewById(R.id.tv_type);
+        tv_industry = (TextView) findViewById(R.id.tv_industry);
+        tv_source = (TextView) findViewById(R.id.tv_source);
+        tv_address = (TextView) findViewById(R.id.tv_address);
+        tv_lastDate = (TextView) findViewById(R.id.tv_lastDate);
+        tv_state = (TextView) findViewById(R.id.tv_state);
+        tv_leader = (TextView) findViewById(R.id.tv_leader);
+
+
         ct = this;
         getSupportActionBar().setTitle("客户详情");
     }
@@ -151,13 +142,10 @@ public class CustomerDetailActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.add_item:
-                startActivity(new Intent(this, CustomerAddActivity.class));
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.add_item){
+            startActivity(new Intent(this, CustomerAddActivity.class));
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerListActivity.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;
@@ -34,17 +34,13 @@ 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.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 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.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.util.oa.CommonUtil;
+import com.uas.appworks.CRM.erp.model.Business;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -61,24 +57,14 @@ import java.util.Map;
 public class CustomerListActivity extends BaseActivity implements View.OnClickListener {
     private BussinessDetailAdapter mAdapter;
 
-    @ViewInject(R.id.iv_head)
     private ImageView iv_head;
-
-    @ViewInject(R.id.tv_change)
     private TextView tv_change;
-    @ViewInject(R.id.tv_count_unend)
     private TextView tv_count_unend;
-    @ViewInject(R.id.tv_count_end)
     private TextView tv_count_end;
-    @ViewInject(R.id.tv_count_total)
     private TextView tv_count_total;
-    @ViewInject(R.id.tv_name)
     private TextView tv_name;
-    @ViewInject(R.id.tv_department)
     private TextView tv_department;
-    @ViewInject(R.id.tv_position)
     private TextView tv_position;
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private Context ct;
@@ -95,14 +81,28 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_customer_list);
+        initIds();
         initView();
         initData();
         initListener();
     }
 
+    private void initIds(){
+
+        iv_head = (ImageView) findViewById(R.id.iv_head);
+        tv_change = (TextView) findViewById(R.id.tv_change);
+        tv_count_unend = (TextView) findViewById(R.id.tv_count_unend);
+        tv_count_end = (TextView) findViewById(R.id.tv_count_end);
+        tv_count_total = (TextView) findViewById(R.id.tv_count_total);
+        tv_name = (TextView) findViewById(R.id.tv_name);
+        tv_department = (TextView) findViewById(R.id.tv_department);
+        tv_position = (TextView) findViewById(R.id.tv_position);
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
+
+    }
+
     private void initView() {
         ct = this;
-        ViewUtils.inject(this);
         getSupportActionBar().setTitle(getString(R.string.crmmain_client));
 
         loadParams(3);
@@ -155,11 +155,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
 
     public void changeOnChange(View v) {
-        switch (v.getId()) {
-            case R.id.tv_change:
-                showPopupWindow(v);
-                break;
-        }
+       if (v.getId() == R.id.tv_change){
+           showPopupWindow(v);
+       }
     }
 
     private void initData() {
@@ -197,58 +195,49 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.crm_data_add:
-                if (falg == 0) {
-                    startActivity(new Intent(ct, CustomerAddActivity.class).putExtra("type", 1));//正式
-                } else {
-                    startActivity(new Intent(ct, CustomerAddActivity.class).putExtra("type", 0));//预录
-                }
-                break;
-            case R.id.crm_data_find:
-                startActivity(new Intent(ct, CustomerListSelectActivity.class));
-                break;
-
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.crm_data_add){
+            if (falg == 0) {
+                startActivity(new Intent(ct, CustomerAddActivity.class).putExtra("type", 1));//正式
+            } else {
+                startActivity(new Intent(ct, CustomerAddActivity.class).putExtra("type", 0));//预录
+            }
+        }else if (item.getItemId() == R.id.crm_data_find){
+            startActivity(new Intent(ct, CustomerListSelectActivity.class));
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tv_count_unend:
-                tv_count_total.setSelected(false);
-                tv_count_end.setSelected(false);
-                tv_count_unend.setSelected(true);
-                type = 0;
-                jsonArray.clear();
+        if (v.getId() == R.id.tv_count_unend){
+            tv_count_total.setSelected(false);
+            tv_count_end.setSelected(false);
+            tv_count_unend.setSelected(true);
+            type = 0;
+            jsonArray.clear();
 //                Crouton.makeText(this,"切换成功", 0xffff8888, 10000).show();
-                page = 1;
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-                break;
-            case R.id.tv_count_end:
-                tv_count_total.setSelected(false);
-                tv_count_end.setSelected(true);
-                tv_count_unend.setSelected(false);
-                type = 1;
-                page = 1;
-                jsonArray.clear();
+            page = 1;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
+        }else if (v.getId() == R.id.tv_count_end){
+            tv_count_total.setSelected(false);
+            tv_count_end.setSelected(true);
+            tv_count_unend.setSelected(false);
+            type = 1;
+            page = 1;
+            jsonArray.clear();
 //                Crouton.makeText(this,"切换成功", Style.CONFIRM).show();
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-                break;
-            case R.id.tv_count_total:
-                tv_count_total.setSelected(true);
-                tv_count_end.setSelected(false);
-                tv_count_unend.setSelected(false);
-                jsonArray.clear();
-                type = 2;
-                page = 1;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
+        }else if (v.getId() == R.id.tv_count_total){
+            tv_count_total.setSelected(true);
+            tv_count_end.setSelected(false);
+            tv_count_unend.setSelected(false);
+            jsonArray.clear();
+            type = 2;
+            page = 1;
 //                Crouton.makeText(this,"切换成功", Style.CONFIRM).show();
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-                break;
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListSelectActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerListSelectActivity.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;
@@ -26,16 +26,13 @@ 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.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.uas.appworks.CRM.erp.activity.CustomerAddActivity;
-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,9 +41,7 @@ import java.util.Map;
 
 public class CustomerListSelectActivity extends BaseActivity   {
 
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private Context ct;
@@ -64,7 +59,8 @@ public class CustomerListSelectActivity extends BaseActivity   {
 
     private void initView() {
         ct = this;
-        ViewUtils.inject(this);
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         getSupportActionBar().setTitle(getString(R.string.client_search));
         mEmptyLayout = new EmptyLayout(this,mlist.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -28,16 +28,14 @@ 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.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.core.model.Employees;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,9 +48,7 @@ import java.util.regex.Pattern;
 //参会人员添加界面
 public class UserSelectActivity 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 = false;
     private boolean isNet = false;
@@ -155,7 +151,8 @@ public class UserSelectActivity extends BaseActivity {
         }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meet_select);
-        ViewUtils.inject(this);
+        listview = (PullToRefreshListView) findViewById(R.id.listview);
+        search_edit = (ClearEditText) findViewById(R.id.search_edit);
         isSingle = getIntent().getBooleanExtra("single", false);
         //是否获取网络数据
         isNet = getIntent().getBooleanExtra("net", false);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/DetailTaskActivity.java

@@ -147,6 +147,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.act_task_detail);
         initIDs();
         initView();
         initData();
@@ -175,7 +176,6 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
     }
 
     public void initView() {
-        setContentView(R.layout.act_task_detail);
         ViewUtils.inject(this);
         ct = this;
         getSupportActionBar().setTitle(getString(R.string.taskdetail_title));

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/MeetDetailsActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetDetailsActivity.java

@@ -1,4 +1,4 @@
-package com.uas.appworks.OA.erp;
+package com.uas.appworks.OA.erp.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -26,8 +26,6 @@ import com.core.utils.ToastUtil;
 import com.core.widget.view.Activity.SearchLocationActivity;
 import com.core.widget.view.model.SearchPoiParam;
 import com.lidroid.xutils.ViewUtils;
-import com.uas.appworks.OA.erp.activity.AddMeetTaskActivity;
-import com.uas.appworks.OA.erp.activity.SaveMeetActivity;
 import com.uas.appworks.OA.erp.model.MeetEntity;
 import com.uas.appworks.OA.erp.model.MeetingDocBean;
 import com.uas.appworks.R;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetingActivity.java

@@ -29,7 +29,7 @@ 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.uas.appworks.OA.erp.MeetDetailsActivity;
+import com.uas.appworks.OA.erp.activity.MeetDetailsActivity;
 import com.uas.appworks.OA.erp.model.MeetEntity;
 import com.uas.appworks.R;
 

settings.gradle

@@ -1,5 +1,5 @@
 //主工程
-include ':WeiChat', ':uusport'
+include ':WeiChat'
 
 //核心模块
 include ':network'