客户管理主页面"我的排名"样式修改

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,60 +565,47 @@ 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,
-                                    "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));
                         }
@@ -630,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,
-                                "NO.1:" + "__"
-                                       + "\n__"
-                                        + "个"
+                                "__个"
                                 , new String[]{ "__"},
                                 ct.getResources().getColor(R.color.gray));
                     }
@@ -679,63 +661,46 @@ 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()),
-                                                profits.getJSONArray(0).getString(1),
-                                                String.valueOf(profits.getJSONArray(0).get(0))
-                                        }, ct.getResources().getColor(R.color.gray));  
-                                
+                                                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(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,
-                                "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));
                     }
@@ -744,53 +709,45 @@ 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).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,
-                                "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));
                     }

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/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">