bug解决

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

@@ -42,12 +42,12 @@ public class SubcribeManageActivity extends BaseActivity{
         mSubscriptionMyFragment = BaseFragment.newInstance(SubscriptionMyFragment.class);
 
         mSubscribeFragments = new ArrayList<>();
-        mSubscribeFragments.add(mSubscriptionMyFragment);
         mSubscribeFragments.add(mSubscriptionAllFragment);
+        mSubscribeFragments.add(mSubscriptionMyFragment);
 
         mTitleStrings = new ArrayList<>();
-        mTitleStrings.add("已订阅");
         mTitleStrings.add("未订阅");
+        mTitleStrings.add("已订阅");
         mSubscribeManegeVpAdapter = new SubscribeManegeVpAdapter(this,mSubscribeFragments,mTitleStrings,getSupportFragmentManager());
 
         mViewPager.setAdapter(mSubscribeManegeVpAdapter);

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

@@ -50,6 +50,7 @@ import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -404,7 +405,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         set1.setColors(JOYFUL_COLORS);
         //set1.setVisible(false);
         //set1.setDrawValues(false);
-        set1.setValueFormatter(new ValueFormatter() {
+        /*set1.setValueFormatter(new ValueFormatter() {
             private DecimalFormat mFormat;
 
             public void DefaultValueFormatter(int digits) {
@@ -431,7 +432,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 }
                 return "";
             }
-        });
+        });*/
         dataSets.clear();
         dataSets.add(set1);
 
@@ -814,9 +815,12 @@ 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[1] = target.getIntValue("RANK");
-                        ydata[0] = target.getFloatValue("FIRSTBFCOUNT");
+                        float firstbfcount = target.getFloatValue("FIRSTBFCOUNT");
+                        BigDecimal bigDecimal = new BigDecimal(firstbfcount);
+                        ydata[0] = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
                         ydata[3] = target.getIntValue("TOPCOUNT");
-                        ydata[2] = target.getFloatValue("ACTUALPROFIT");
+                        bigDecimal = new BigDecimal(target.getFloatValue("ACTUALPROFIT"));
+                        ydata[2] = bigDecimal.setScale(2,BigDecimal.ROUND_HALF_UP).floatValue();
                         setData(7, ydata);
                     } else {
                         float[] ydata = {0, 0, 0, 0, 0, 0, 0};

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -190,7 +190,7 @@ public class SubscriptionActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscription);
-        getSupportActionBar().setTitle("");
+        getSupportActionBar().setTitle("订阅号");
         initView();
         init();
     }

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

@@ -131,7 +131,7 @@
                     android:text="筛选" />
             </RelativeLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <!--<View style="@style/app_line_gray_1dp"></View>-->
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -243,7 +243,7 @@
                        android:id="@+id/ib_sale_condition" />-->
             </RelativeLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <!--<View style="@style/app_line_gray_1dp"></View>-->
 
             <LinearLayout
                 style="@style/crm_ll_sale"
@@ -457,7 +457,7 @@
                      android:id="@+id/ib_em_condition" />-->
             </RelativeLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <!--<View style="@style/app_line_gray_1dp"></View>-->
 
             <LinearLayout
                 style="@style/LinearLayout_horizontal"
@@ -465,22 +465,21 @@
                 android:padding="10dp">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:text="              " />
+                    android:layout_weight="1.5" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
                     android:gravity="center"
                     android:text="计划销售额/毛利润\n（万元）" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
                     android:gravity="center"
                     android:text="实际销售额/毛利润\n（万元）" />
             </LinearLayout>
@@ -492,21 +491,23 @@
 
                 <TextView
                     android:id="@+id/tv_em_a"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="沈佳" />
 
                 <TextView
                     android:id="@+id/tv_em_plana"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
                 <TextView
                     android:id="@+id/tv_em_salea"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
@@ -520,21 +521,23 @@
 
                 <TextView
                     android:id="@+id/tv_em_b"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="沈佳" />
 
                 <TextView
                     android:id="@+id/tv_em_planb"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
                 <TextView
                     android:id="@+id/tv_em_saleb"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
@@ -548,21 +551,23 @@
 
                 <TextView
                     android:id="@+id/tv_em_c"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    android:layout_weight="1"
+                    android:layout_weight="1.5"
                     android:text="沈佳" />
 
                 <TextView
                     android:id="@+id/tv_em_planc"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
                 <TextView
                     android:id="@+id/tv_em_salec"
                     style="@style/TextView_VerticalCenter"
+                    android:layout_width="0dp"
                     android:layout_weight="2"
                     android:text=" 万元" />
 
@@ -789,7 +794,7 @@
                     android:text="筛选" />
             </RelativeLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <!--<View style="@style/app_line_gray_1dp"></View>-->
 
             <LinearLayout
                 style="@style/LinearLayout_horizontal"
@@ -880,7 +885,7 @@
                     android:textColor="@color/gray_light" />
             </RelativeLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <!--<View style="@style/app_line_gray_1dp"></View>-->
 
             <LinearLayout
                 android:id="@+id/ll_customer_lost"

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

@@ -491,8 +491,8 @@
                 android:hint="请输入"
                 android:text=" "
                 whatever:testType="regexp"
-                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\s]{0,50}$"
-                whatever:testErrorString="限定字符长度不大于50" />
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\s]{0,200}$"
+                whatever:testErrorString="限定字符长度不大于200" />
         </RelativeLayout>
         
         <LinearLayout

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

@@ -755,7 +755,8 @@
     <style name="TextView_VerticalCenter">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">top</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <style name="TextView_Basic">