Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.account;
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -17,6 +18,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 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.Constants;
@@ -93,9 +95,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             case R.id.login_btn:// 登陆
                 //TODO 登陆修改
 //                login();
-                String phoneNumber="18565605807";
-                String password="111111";
-                login_manage(phoneNumber, password);//登录管理平台
+                final String phoneNumber = "18565605807";
+                final String password = "111111";
+                login_manage(phoneNumber, password);
                 break;
         }
     }

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

@@ -53,6 +53,7 @@ public class BusinessDetailActivty extends BaseActivity {
 
     private String formCondition;
     private String gridCondition;
+    private int page=1;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,15 +68,17 @@ public class BusinessDetailActivty extends BaseActivity {
     }
 
     private void initListener() {
+        mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-
+                page=1;
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT,page);
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-
+                sendHttpResquest(Constants.HTTP_SUCCESS_INIT,++page);
             }
         });
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -92,7 +95,7 @@ public class BusinessDetailActivty extends BaseActivity {
     }
     int type;
     private void initData() {
-        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, 1);
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         Intent intent = getIntent();
          type = 0;
         if (intent != null) {
@@ -244,6 +247,8 @@ public class BusinessDetailActivty extends BaseActivity {
                             model.setType(type);
                             mData.add(model);
                         }
+                    }else{
+                        ToastMessage("数据加载完毕！");
                     }
 //                    "bc_tel":"",
 //                        "bc_code":"2016050004",
@@ -254,11 +259,13 @@ public class BusinessDetailActivty extends BaseActivity {
 //                        "bc_id":730
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);
+                    mlist.getRefreshableView().setSelection(mAdapter.getCount());
+                    mlist.onRefreshComplete();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-
+                    mlist.onRefreshComplete();
                     break;
             }
         }
@@ -271,6 +278,7 @@ public class BusinessDetailActivty extends BaseActivity {
         if (page==1)mData.clear();
         params.put("page", page);
         params.put("pageSize", 10);
+        
         params.put("caller","BusinessChance");
         params.put("condition", "1=1");
         LinkedHashMap<String , Object> headers=new LinkedHashMap<>();

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

@@ -50,8 +50,11 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -124,6 +127,15 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     @ViewInject(R.id.tv_cu_count)
     private TextView tv_cu_count;
+    
+    @ViewInject(R.id.ib_ranking_condition)
+    private ImageButton  ib_ranking_condition;
+    @ViewInject(R.id.ib_sale_condition)
+    private ImageButton ib_sale_condition;
+    @ViewInject(R.id.ib_index_condition)
+    private ImageButton ib_index_condition;
+    @ViewInject(R.id.ib_em_condition)
+    private ImageButton ib_em_condition;
 
     @ViewInject(R.id.crm_chart_bar)
     private BarChart mChart;
@@ -153,6 +165,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ib_business.setOnClickListener(this);
         ib_customer.setOnClickListener(this);
         ib_waller.setOnClickListener(this);
+        
+        ib_sale_condition.setOnClickListener(this);
+        ib_ranking_condition.setOnClickListener(this);
+        ib_index_condition.setOnClickListener(this);
+        ib_em_condition.setOnClickListener(this);
     }
 
     private void initData() {
@@ -295,7 +312,18 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             case R.id.ib_waller:
                 startActivity(new Intent(this, SalesRankingActivity.class));
                 break;
-
+            case R.id.ib_sale_condition:
+                showDateDialog(R.id.ib_sale_condition);
+                break;
+            case R.id.ib_index_condition:
+                showDateDialog(R.id.ib_index_condition);
+                break;
+            case  R.id.ib_ranking_condition:
+                showDateDialog(R.id.ib_ranking_condition);
+                break;
+            case R.id.ib_em_condition:
+                showDateDialog(R.id.ib_em_condition);
+                break;
         }
     }
 
@@ -510,6 +538,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
 
     private void sendHttpResquest() {
+        sendInactionCusts();
+        sendPersonalRank(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
+        sendSalesKit(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
+        sendTargets(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
+    }
+
+    private void sendInactionCusts() {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getInactionCusts.action";
         Map<String, Object> params = new HashMap<>();
@@ -519,27 +554,47 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_InactionCusts, null, null, "post");
+    }
 
-        url = Constants.getAppBaseUrl(ct) + "mobile/crm/getPersonalRank.action";
+    private void sendTargets(String date) {
+        progressDialog.show();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        String url;
+        Map<String, Object> params;
+        url = Constants.getAppBaseUrl(ct) + "mobile/crm/getTargets.action";
         params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        params.put("yearmonth", DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
-
-        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_PersonalRank, null, null, "post");
+        params.put("yearmonth", date);
+        params.put("page", "1");
+        params.put("pageSize", "10");
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_Targets, null, null, "post");
+    }
 
+    private void sendSalesKit(String date) {
+        progressDialog.show();
+        String url;
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        Map<String, Object> params;
         url = Constants.getAppBaseUrl(ct) + "mobile/crm/getSalesKit.action";
         params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        params.put("yearmonth", DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
+        params.put("yearmonth", date);
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_SalesKit, null, null, "post");
+    }
 
-        url = Constants.getAppBaseUrl(ct) + "mobile/crm/getTargets.action";
+    private void sendPersonalRank(String date) {
+        progressDialog.show();
+        LinkedHashMap<String, Object> headers =  new LinkedHashMap<>();;
+        String url;
+        Map<String, Object> params;
+        url = Constants.getAppBaseUrl(ct) + "mobile/crm/getPersonalRank.action";
         params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        params.put("yearmonth", DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
-        params.put("page", "1");
-        params.put("pageSize", "10");
-        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_Targets, null, null, "post");
+        params.put("yearmonth", date);
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_PersonalRank, null, null, "post");
     }
 
     //需要抽取的代码
@@ -642,5 +697,39 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         list.add(map);
         return list;
     }
+
+
+    private void showDateDialog(final int resId) {
+        DatePicker picker = new DatePicker(this,DatePicker.YEAR_MONTH);
+        picker.setRange(1950, 2030);
+        //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
+        picker.setSelectedItem(
+                Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1);
+        picker.setOnDatePickListener(new DatePicker.OnYearMonthPickListener() {
+            @Override
+            public void onDatePicked(String year, String month) {
+//                        ToastUtil.showToast(ct, year + "-" + month + "-" + day);
+                switch (resId) {
+                    case R.id.ib_ranking_condition://排名
+                        ToastUtil.showToast(ct, year + "-" + month );
+                        sendPersonalRank(year+month);
+                        break;
+                    case R.id.ib_index_condition://图表
+                        ToastUtil.showToast(ct, year + "-" + month );
+                        sendTargets(year+month);
+                        break;
+                    case R.id.ib_sale_condition://销售
+                        ToastUtil.showToast(ct, year + "-" + month );
+                        sendSalesKit(year+month);
+                        break;
+                    case R.id.ib_em_condition://下属
+                        sendTargets(year+month);
+                        break;
+                }
+            }
+        });
+        picker.show();
+    }
 }
 

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

@@ -304,6 +304,7 @@ public class CustomerListActivity extends BaseActivity {
         params.put("page", "1");
         params.put("pageSize", "10");
         params.put("type", "2");
+        params.put("kind",1);
         LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");

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

@@ -198,7 +198,7 @@ public class VisitReportPlanActivity extends BaseActivity  implements View.OnCli
     private void getCodeByNet() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
         final Map<String, Object> param = new HashMap<>();
-        String caller = "VisitRecord";
+        String caller = "visitplan";
         param.put("caller", caller);
         param.put("type", 2);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -655,7 +655,9 @@ public class CommonUtil {
             String[] match,
             int color) {
         SpannableStringBuilder style=new SpannableStringBuilder(input);
+        
         for (String item:match){
+            if (item==null)item="0";
             Pattern highlight = Pattern.compile(item);
             Matcher m = highlight.matcher(style.toString());
             while (m.find()) {

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

@@ -230,7 +230,8 @@
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_sale_msg" />
 
-                <ImageButton style="@style/crm_ib_card_topRight" />
+                <ImageButton style="@style/crm_ib_card_topRight"
+                    android:id="@+id/ib_sale_condition" />
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
@@ -381,7 +382,8 @@
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_branch" />
 
-                <ImageButton style="@style/crm_ib_card_topRight" />
+                <ImageButton style="@style/crm_ib_card_topRight"
+                    android:id="@+id/ib_em_condition" />
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
@@ -640,7 +642,8 @@
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_target" />
 
-                <ImageButton style="@style/crm_ib_card_topRight" />
+                <ImageButton style="@style/crm_ib_card_topRight"
+                    android:id="@+id/ib_index_condition" />
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
@@ -726,7 +729,8 @@
                 <TextView
                     style="@style/crm_ib_card_topRight"
                     android:textColor="@color/gray_light"
-                    android:text="更多" />
+                    android:text="更多"
+                    android:id="@+id/ib_forget_condition" />
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>