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

WeiChat/build.gradle

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

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

@@ -565,51 +565,49 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         if (!sales.isEmpty()){
                             if (sales.size() != 2) {
                                 if (sales.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_usernme"))) {
+                                    CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
+                                            "第"+sales.getJSONArray(0).get(3) + "名"
+                                            , new String[]{
+                                                    String.valueOf(sales.getJSONArray(0).get(3))},
+                                            ct.getResources().getColor(R.color.red));
+
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                            "NO." + sales.getJSONArray(0).get(3).toString()
-                                                    + ":" + sales.getJSONArray(0).getString(1)
-                                                    + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                            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,
+                                            "__"+ "万元"
+                                            , new String[]{ "__"},
+                                            ct.getResources().getColor(R.color.gray));
                                 }
-                               
-                                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." +sales.getJSONArray(1).get(3).toString()
-                                                + ":" + sales.getJSONArray(1).getString(1)
-                                                + "\n￥" + sales.getJSONArray(1).get(0) + ""
+                                        "第" + sales.getJSONArray(1).get(3).toString()
+                                                + "名"
                                         , new String[]{
-                                                sales.getJSONArray(1).get(3).toString(),
-                                                sales.getJSONArray(1).getString(1),
-                                                String.valueOf(sales.getJSONArray(1).get(0))},
-                                        ct.getResources().getColor(R.color.gray));
+                                                sales.getJSONArray(1).get(3).toString()},
+                                        ct.getResources().getColor(R.color.red));
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                        "NO." + sales.getJSONArray(0).get(3).toString()
-                                                + ":" + sales.getJSONArray(0).getString(1)
-                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                        sales.getJSONArray(1).get(0) + "万元"
                                         , new String[]{
-                                                sales.getJSONArray(0).get(3).toString(),
-                                                sales.getJSONArray(0).getString(1),
-                                                String.valueOf(sales.getJSONArray(0).get(0))},
+                                                String.valueOf(sales.getJSONArray(1).get(0))},
                                         ct.getResources().getColor(R.color.gray));
                             }
+                        }else{
+                            CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
+                                    "第"+"__"+"名",
+                                    new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                            );
+                            CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
+                                    "__"+ "万元"
+                                    , new String[]{ "__"},
+                                    ct.getResources().getColor(R.color.gray));
                         }
                    
                     }
@@ -619,48 +617,43 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             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)
+                                        "第" + visits.getJSONArray(0).getString(0)
+                                                + "名"
+                                        , new String[]{visits.getJSONArray(0).getString(0)},
+                                        ct.getResources().getColor(R.color.red));
+
+                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,visits.getJSONArray(0).getIntValue(2)
                                                 + "个"
-                                        , new String[]{visits.getJSONArray(0).getString(0)
-                                                , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
+                                        , new String[]{ 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));
+                                        "第__名",
+                                        new String[]{"__"}
+                                        , ct.getResources().getColor(R.color.gray));
+                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
+                                        "__个"
+                                        , 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)
-                                            + "个"
-//                                            + visits.getJSONArray(0).getIntValue(1) + " 次"
-                                    , new String[]{visits.getJSONArray(0).getString(0)
-                                            , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
-                                    ct.getResources().getColor(R.color.gray));
+
                         } else {
-                            tv_rank_visit_left.setText("NO." + visits.getJSONArray(1).getIntValue(3)+
-                                    "\n"+visits.getJSONArray(1).getIntValue(2) + "个");
-                            tv_rank_visit_right.setText("NO.1:" + visits.getJSONArray(1).getString(0)
-                                    + "\n" +visits.getJSONArray(1).getIntValue(2)
-                                    + "个");
+                            CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
+                                    "第" + visits.getJSONArray(1).get(3) + "名"
+                                    , new String[]{visits.getJSONArray(1).get(3) + ""},
+                                    ct.getResources().getColor(R.color.red));
+//                            tv_rank_visit_left.setText("第" + visits.getJSONArray(1).getIntValue(3)+"名");
+                            tv_rank_visit_right.setText(visits.getJSONArray(1).getIntValue(2) + "个");
                            
                         }
                     }else{
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                "NO.__" + "\n__个",
+                                "第__名",
                                 new String[]{"__"}
                                 , ct.getResources().getColor(R.color.gray));
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
-                                "NO1:" + "__"
-                                       + "\n__"
-                                        + "个"
+                                "__个"
                                 , new String[]{ "__"},
                                 ct.getResources().getColor(R.color.gray));
                     }
@@ -668,98 +661,95 @@ 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).get(3).toString()+":" 
-                                            + profits.getJSONArray(1).getString(1)
-                                            + "\n￥" + profits.getJSONArray(1).get(0) + " "
+                                    "第" + profits.getJSONArray(1).get(3).toString() + "名"
                                     , new String[]{
-                                            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).get(3).toString()
-                                            + ":" + profits.getJSONArray(0).getString(1)
-                                            + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                            String.valueOf(profits.getJSONArray(1).get(3).toString())
+                                    }, ct.getResources().getColor(R.color.red));
+                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,profits.getJSONArray(1).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 {
                             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) + " "
+                                        "第" + profits.getJSONArray(0).get(3).toString()+ "名"
+                                        , new String[]{
+                                                String.valueOf(profits.getJSONArray(0).get(3).toString())
+                                        }, ct.getResources().getColor(R.color.red));
+
+                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,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));  
-                                
+                                        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));
+                                        "第"+"__"+"名",
+                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                );
+                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
+                                        "__"+ "万元"
+                                        , new String[]{ "__"},
+                                        ct.getResources().getColor(R.color.gray));
                             }
-                          
-                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                    "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,
+                                "第"+"__"+"名",
+                                new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                        );
+                        CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
+                                "__"+ "万元"
+                                , new String[]{ "__"},
+                                ct.getResources().getColor(R.color.gray));
                     }
 
 
                     if (receivables != null&&!receivables.isEmpty()) {
                         if (receivables.size() == 2) {
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                    "NO."+ receivables.getJSONArray(1).get(3).toString()
-                                            +":" + receivables.getJSONArray(1).getString(1)
-                                            + "\n￥:" + receivables.getJSONArray(1).get(0) + " "
+                                    "第"+ receivables.getJSONArray(1).get(3).toString() +"名"
                                     , new String[]{
-                                            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));
-                            CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
-                                    "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))},
+                                            String.valueOf( receivables.getJSONArray(1).get(3).toString())},
+                                    ct.getResources().getColor(R.color.red));
+                            CommonUtil.textAarrySpanForStyle(tv_rank_income_right,receivables.getJSONArray(1).get(0) + "万元"
+                                    , new String[]{String.valueOf(receivables.getJSONArray(1).get(0))},
                                     ct.getResources().getColor(R.color.gray));
                         } else {
                             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),
+                                        "第" + receivables.getJSONArray(0).getString(1)+ "名"
+                                        , new String[]{receivables.getJSONArray(0).getString(1)},
+                                        ct.getResources().getColor(R.color.red));
+
+                                CommonUtil.textAarrySpanForStyle(tv_rank_income_right,receivables.getJSONArray(0).get(0) + "万元"
+                                        , new String[]{
                                                 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_left,
+                                        "第"+"__"+"名",
+                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                );
+                                CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
+                                        "__"+"万元"
+                                        , new String[]{ "__"},
+                                        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) + " "
-                                    , new String[]{receivables.getJSONArray(0).getString(1),
-                                            String.valueOf(receivables.getJSONArray(0).get(0))},
-                                    ct.getResources().getColor(R.color.gray));
+
                         }
+                    }else{
+                        CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
+                                "第"+"__"+"名",
+                                new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                        );
+                        CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
+                                "__"+"万元"
+                                , new String[]{ "__"},
+                                ct.getResources().getColor(R.color.gray));
                     }
                     break;
                 case INIT_SalesKit://销售
@@ -775,8 +765,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         ydata1[4] = root.getIntValue("nichecount");
                         ydata1[5] = root.getJSONArray("visit").getIntValue(0);
                         ydata1[6] = root.getJSONArray("visit").getIntValue(1);
-                        tv_chuhuo.setText("出货" + root.getIntValue("saleamount") + "万元");
-                        tv_huikuan.setText("回款" + root.getIntValue("backamount") + "万元");
+                        tv_chuhuo.setText("出货" + root.getFloatValue("saleamount") + "万元");
+                        tv_huikuan.setText("回款" + root.getFloatValue("backamount") + "万元");
                        for (int i=0;i<ydata1.length;i++){
                            Log.i(TAG, "handleMessage:ydata1["+i+"]=" + ydata1[i] );
                        }
@@ -797,9 +787,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         tv_em_a.setText(target.getString("CUSTOMERCOUNT"));
                         float [] ydata={0,0,0,0,0,0,0};
                         ydata[0]=target.getIntValue("RANK");
-                        ydata[1]=target.getIntValue("TOPCOUNT");
-                        ydata[2]=target.getIntValue("FIRSTBFCOUNT");
-                        ydata[3]=target.getIntValue("ACTUALPROFIT");
+                        ydata[1]=target.getFloatValue("FIRSTBFCOUNT/10000");
+                        ydata[2]=target.getIntValue("TOPCOUNT");
+                        ydata[3]=target.getFloatValue("ACTUALPROFIT/10000");
                        setData(7,ydata);
                     }else{
                         float [] ydata={0,0,0,0,0,0,0};
@@ -813,10 +803,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                ll_data_two.setVisibility(View.GONE);
                                ll_data_three.setVisibility(View.GONE);
                                tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                               +"/"+root.getJSONArray("subs").getJSONObject(0).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT")
-                               +"/"+ root.getJSONArray("subs").getJSONObject(0).getIntValue("ACTUALPROFIT"));
+
+                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                               +"/"+root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                               +"/"+ root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
                                break;
                            case 2:
                                ll_data_one.setVisibility(View.GONE);
@@ -825,16 +816,16 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
                                tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
 
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("ACTUALPROFIT"));
+                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
+
+                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
 
-                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("ACTUALPROFIT"));
-                               
                                break;
                            case 3:
                                ll_data_one.setVisibility(View.GONE);
@@ -845,19 +836,20 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                tv_em_c.setText(root.getJSONArray("subs").getJSONObject(2).getString("CUSTOMERCOUNT"));
 
 
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("ACTUALPROFIT"));
+                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
+
+                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
+                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
 
-                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
-                                       +"/"+root.getJSONArray("subs").getJSONObject(1).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT")
-                                       +"/"+ root.getJSONArray("subs").getJSONObject(1).getIntValue("ACTUALPROFIT"));
-                               tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("RANK")
-                                       +"/"+root.getJSONArray("subs").getJSONObject(2).getIntValue("FIRSTBFCOUNT"));
-                               tv_em_salec.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("TOPCOUNT")
-                                       +"/"+ root.getJSONArray("subs").getJSONObject(2).getIntValue("ACTUALPROFIT"));
+                               tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getFloatValue("FIRSTBFCOUNT/10000")
+                                       +"/"+root.getJSONArray("subs").getJSONObject(2).getFloatValue("ACTUALPROFIT/10000"));
+                               tv_em_salec.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("RANK")
+                                       +"/"+ root.getJSONArray("subs").getJSONObject(2).getIntValue("TOPCOUNT"));
                                break;
                        }
                        

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

@@ -99,7 +99,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         mAdapter = new BussinessDetailAdapter(ct, jsonArray);
         mlist.setAdapter(mAdapter);
 
-        mEmptyLayout = new EmptyLayout(this,mlist.getRefreshableView());
+        mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
@@ -145,19 +145,19 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private void initData() {
         em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-        DBManager dbManager=new DBManager(ct);
-        List<EmployeesEntity> db=  dbManager.select_getEmployee(
+        DBManager dbManager = new DBManager(ct);
+        List<EmployeesEntity> db = dbManager.select_getEmployee(
                 new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
-                CommonUtil.getSharedPreferences(ct, "erp_username")}
+                        CommonUtil.getSharedPreferences(ct, "erp_username")}
                 , "whichsys=? and em_code=? ");
-        if (!ListUtils.isEmpty(db)){
-            for (EmployeesEntity model:db) {
+        if (!ListUtils.isEmpty(db)) {
+            for (EmployeesEntity model : db) {
                 Log.i(TAG, "initData:" + model.getEM_DEPART());
                 Log.i(TAG, "initData:" + model.getEM_POSITION());
                 Log.i(TAG, "initData:" + model.getCOMPANY());
             }
             tv_position.setText(db.get(0).getEM_POSITION());
-            tv_department.setText(db.get(0).getEM_DEFAULTORNAME()+"—>");
+            tv_department.setText(db.get(0).getEM_DEFAULTORNAME() + "—>");
         }
     }
 
@@ -385,23 +385,19 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                     JSONArray json0 = JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers0");
                     JSONArray json1 = JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers1");
                     if (json0 != null && json1 != null) {
-                        if (page == 1) {
-                            unEndSize = json0.size();
-                            endSize = json1.size();
-                            totalSize = json.size();
+                        if (page == 1){
+                            unEndSize = json0.getJSONObject(0).getIntValue("count");
+                            endSize = json1.getJSONObject(0).getIntValue("count");
+                            totalSize = json.getJSONObject(0).getIntValue("count");
+
+                            CommonUtil.textSpanForStyle(tv_count_unend, unEndSize + "\n未成交", String.valueOf(unEndSize),
+                                    ct.getResources().getColor(R.color.yellow_home));
+                            CommonUtil.textSpanForStyle(tv_count_end, endSize + "\n已成交", String.valueOf(endSize),
+                                    ct.getResources().getColor(R.color.yellow_home));
+                            CommonUtil.textSpanForStyle(tv_count_total, totalSize + "\n全部客户", String.valueOf(totalSize),
+                                    ct.getResources().getColor(R.color.yellow_home));
                         }
-                     /*  else {
-                           unEndSize += json0.size();
-                           endSize += json1.size();
-                           totalSize += json.size();
-                       }*/
-
-                        CommonUtil.textSpanForStyle(tv_count_unend, unEndSize + "\n未成交", String.valueOf(unEndSize),
-                                ct.getResources().getColor(R.color.yellow_home));
-                        CommonUtil.textSpanForStyle(tv_count_end, endSize + "\n已成交", String.valueOf(endSize),
-                                ct.getResources().getColor(R.color.yellow_home));
-                        CommonUtil.textSpanForStyle(tv_count_total, totalSize + "\n全部客户", String.valueOf(totalSize),
-                                ct.getResources().getColor(R.color.yellow_home));
+
                     }
                     switch (type) {
                         case 0:
@@ -418,7 +414,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                         if (page == 1) jsonArray.clear();
                         jsonArray.addAll(json);
                         mAdapter.notifyDataSetChanged();
-                    }else {
+                    } else {
                         mEmptyLayout.showEmpty();
                     }
                     mlist.onRefreshComplete();

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

@@ -80,12 +80,15 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         getSupportActionBar().setTitle("拜访计划");
         tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
         tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+
         tv_date_select.setKeyListener(null);
         tv_date_select.setFocusable(false);
         tv_date_select.setOnClickListener(this);
+
         tv_date_end.setKeyListener(null);
         tv_date_end.setFocusable(false);
         tv_date_end.setOnClickListener(this);
+
         tv_address_refresh.setOnClickListener(this);
         tv_customer_login.setOnClickListener(this);
 

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

@@ -674,8 +674,8 @@ public class CommonUtil {
                         Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 //            style.setSpan(new StrikethroughSpan(), m.start(), m.end(), 
 //                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-                style.setSpan(new UnderlineSpan(), m.start(), m.end(),
-                        Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+//                style.setSpan(new UnderlineSpan(), m.start(), m.end(),
+//                        Spannable.SPAN_INCLUSIVE_INCLUSIVE);
             }
         }
         view.setText(style);

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

@@ -191,6 +191,7 @@
                         android:id="@+id/tv_rank_visit_left" />
 
                     <TextView style="@style/crm_tv_ranking_right"
+                        android:text="__个"
                         android:id="@+id/tv_rank_visit_right" />
                 </LinearLayout>
             </LinearLayout>

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

@@ -3,20 +3,23 @@
     android:layout_height="wrap_content"
     style="@style/crm_ll_card">
 
-    <RelativeLayout style="@style/crm_ll_sale_item">
+    <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
             android:id="@+id/tv_cu_title"
             android:text="深圳市优软科技有限公司"
             android:textSize="15sp"
-            style="@style/TextView_Basic" />
+            style="@style/TextView_Basic"
+            android:layout_width="0dp"
+            android:layout_weight="1"/>
 
         <TextView
-            android:layout_alignParentRight="true"
+            android:gravity="right"
             android:id="@+id/tv_cu_state"
             android:text="未成交"
-            style="@style/TextView_Basic" />
-    </RelativeLayout>
+            style="@style/TextView_Basic"
+            android:layout_width="wrap_content"/>
+    </LinearLayout>
     <LinearLayout style="@style/crm_ll_sale_item"
         android:visibility="gone">
 

WeiChat/src/main/res/values/styles.xml

@@ -637,7 +637,7 @@
         <item name="android:layout_marginRight">3dp</item>
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_weight">2</item>
-        <item name="android:text">"NO._\n￥__"</item>
+        <item name="android:text">"第__名"</item>
     </style>
 
     <style name="crm_tv_ranking_right">
@@ -646,7 +646,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:text">"NO._:__\n￥__"</item>
+        <item name="android:text">"__万元"</item>
     </style>
     <!--crm sale-->
     <style name="crm_ll_sale" parent="LinearLayout_horizontal">