Browse Source

2016/9/22 end

Bitliker 9 years ago
parent
commit
aad7b4879b

+ 1 - 1
WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 1 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -8,10 +8,8 @@ import com.baidu.location.BDLocation;
 import com.baidu.location.BDLocationListener;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
-import com.baidu.location.LocationClientOption.LocationMode;
 import com.baidu.location.Poi;
 import com.xzjmyk.pm.activity.sp.LocationSp;
-import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.util.List;
 
@@ -58,8 +56,6 @@ public class BdLocationHelper {
         option.setNeedDeviceDirect(false);
         mLocationClient.setLocOption(option);
         requestLocation();//重新定位
-
-
     }
 
 
@@ -100,7 +96,7 @@ public class BdLocationHelper {
                 }
                 return;
             }
-
+            Log.i("gongpengming", "进来的");
             // 百度定位成功
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();

+ 7 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectListBean.java

@@ -3,15 +3,13 @@ package com.xzjmyk.pm.activity.bean.oa;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.baidu.cyberplayer.utils.T;
-
 /**
  * Created by pengminggong on 2016/9/20.
  */
 public class SelectListBean implements Parcelable {
     private String name;
     private boolean isClick = false;
-    private T t;
+    private String object;
 
     public SelectListBean() {
     }
@@ -32,23 +30,25 @@ public class SelectListBean implements Parcelable {
         isClick = click;
     }
 
-    public T getT() {
-        return t;
+    public String getObject() {
+        return object;
     }
 
-    public void setT(T t) {
-        this.t = t;
+    public void setObject(String object) {
+        this.object = object;
     }
 
     protected SelectListBean(Parcel in) {
         name = in.readString();
         isClick = in.readByte() != 0;
+        object = in.readString();
     }
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(name);
         dest.writeByte((byte) (isClick ? 1 : 0));
+        dest.writeString(object);
     }
 
     @Override

+ 7 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -893,7 +893,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (JSON.parseObject(message).get("datas") instanceof JSONObject) {
                         root = JSON.parseObject(message).getJSONObject("datas");
                         custs = root.getJSONArray("cusdatas");
-                        if (custs != null || custs.size() > 0) {
+                        if (custs != null && custs.size() > 0) {
                             tv_customer_name.setText(getValues(custs.getJSONArray(0), 0));
                             String time = getValues(custs.getJSONArray(0), 1);
                             tv_customer_lastTime.setText(time);
@@ -902,9 +902,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 int i = (int) ((System.currentTimeMillis() - TimeUtils.s_str_2_long(time)) / (60 * 1000 * 24 * 60));
                                 tv_customer_days.setText("距离上次跟进" + i + "天");
                             }
+                            ll_data_empty1.setVisibility(View.GONE);
+                            ll_customer_lost.setVisibility(View.VISIBLE);
+                        } else {
+                            //无数据处理
+                            ll_customer_lost.setVisibility(View.GONE);
+                            ll_data_empty1.setVisibility(View.VISIBLE);
                         }
-                        ll_data_empty1.setVisibility(View.GONE);
-                        ll_customer_lost.setVisibility(View.VISIBLE);
                     } else {
                         //无数据处理
                         ll_customer_lost.setVisibility(View.GONE);

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SubsActivity.java

@@ -30,7 +30,6 @@ public class SubsActivity extends BaseActivity {
     private int type = -1;
 
     @Override
-
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subs);

+ 11 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -16,7 +16,9 @@ import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.SelectListBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -384,13 +386,11 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 showNoticeDialog();
                 break;
             case R.id.tv_priority:
-//                Intent data = new Intent(ct, SelectListActivity.class);
-//                String[] str = new String[]{"特急",
-//                        "紧急", "一般", "不紧急"};
-//                data.putExtra("data", str);
-//                data.putExtra("type", 1);
-//                startActivityForResult(data, 0x20);
-                showPriorityDialog(tv_priority, 0x11);
+                Intent data = new Intent(ct, SelectListActivity.class);
+                data.putExtra("type", SelectListActivity.ADD_TASK_PRIORITY);
+                data.putExtra("title", "紧急程度");
+                startActivityForResult(data, 0x22);
+//                showPriorityDialog(tv_priority, 0x11);
                 break;
             case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
@@ -432,15 +432,17 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x11) {
             ArrayList<Employees> list = data.getParcelableArrayListExtra("data");
-            Log.i("gongpengming", "onActivityResult");
             if (ListUtils.isEmpty(list)) return;
-            Log.i("gongpengming", "部位0");
             StringBuilder str = new StringBuilder();
             for (Employees e : list) {
                 str.append("," + e.getEm_name());
             }
             str.delete(0, 1);
             tv_executive.setText(str.toString());
+        } else if (requestCode == 0x22 && resultCode == 0x20) {
+            SelectListBean b = data.getParcelableExtra("data");
+            if (b == null) return;
+            tv_priority.setText(com.xzjmyk.pm.activity.util.StringUtils.isEmpty(b.getName()) ? "" : b.getName());
         }
     }
 }

+ 46 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -19,10 +19,13 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.OABean;
+import com.xzjmyk.pm.activity.bean.oa.SelectListBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectListActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
@@ -94,9 +97,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         tv_date_start.setKeyListener(null);
         tv_date_end.setKeyListener(null);
         tv_customer_login.setOnClickListener(this);
-
         tv_visit_steps.setKeyListener(null);
+        tv_relate_business.setKeyListener(null);
         tv_visit_steps.setOnClickListener(this);
+        tv_relate_business.setOnClickListener(this);
+
     }
 
     private void initData() {
@@ -243,16 +248,16 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             CommonUtil.getNoMarkEditText(tv_customer_login) +
                             "\",\n" +
                             "\"vr_cucontact\":\"" +
-                            CommonUtil.getNoMarkEditText(tv_linksman_login)+
+                            CommonUtil.getNoMarkEditText(tv_linksman_login) +
                             "\",\n" +
                             "\"vr_title\":\"" +
                             CommonUtil.getNoMarkEditText(tv_visit_theme) +//主题
                             "\",\n" +
                             "\"vr_nichestep\":\"" +
-                            CommonUtil.getNoMarkEditText(tv_visit_steps)+
+                            CommonUtil.getNoMarkEditText(tv_visit_steps) +
                             "\",\n" +
                             "\"vr_detail\":\"" +
-                            CommonUtil.getNoMarkEditText(tv_visit_content)+
+                            CommonUtil.getNoMarkEditText(tv_visit_content) +
                             "\",\n" +
                             "\"vr_recorddate\":\"" +
                             DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
@@ -312,11 +317,46 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 });
                 break;
             case R.id.tv_customer_login:
-                loadCustomer(3);
+                Intent data = new Intent(ct, SelectListActivity.class);
+                data.putExtra("type", SelectListActivity.VISIT_REPORT_PLAN_CLIENT);
+                data.putExtra("title", "客户列表");
+                startActivityForResult(data, 0x22);
+//                loadCustomer(3);
                 break;
             case R.id.tv_visit_steps:
-                loadJieDuan();
+                Intent data2 = new Intent(ct, SelectListActivity.class);
+                data2.putExtra("type", SelectListActivity.VISIT_JIE_DUAN);
+                data2.putExtra("title", "当前阶段");
+                startActivityForResult(data2, 0x23);
+//                loadJieDuan();
                 break;
+            case R.id.tv_relate_business:
+                Intent data3 = new Intent(ct, SelectListActivity.class);
+                data3.putExtra("type", SelectListActivity.VISIT_JIE_DUAN);
+                data3.putExtra("title", "当前阶段");
+                startActivityForResult(data3, 0x24);
+//                loadJieDuan();
+                break;
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        if (requestCode == 0x22 && resultCode == 0x20) {
+            SelectListBean b = data.getParcelableExtra("data");
+            if (b == null || StringUtils.isEmpty(b.getObject())) return;
+            JsonValidator validator = new JsonValidator();
+            if (validator.validate(b.getObject())) {
+                com.alibaba.fastjson.JSONObject object = JSON.parseObject(b.getObject());
+                tv_customer_login.setText(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : " ");
+                tv_linksman_login.setText(object.containsKey("CU_CONTACT") ? object.getString("CU_CONTACT") : " ");
+                tv_address_login.setText(object.containsKey("CU_ADD1") ? object.getString("CU_ADD1") : " ");
+            }
+        } else if (requestCode == 0x23 && resultCode == 0x20) {
+            SelectListBean b = data.getParcelableExtra("data");
+            if (b == null || StringUtils.isEmpty(b.getObject())) return;
+            tv_visit_steps.setText(b.getName());
         }
     }
 

+ 42 - 23
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -13,23 +13,25 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.SelectListBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectListActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -64,17 +66,34 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     private int mVpId;
     private static final String TAG = "VisitReportPlanActivity";
 
-    private String mCustomerName,mContactName,mCustomerAddress;
+    private String mCustomerName, mContactName, mCustomerAddress;
 
 //    @ViewInject(R.id.tv_visit_login)
 //    private FormEditText tv_visit_login;
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data==null) return;
+        if (requestCode == 0x22 && resultCode == 0x20) {
+            SelectListBean b = data.getParcelableExtra("data");
+            if (b == null || StringUtils.isEmpty(b.getObject())) return;
+            JsonValidator validator = new JsonValidator();
+            if (validator.validate(b.getObject())) {
+                JSONObject object = JSON.parseObject(b.getObject());
+                tv_customer_login.setText(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : " ");
+                tv_linksman_login.setText(object.containsKey("CU_CONTACT") ? object.getString("CU_CONTACT") : " ");
+                tv_address_login.setText(object.containsKey("CU_ADD1") ? object.getString("CU_ADD1") : " ");
+            }
+        }
+
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_visit_report_plan);
         Intent intent = getIntent();
-        if (intent != null){
+        if (intent != null) {
             mCustomerName = intent.getStringExtra("customer_name");
             mContactName = intent.getStringExtra("contact_name");
             mCustomerAddress = intent.getStringExtra("customer_address");
@@ -101,22 +120,22 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         tv_address_refresh.setOnClickListener(this);
         tv_customer_login.setOnClickListener(this);
 
-        if (!TextUtils.isEmpty(mCustomerName)){
+        if (!TextUtils.isEmpty(mCustomerName)) {
             tv_customer_login.setText(mCustomerName);
         }
-        if (!TextUtils.isEmpty(mContactName)){
+        if (!TextUtils.isEmpty(mContactName)) {
             tv_linksman_login.setText(mContactName);
         }
-        if (!TextUtils.isEmpty(mCustomerAddress)){
+        if (!TextUtils.isEmpty(mCustomerAddress)) {
             tv_address_login.setText(mCustomerAddress);
-        }else {
-           // tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+        } else {
+            // tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         }
     }
 
 
     private void initData() {
-        CommonUtil.getCommonId(this,"VISITPLAN_SEQ",mHandler,GET_VP_ID);
+        CommonUtil.getCommonId(this, "VISITPLAN_SEQ", mHandler, GET_VP_ID);
         getCodeByNet();
     }
 
@@ -154,7 +173,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                         public void run() {
                             endActivity();
                         }
-                    },3000);
+                    }, 3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -183,14 +202,11 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     break;
                 case GET_VP_ID:
                     String resultStr = msg.getData().getString("result");
-                    try {
-                        JSONObject resultJsonObject = new JSONObject(resultStr);
-                        if (resultJsonObject != null && resultJsonObject.getBoolean("success")){
-                            mVpId = resultJsonObject.getInt("id");
-                        }
-                    } catch (JSONException e) {
-                        e.printStackTrace();
+                    JSONObject resultJsonObject = JSON.parseObject(resultStr);
+                    if (resultJsonObject != null && resultJsonObject.getBoolean("success")) {
+                        mVpId = resultJsonObject.getInteger("id");
                     }
+
                     break;
             }
         }
@@ -249,7 +265,6 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
             return;
         }
         progressDialog.show();
-
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/saveVisitPlan.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
@@ -277,7 +292,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
-                Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00" );
+                Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
                 switch (tv.getId()) {
                     case R.id.tv_date_select:
                         tv_date_select.setText(year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
@@ -310,7 +325,11 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                 break;
             case R.id.tv_customer_login:
                 //弹框
-                loadCustomer(3);
+                Intent data = new Intent(ct, SelectListActivity.class);
+                data.putExtra("type", SelectListActivity.VISIT_REPORT_PLAN_CLIENT);
+                data.putExtra("title", "客户列表");
+                startActivityForResult(data, 0x22);
+//                loadCustomer(3);
                 break;
         }
     }

+ 159 - 12
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectListActivity.java

@@ -2,7 +2,8 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
+import android.os.Handler;
+import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -14,14 +15,23 @@ import android.widget.CheckBox;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectListBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -32,10 +42,79 @@ public class SelectListActivity extends BaseActivity {
     private List<SelectListBean> data = null;
 
     public static final int ADD_MEET_YAG_TYPE = 0x11;//添加会议--标签
+    public static final int ADD_TASK_PRIORITY = 0x12;//添加任务--紧急
+    public static final int VISIT_REPORT_PLAN_CLIENT = 0x13;//拜访计划客户列表
+    public static final int VISIT_JIE_DUAN = 0x14;//拜访计划客户列表
+    public static final int VISIT_NICHECODES = 0x15;//拜访计划客户列表
 
     private boolean isSingle = true;//是否单选
     private int type = -1;
     private String title;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (progressDialog.isShowing()) {
+                progressDialog.dismiss();
+            }
+            String message = null;
+            JSONObject object = null;
+            JSONArray array = null;
+            SelectListBean b = null;
+            switch (msg.what) {
+                case VISIT_REPORT_PLAN_CLIENT:
+                    message = msg.getData().getString("result");
+                    if (!JSON.parseObject(message).containsKey("customers")) return;
+                    array = JSON.parseObject(message).getJSONArray("customers");
+                    if (data == null) data = new ArrayList<>();
+                    else data.clear();
+                    for (int i = 0; i < array.size(); i++) {
+                        object = array.getJSONObject(i);
+                        b = new SelectListBean();
+                        b.setName(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : "空");
+                        b.setObject(object.toString());
+                        data.add(b);
+                    }
+                    adapter.notifyDataSetChanged();
+                    break;
+                case VISIT_JIE_DUAN:
+                    message = msg.getData().getString("result");
+                    if (JSON.parseObject(message) != null ||
+                            JSON.parseObject(message).containsKey("success") || JSON.parseObject(message).getBoolean("success")
+                            && JSON.parseObject(message).containsKey("stages")) {
+                        array = JSON.parseObject(message).getJSONArray("stages");
+                        if (data == null) data = new ArrayList<>();
+                        else data.clear();
+                        for (int i = 0; i < array.size(); i++) {
+                            object = array.getJSONObject(i);
+                            b = new SelectListBean();
+                            b.setName(object.containsKey("BS_NAME") ? object.getString("BS_NAME") : "空");
+                            b.setObject(object.toString());
+                            data.add(b);
+                        }
+                        adapter.notifyDataSetChanged();
+                    }
+                    break;
+                case VISIT_NICHECODES:
+                    message = msg.getData().getString("result");
+                    if (JSON.parseObject(message) != null ||
+                            JSON.parseObject(message).containsKey("success") || JSON.parseObject(message).getBoolean("success")
+                            && JSON.parseObject(message).containsKey("stages")) {
+                        array = JSON.parseObject(message).getJSONArray("businesschance");
+                        if (data == null) data = new ArrayList<>();
+                        else data.clear();
+                        for (int i = 0; i < array.size(); i++) {
+                            object = array.getJSONObject(i);
+                            b = new SelectListBean();
+                            b.setName(object.containsKey("name") ? object.getString("name") : "空");
+                            b.setObject(object.toString());
+                            data.add(b);
+                        }
+                        adapter.notifyDataSetChanged();
+                    }
+                    break;
+            }
+        }
+    };
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -58,7 +137,7 @@ public class SelectListActivity extends BaseActivity {
         initIntent();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_select_list);
-        getSupportActionBar().setTitle( StringUtils.isEmpty(title)?"选择":title);
+        getSupportActionBar().setTitle(StringUtils.isEmpty(title) ? "选择" : title);
         init();
         initData();
         initEvent();
@@ -67,16 +146,11 @@ public class SelectListActivity extends BaseActivity {
     private void initIntent() {
         Intent intent = getIntent();
         if (intent == null) return;
-        int action = intent.getIntExtra("action", -1);
+        int action = intent.getIntExtra("type", -1);
         setActionTheme(action);
         isSingle = intent.getBooleanExtra("single", true);
         type = intent.getIntExtra("type", -1);
         title = intent.getStringExtra("title");
-//        if (StringUtils.isEmpty(title)) {
-//            Log.i("gongpengming", "空的 ");
-//            title = "选择";
-//        }
-//        getSupportActionBar().setTitle( title);
     }
 
     /*根据链过来的参数设置该界面actionbar的样式货颜色*/
@@ -84,14 +158,26 @@ public class SelectListActivity extends BaseActivity {
         if (action == -1) return;
         int theme = 0;
         switch (action) {
-            case 0x1:
+            case ADD_MEET_YAG_TYPE:
                 theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", R.style.OAThemeMeet);
                 break;
+            case ADD_TASK_PRIORITY:
+                break;
+            case VISIT_REPORT_PLAN_CLIENT:
+                theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", R.style.CrmThemeTask);
+                break;
+            case VISIT_JIE_DUAN:
+                theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", R.style.CrmThemeTask);
+                break;
+            case VISIT_NICHECODES:
+                theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", R.style.CrmThemeTask);
+                break;
             default:
                 theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", R.style.OAThemeSignin);
                 break;
         }
-        setTheme(theme);
+        if (theme != 0)
+            setTheme(theme);
     }
 
     private void init() {
@@ -106,11 +192,24 @@ public class SelectListActivity extends BaseActivity {
             case ADD_MEET_YAG_TYPE:
                 setMeetTagData();
                 break;
+            case ADD_TASK_PRIORITY:
+                setTaskTagData();
+                break;
+            case VISIT_REPORT_PLAN_CLIENT:
+                setVisitClientData();
+                break;
+            case VISIT_JIE_DUAN:
+                loadJieDuan();
+                break;
+            case VISIT_NICHECODES:
+                nichecodes();
+                break;
         }
         if (!ListUtils.isEmpty(data))
             adapter.notifyDataSetChanged();
     }
 
+
     private void initEvent() {
         recycler.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -118,7 +217,6 @@ public class SelectListActivity extends BaseActivity {
                 if (isSingle) {
                     Intent intent = new Intent();
                     intent.putExtra("data", data.get(i));
-                    Log.i("gongpengming", data.get(i).getName());
                     setResult(0x20, intent);
                     finish();
                 } else {
@@ -130,6 +228,54 @@ public class SelectListActivity extends BaseActivity {
     }
 
 
+    public void nichecodes() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getnichecodes.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("cu_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        params.put("page", 1);
+        params.put("pageSize", 100);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, handler, headers, VISIT_NICHECODES, null, null, "post");
+    }
+
+    /**
+     * @desc:加载阶段
+     * @author:Arison on 2016/7/20
+     */
+    public void loadJieDuan() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceStage.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("condition", "1=1");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, handler, headers, VISIT_JIE_DUAN, null, null, "post");
+    }
+
+    /*获取拜访计划客户列表*/
+    private void setVisitClientData() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getCustomerbySeller.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("sellercode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, handler, headers, VISIT_REPORT_PLAN_CLIENT, null, null, "post");
+    }
+
+    //获取会议标签数据
+    private void setTaskTagData() {
+        String[] str = new String[]{"特急", "紧急", "一般", "不紧急"};
+        SelectListBean b;
+        for (String e : str) {
+            b = new SelectListBean();
+            b.setName(e);
+            data.add(b);
+        }
+    }
+
     //获取会议标签数据
     private void setMeetTagData() {
         String[] cities = {"培训会议", "动员大会", "部门会议", "周例会", "月度总结会议", "管理层会议"};
@@ -172,10 +318,11 @@ public class SelectListActivity extends BaseActivity {
                 holer = new ViewHoler();
                 holer.select_scb = (CheckBox) view.findViewById(R.id.select_scb);
                 holer.name_tv = (TextView) view.findViewById(R.id.name_tv);
+                view.setTag(holer);
             } else {
                 holer = (ViewHoler) view.getTag();
             }
-            holer.name_tv.setText(data.get(i).getName());
+            holer.name_tv.setText(StringUtils.isEmpty(data.get(i).getName()) ? "" : data.get(i).getName());
             holer.select_scb.setChecked(data.get(i).isClick());
             holer.select_scb.setFocusable(false);
             holer.select_scb.setClickable(false);