测试版本5.2.3 9-8

WeiChat/build.gradle

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

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

@@ -770,6 +770,7 @@ public class CompanyContactsActivity extends BaseActivity {
                 EmployeesEntity eEntity = employeesEntities.get(i);
                 String em_code = eEntity.getEM_CODE();
                 String whichsys = eEntity.getWHICHSYS();
+                if (StringUtils.isEmpty(em_code))return;
                 if ("UPDATE".equals(eEntity.getFLAG())) {
                     List<EmployeesEntity> tempEntity = manager.select_getEmployee(new String[]{em_code, whichsys}, "em_code=? and whichsys=?");
                     if (tempEntity.isEmpty()) {

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

@@ -219,7 +219,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
 
         String status = intent.getStringExtra("status");
         String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
-        Log.i("gongee", emname);
+       // Log.i("gongee", emname);
         if ("进行中".equals(status)) {
             // 执行人
             if (intent.getStringExtra("performer").equals(emname)) {

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

@@ -146,6 +146,13 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                     Crouton.makeText(activity,30,"操作成功!",getResources().getColor(R.color.light_green),2000).show();
                     if (type == 2) {
                         updataSchedule(0x16);
+                    }else{
+                      mHandler.postDelayed(new Runnable() {
+                          @Override
+                          public void run() {
+                              jumpToStateActivity();
+                          }
+                      },3000);
                     }
                     break;
                 case 0x16:

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

@@ -564,35 +564,48 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (sales != null) {
                         if (!sales.isEmpty()){
                             if (sales.size() != 2) {
-                                CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                         "NO."+"__"+"\n￥__",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
-                                        );
+                                if (sales.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_usernme"))) {
+                                    CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
+                                            "NO." + sales.getJSONArray(0).get(3).toString()
+                                                    + ":" + sales.getJSONArray(0).getString(1)
+                                                    + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                            , new String[]{
+                                                    sales.getJSONArray(0).get(3).toString(),
+                                                    sales.getJSONArray(0).getString(1),
+                                                    String.valueOf(sales.getJSONArray(0).get(0))},
+                                            ct.getResources().getColor(R.color.gray));
+                                }else{
+                                    CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
+                                            "NO."+"__"+"\n￥__",
+                                            new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                    ); 
+                                }
+                               
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                        "NO." + sales.getJSONArray(0).getIntValue(2)
+                                        "NO." + sales.getJSONArray(0).get(3).toString()
                                                 + ":" + sales.getJSONArray(0).getString(1)
                                                 + "\n￥" + sales.getJSONArray(0).get(0) + ""
                                         , new String[]{
-                                                String.valueOf(sales.getJSONArray(0).getIntValue(2)),
+                                                sales.getJSONArray(0).get(3).toString(),
                                                 sales.getJSONArray(0).getString(1),
                                                 String.valueOf(sales.getJSONArray(0).get(0))},
                                         ct.getResources().getColor(R.color.gray));
                             } else {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                        "NO." + sales.getJSONArray(1).getIntValue(2)
+                                        "NO." +sales.getJSONArray(1).get(3).toString()
                                                 + ":" + sales.getJSONArray(1).getString(1)
                                                 + "\n￥" + sales.getJSONArray(1).get(0) + ""
                                         , new String[]{
-                                                String.valueOf(sales.getJSONArray(1).getIntValue(2)),
+                                                sales.getJSONArray(1).get(3).toString(),
                                                 sales.getJSONArray(1).getString(1),
                                                 String.valueOf(sales.getJSONArray(1).get(0))},
                                         ct.getResources().getColor(R.color.gray));
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                        "NO." + sales.getJSONArray(0).getIntValue(2)
+                                        "NO." + sales.getJSONArray(0).get(3).toString()
                                                 + ":" + sales.getJSONArray(0).getString(1)
                                                 + "\n￥" + sales.getJSONArray(0).get(0) + ""
                                         , new String[]{
-                                                String.valueOf(sales.getJSONArray(0).getIntValue(2)),
+                                                sales.getJSONArray(0).get(3).toString(),
                                                 sales.getJSONArray(0).getString(1),
                                                 String.valueOf(sales.getJSONArray(0).get(0))},
                                         ct.getResources().getColor(R.color.gray));
@@ -603,13 +616,26 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                     if (visits != null&&!visits.isEmpty()) {
                         if (visits.size() != 2) {
-                            //名称 拜访次数，拜访个数，排名
-                            CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
+                            if (visits.getJSONArray(0).getString(1).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
+                            {
+                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
+                                        "NO.1:" + visits.getJSONArray(0).getString(0)
+                                                + "\n" + visits.getJSONArray(0).getIntValue(2)
+                                                + "个"
+                                        , new String[]{visits.getJSONArray(0).getString(0)
+                                                , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
+                                        ct.getResources().getColor(R.color.gray));
+                                
+                            }else{
+                                //名称 拜访次数，拜访个数，排名
+                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
                                            /* visits.getJSONArray(0).getIntValue(1) + "次/第"*/
-                                           "NO."+ "_" +"\n__" + "个",
-                                    new String[]{"_"
-                                            , "__"
-                                    }, ct.getResources().getColor(R.color.gray));
+                                        "NO."+ "_" +"\n__" + "个",
+                                        new String[]{"_"
+                                                , "__"
+                                        }, ct.getResources().getColor(R.color.gray));
+                            }
+                          
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
                                     "NO.1:" + visits.getJSONArray(0).getString(0)
                                             + "\n" + visits.getJSONArray(0).getIntValue(2)
@@ -642,34 +668,49 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (profits != null&&!profits.isEmpty()) {
                         if (profits.size() == 2) {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                    "NO."+profits.getJSONArray(1).getIntValue(2)+":" 
+                                    "NO." + profits.getJSONArray(1).get(3).toString()+":" 
                                             + profits.getJSONArray(1).getString(1)
                                             + "\n￥" + profits.getJSONArray(1).get(0) + " "
                                     , new String[]{
-                                            String.valueOf(profits.getJSONArray(1).getIntValue(2)),
+                                            String.valueOf(profits.getJSONArray(1).get(3).toString()),
                                             profits.getJSONArray(1).getString(1),
                                             String.valueOf(profits.getJSONArray(1).get(0))
                                     }, ct.getResources().getColor(R.color.gray));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                    "NO." + profits.getJSONArray(0).getIntValue(2)
+                                    "NO." + profits.getJSONArray(0).get(3).toString()
                                             + ":" + profits.getJSONArray(0).getString(1)
                                             + "\n￥" + profits.getJSONArray(0).get(0) + " "
                                     , new String[]{
-                                            String.valueOf(profits.getJSONArray(0).getIntValue(2)),
+                                            String.valueOf(profits.getJSONArray(0).get(3).toString()),
                                             profits.getJSONArray(0).getString(1),
                                             String.valueOf(profits.getJSONArray(0).get(0))
                                     }, ct.getResources().getColor(R.color.gray));
                         } else {
-                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                    "NO.__"+"\n￥"+"__",
-                                    new String[]{
-                                            "__","__"},ct.getResources().getColor(R.color.gray));
+                            if (profits.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
+                            {
+                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
+                                        "NO." + profits.getJSONArray(0).get(3).toString()
+                                                + ":" + profits.getJSONArray(0).getString(1)
+                                                + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                        , new String[]{
+                                                String.valueOf(profits.getJSONArray(0).get(3).toString()),
+                                                profits.getJSONArray(0).getString(1),
+                                                String.valueOf(profits.getJSONArray(0).get(0))
+                                        }, ct.getResources().getColor(R.color.gray));  
+                                
+                            }else{
+                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
+                                        "NO.__"+"\n￥"+"__",
+                                        new String[]{
+                                                "__","__"},ct.getResources().getColor(R.color.gray));
+                            }
+                          
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                    "NO." + profits.getJSONArray(0).getIntValue(2)
+                                    "NO." + profits.getJSONArray(0).get(3).toString()
                                             + ":" + profits.getJSONArray(0).getString(1)
                                             + "\n￥" + profits.getJSONArray(0).get(0) + " "
                                     , new String[]{
-                                            String.valueOf(profits.getJSONArray(0).getIntValue(2)),
+                                            String.valueOf(profits.getJSONArray(0).get(3).toString()),
                                             profits.getJSONArray(0).getString(1),
                                             String.valueOf(profits.getJSONArray(0).get(0))
                                     }, ct.getResources().getColor(R.color.gray));
@@ -681,11 +722,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (receivables != null&&!receivables.isEmpty()) {
                         if (receivables.size() == 2) {
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                    "NO."+ receivables.getJSONArray(1).getIntValue(2)
+                                    "NO."+ receivables.getJSONArray(1).get(3).toString()
                                             +":" + receivables.getJSONArray(1).getString(1)
                                             + "\n￥:" + receivables.getJSONArray(1).get(0) + " "
                                     , new String[]{
-                                            String.valueOf( receivables.getJSONArray(1).getString(2)),
+                                            String.valueOf( receivables.getJSONArray(1).get(3).toString()),
                                             receivables.getJSONArray(1).getString(1),
                                             String.valueOf(receivables.getJSONArray(1).get(0))},
                                     ct.getResources().getColor(R.color.gray));
@@ -696,10 +737,22 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                             String.valueOf(receivables.getJSONArray(0).get(0))},
                                     ct.getResources().getColor(R.color.gray));
                         } else {
-                            CommonUtil.textSpanForStyle(tv_rank_income_left,
-                                    "NO.__"+"\n￥"+"__"
-                                    , "__",
-                                    ct.getResources().getColor(R.color.gray));
+                            if (receivables.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
+                            {
+                                CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
+                                        "NO.1:" + receivables.getJSONArray(0).getString(1)
+                                                + "\n￥:" + receivables.getJSONArray(0).get(0) + " "
+                                        , new String[]{receivables.getJSONArray(0).getString(1),
+                                                String.valueOf(receivables.getJSONArray(0).get(0))},
+                                        ct.getResources().getColor(R.color.gray));
+                            }else{
+                                CommonUtil.textSpanForStyle(tv_rank_income_left,
+                                        "NO.__"+"\n￥"+"__"
+                                        , "__",
+                                        ct.getResources().getColor(R.color.gray)); 
+                            }
+                                
+                          
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
                                     "NO.1:" + receivables.getJSONArray(0).getString(1)
                                             + "\n￥:" + receivables.getJSONArray(0).get(0) + " "

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

@@ -247,7 +247,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage("录入成功！");
-                    jumpToStateActivity();
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            finish();
+                        }
+                    },3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();

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

@@ -156,7 +156,7 @@ public class CustomerDetailActivity extends BaseActivity {
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     JSONObject jsonArray = JSON.parseObject(msg.getData().getString("result")).getJSONObject("customer");
                     if (jsonArray != null) {
-                        tv_company_name.setText(jsonArray.getString("cu_contact"));
+                        tv_company_name.setText(jsonArray.getString("cu_name"));
                         tv_leader.setText(jsonArray.getString("cu_sellername"));
                         tv_state.setText(jsonArray.getString("cu_dealstatus")+"|普通客户");
                         tv_lastDate.setText(jsonArray.getString("cu_lastdate"));
@@ -169,7 +169,7 @@ public class CustomerDetailActivity extends BaseActivity {
                         tv_email.setText(jsonArray.getString("cu_email"));
                         tv_mobile.setText(jsonArray.getString("cu_mobile"));
                         tv_position.setText(jsonArray.getString("cu_degree"));
-                        tv_name.setText(jsonArray.getString("cu_name"));
+                        tv_name.setText(jsonArray.getString("cu_contact"));
                         String steps= jsonArray.getString("cu_nichestep");
                         for (int i=0;i<labels.length;i++){
                             if (!StringUtils.isEmpty(steps)){

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

@@ -195,10 +195,16 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage("保存成功！");
-                    if (!StringUtils.isEmpty(code))
-                        setCodeByNet(code);
-                    else
-                        endActivity();
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (!StringUtils.isEmpty(code))
+                                setCodeByNet(code);
+                            else
+                                endActivity();
+                          
+                        }
+                    },3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -265,6 +271,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     + "\",\n" +
                     "\"custname\":\"" +
                     tv_customer.getText().toString() +//联系人
+                     "\",\n" +
+                    "\"SOURCECODE\":\"" +
+                      code +//联系人
                     "\",\n" +
                     "\"timealert\":\"" +
                     tv_notice.getText().toString() +//提醒

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

@@ -92,6 +92,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void initData() {
+        CommonUtil.getCommonId(this,"VISITRECORD_SEQ",mHandler,GET_VR_ID);
         OABean bean = getIntent().getParcelableExtra("data");
         if (bean == null) return;
         vp_id = bean.getVp_id();
@@ -137,12 +138,16 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    ToastMessage("保存成功！");
-                    //更新接口
-                    if (vp_id != -1)
-                        updataCode();
-                    else
-                        endActivity();
+                    ToastMessage("保存成功!");
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (vp_id != -1)//更新接口
+                                updataCode();
+                            else
+                                endActivity();
+                        }
+                    },3000);
                     break;
                 case 0x16://更新状态接口
                     ToastMessage("更新成功！");

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

@@ -24,7 +24,6 @@ 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;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import org.json.JSONException;
@@ -126,7 +125,12 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage("保存成功！");
-                    endActivity();
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            endActivity();
+                        }
+                    },3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();

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

@@ -572,6 +572,7 @@ public class ViewUtil {
                         Log.i("result", "url：" + url);
                         Log.i("result", "parms：" + params.toString());
                         Log.i("result", "statusCode：" + result.getStatusCode());
+                       // Log.i("result", "statusCode：" +result.getResponseText());
                         LogUtil.prinlnLongMsg("result", result.getResponseText());
                         Log.i("result", "http 接收响应-----------------------------------------");
                         if (result.getStatusCode() == 200) {

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

@@ -1,10 +1,10 @@
 package com.xzjmyk.pm.activity.ui.erp.util;
 
+import android.util.Log;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import android.util.Log;
-
 public class LogUtil {
 	private static final boolean DEBUG = true;