crm调整ui

WeiChat/build.gradle

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -11,7 +11,6 @@ import com.baidu.location.LocationClientOption;
 import com.baidu.location.LocationClientOption.LocationMode;
 import com.baidu.location.Poi;
 import com.xzjmyk.pm.activity.sp.LocationSp;
-import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.util.List;
 
@@ -82,13 +81,13 @@ public class BdLocationHelper {
             if (location != null) {
                 resultCode = location.getLocType();
             }
-            Log.i("gongpengming", StringUtils.isEmail(location.getLocationDescribe()) ? "空的" : location.getLocationDescribe());
-            if (location.getPoiList() == null || location.getPoiList().size() <= 0) {
+//            Log.i("gongpengming", StringUtils.isEmail(location.getLocationDescribe()) ? "空的" : location.getLocationDescribe());
+            /*if (location.getPoiList() == null || location.getPoiList().size() <= 0) {
                 Log.i("gongpengming", "location.getPoiList()不对劲");
             } else {
                 Log.i("gongpengming", "location.getPoiList()不对劲");
-            }
-            setPois(location.getPoiList());
+            }*/
+//            setPois(location.getPoiList());
             // 百度定位失败
             if (resultCode != BDLocation.TypeGpsLocation && resultCode != BDLocation.TypeCacheLocation
                     && resultCode != BDLocation.TypeOffLineLocation && resultCode != BDLocation.TypeNetWorkLocation) {

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

@@ -532,22 +532,22 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             if (sales.size() != 2) {
                                 //__元/第__名   第一名:__金额:__元
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                        "￥__" + "/NO."+"__",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.yellow_home)
+                                         "NO."+"__"+"\n￥__",
+                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
                                         );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                         "NO.1:" + sales.getJSONArray(0).getString(1)
-                                                + "/￥:" + sales.getJSONArray(0).getIntValue(0) + ""
-                                ,new String[]{sales.getJSONArray(0).getString(1),
-                                        String.valueOf(sales.getJSONArray(0).getIntValue(0))},
-                                        ct.getResources().getColor(R.color.yellow_home));
+                                                + "\n￥:" + sales.getJSONArray(0).getIntValue(0) + ""
+                                        , new String[]{sales.getJSONArray(0).getString(1),
+                                                String.valueOf(sales.getJSONArray(0).getIntValue(0))},
+                                        ct.getResources().getColor(R.color.gray));
 //                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
 //                                        + "金额:" + sales.getJSONArray(0).getIntValue(0) + "元");
                 
                             } else {
-                                tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元/第1名");
+                                tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元\n第1名");
                                 tv_rank_sale_right.setText("NO._:" + sales.getJSONArray(0).getString(1)
-                                        + "￥:" + sales.getJSONArray(1).getIntValue(0) + "");
+                                        + "\n￥:" + sales.getJSONArray(1).getIntValue(0) + "");
                                 sales.getJSONArray(1).getIntValue(0);//自己  元
                                 sales.getJSONArray(1).getString(1);//自己
                             }
@@ -559,56 +559,52 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         if (visits.size() != 2) {
                             //名称 拜访次数，拜访个数，排名
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                    "__" + "个/" +
                                            /* visits.getJSONArray(0).getIntValue(1) + "次/第"*/
-                                           "NO."+ "__" ,
+                                           "NO."+ "__" +"\n__" + "个",
                                     new String[]{"__"
                                           /*  , String.valueOf(visits.getJSONArray(0).getIntValue(1))*/
                                             , "__"
-                                    }, ct.getResources().getColor(R.color.yellow_home));
+                                    }, ct.getResources().getColor(R.color.black));
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
                                     "NO.1:" + visits.getJSONArray(0).getString(0)
-                                            + "/" + visits.getJSONArray(0).getIntValue(2)
-                                            + "个/" + visits.getJSONArray(0).getIntValue(1) + " 次"
+                                            + "\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))
-                                            , String.valueOf(visits.getJSONArray(0).getIntValue(1))},
-                                    ct.getResources().getColor(R.color.yellow_home));
+                                            , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
+                                    ct.getResources().getColor(R.color.gray));
                         } else {
-                            tv_rank_visit_left.setText(visits.getJSONArray(1).getIntValue(2) + "个/" +
-                                    visits.getJSONArray(1).getIntValue(1) + "次/第"
-                                    + visits.getJSONArray(1).getIntValue(3) + "名");
-                            tv_rank_visit_right.setText("第一名:" + visits.getJSONArray(1).getString(0)
-                                    + "拜访:" + visits.getJSONArray(1).getIntValue(2)
-                                    + "个/" + visits.getJSONArray(1).getIntValue(1) + "次");
+                            tv_rank_visit_left.setText("NO:" + visits.getJSONArray(1).getIntValue(3)+
+                                    "\n"+visits.getJSONArray(1).getIntValue(2) + "个");
+                            tv_rank_visit_right.setText("NO1::" + visits.getJSONArray(1).getString(0)
+                                    + "\n" +visits.getJSONArray(1).getIntValue(2)
+                                    + "个");
                            
                         }
                     }else{
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                "__" + "个/" +
-                                        "__" + "次/第"
-                                        + "__"  + "名",
+                                "NO.__" + "\n__个",
                                 new String[]{"__"}
-                                , ct.getResources().getColor(R.color.yellow_home));
+                                , ct.getResources().getColor(R.color.gray));
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
-                                "第一名:" + "__"
-                                        + "拜访:" +  "__"
-                                        + "个/" +  "__" + "次"
+                                "NO1:" + "__"
+                                       + "\n__"
+                                        + "个"
                                 , new String[]{ "__"},
-                                ct.getResources().getColor(R.color.yellow_home));
+                                ct.getResources().getColor(R.color.gray));
                     }
 
                     if (profits != null&&!profits.isEmpty()) {
                         if (profits.size() == 2) {
-                            tv_rank_rirun_left.setText("__" + "元/第"+"__"+"名");
-                            tv_rank_rirun_right.setText("第一名:" + profits.getJSONArray(1).getString(1)
-                                    + "金额:" + profits.getJSONArray(1).getIntValue(0) + "元");
+                            tv_rank_rirun_left.setText("NO:"+"__"+"\n￥__");
+                            tv_rank_rirun_right.setText("NO1:" + profits.getJSONArray(1).getString(1)
+                                    + "\n￥" + profits.getJSONArray(1).getIntValue(0));
                             profits.getJSONArray(1).getIntValue(0);//第一名  元
                             profits.getJSONArray(1).getString(1);//第一名
                             profits.getJSONArray(1).getIntValue(2);//第一名  元
                         } else {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                    "￥"+"__"+ " /NO.__",
+                                    "NO.__"+"\n￥"+"__",
                                     new String[]{
                                             "__","__"},ct.getResources().getColor(R.color.yellow_home));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,

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

@@ -611,14 +611,14 @@
     </style>
 
     <style name="crm_card_round_tv">
-        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">50dp</item>
        
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:layout_marginRight">1dp</item>
-        <item name="android:gravity">center</item>
+        <item name="android:gravity">center_vertical|left</item>
        
     </style>
 
@@ -639,8 +639,9 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
         <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._"</item>
+        <item name="android:text">"NO._\n￥__"</item>
     </style>
 
     <style name="crm_tv_ranking_right">
@@ -649,7 +650,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._:__/￥__"</item>
+        <item name="android:text">"NO._:__\n￥__"</item>
     </style>
     <!--crm sale-->
     <style name="crm_ll_sale" parent="LinearLayout_horizontal">