客户管理主页面bug解决

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

@@ -568,7 +568,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                             "NO." + sales.getJSONArray(0).get(3).toString()
                                                     + ":" + sales.getJSONArray(0).getString(1)
-                                                    + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                                    + "\n" + sales.getJSONArray(0).get(0) + "万元"
                                             , new String[]{
                                                     sales.getJSONArray(0).get(3).toString(),
                                                     sales.getJSONArray(0).getString(1),
@@ -576,7 +576,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                             ct.getResources().getColor(R.color.gray));
                                 }else{
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                            "NO."+"__"+"\n￥__",
+                                            "NO."+"__"+"\n__万元",
                                             new String[]{"__"},ct.getResources().getColor(R.color.gray)
                                     ); 
                                 }
@@ -584,7 +584,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                         "NO." + sales.getJSONArray(0).get(3).toString()
                                                 + ":" + sales.getJSONArray(0).getString(1)
-                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                                + "\n" + sales.getJSONArray(0).get(0) + "万元"
                                         , new String[]{
                                                 sales.getJSONArray(0).get(3).toString(),
                                                 sales.getJSONArray(0).getString(1),
@@ -594,7 +594,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
                                         "NO." +sales.getJSONArray(1).get(3).toString()
                                                 + ":" + sales.getJSONArray(1).getString(1)
-                                                + "\n￥" + sales.getJSONArray(1).get(0) + ""
+                                                + "\n" + sales.getJSONArray(1).get(0) + "万元"
                                         , new String[]{
                                                 sales.getJSONArray(1).get(3).toString(),
                                                 sales.getJSONArray(1).getString(1),
@@ -603,13 +603,24 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                         "NO." + sales.getJSONArray(0).get(3).toString()
                                                 + ":" + sales.getJSONArray(0).getString(1)
-                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                                + "\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.1:" + "__"
+                                            + "\n__"
+                                            + "万元"
+                                    , new String[]{ "__"},
+                                    ct.getResources().getColor(R.color.gray));
                         }
                    
                     }
@@ -658,7 +669,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 new String[]{"__"}
                                 , ct.getResources().getColor(R.color.gray));
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
-                                "NO1:" + "__"
+                                "NO.1:" + "__"
                                        + "\n__"
                                         + "个"
                                 , new String[]{ "__"},
@@ -670,7 +681,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
                                     "NO." + profits.getJSONArray(1).get(3).toString()+":" 
                                             + profits.getJSONArray(1).getString(1)
-                                            + "\n￥" + profits.getJSONArray(1).get(0) + " "
+                                            + "\n" + profits.getJSONArray(1).get(0) + "万元"
                                     , new String[]{
                                             String.valueOf(profits.getJSONArray(1).get(3).toString()),
                                             profits.getJSONArray(1).getString(1),
@@ -679,7 +690,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
                                     "NO." + profits.getJSONArray(0).get(3).toString()
                                             + ":" + profits.getJSONArray(0).getString(1)
-                                            + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                            + "\n" + profits.getJSONArray(0).get(0) + "万元"
                                     , new String[]{
                                             String.valueOf(profits.getJSONArray(0).get(3).toString()),
                                             profits.getJSONArray(0).getString(1),
@@ -691,7 +702,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
                                         "NO." + profits.getJSONArray(0).get(3).toString()
                                                 + ":" + profits.getJSONArray(0).getString(1)
-                                                + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                                + "\n" + profits.getJSONArray(0).get(0) + "万元"
                                         , new String[]{
                                                 String.valueOf(profits.getJSONArray(0).get(3).toString()),
                                                 profits.getJSONArray(0).getString(1),
@@ -700,7 +711,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                 
                             }else{
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                        "NO.__"+"\n￥"+"__",
+                                        "NO.__"+"\n"+"__万元",
                                         new String[]{
                                                 "__","__"},ct.getResources().getColor(R.color.gray));
                             }
@@ -708,7 +719,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
                                     "NO." + profits.getJSONArray(0).get(3).toString()
                                             + ":" + profits.getJSONArray(0).getString(1)
-                                            + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                            + "\n" + profits.getJSONArray(0).get(0) + "万元"
                                     , new String[]{
                                             String.valueOf(profits.getJSONArray(0).get(3).toString()),
                                             profits.getJSONArray(0).getString(1),
@@ -716,6 +727,17 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                     }, 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.1:" + "__"
+                                        + "\n__"
+                                        + "万元"
+                                , new String[]{ "__"},
+                                ct.getResources().getColor(R.color.gray));
                     }
 
 
@@ -724,7 +746,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
                                     "NO."+ receivables.getJSONArray(1).get(3).toString()
                                             +":" + receivables.getJSONArray(1).getString(1)
-                                            + "\n￥:" + receivables.getJSONArray(1).get(0) + " "
+                                            + "\n" + receivables.getJSONArray(1).get(0) + "万元"
                                     , new String[]{
                                             String.valueOf( receivables.getJSONArray(1).get(3).toString()),
                                             receivables.getJSONArray(1).getString(1),
@@ -732,7 +754,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                     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) + " "
+                                            + "\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));
@@ -741,13 +763,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
                                         "NO.1:" + receivables.getJSONArray(0).getString(1)
-                                                + "\n￥:" + receivables.getJSONArray(0).get(0) + " "
+                                                + "\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￥"+"__"
+                                        "NO.__"+"\n"+"__万元"
                                         , "__",
                                         ct.getResources().getColor(R.color.gray)); 
                             }
@@ -755,11 +777,22 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                           
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
                                     "NO.1:" + receivables.getJSONArray(0).getString(1)
-                                            + "\n￥:" + receivables.getJSONArray(0).get(0) + " "
+                                            + "\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,
+                                "NO."+"__"+"\n__万元",
+                                new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                        );
+                        CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
+                                "NO.1:" + "__"
+                                        + "\n__"
+                                        + "万元"
+                                , new String[]{ "__"},
+                                ct.getResources().getColor(R.color.gray));
                     }
                     break;
                 case INIT_SalesKit://销售
@@ -775,8 +808,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 +830,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 +846,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 +859,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 +879,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/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/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">"NO._\n__万元"</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">"NO._:__\n__万元"</item>
     </style>
     <!--crm sale-->
     <style name="crm_ll_sale" parent="LinearLayout_horizontal">