优化各种界面

app/src/main/java/com/sheep/gamegroup/view/activity/ActUserLabelList.java

@@ -166,6 +166,10 @@ public class ActUserLabelList extends BaseActivity {
                             public void onError(BaseMessage baseMessage) {
                                 LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
+                                if(BuildConfig.DEBUG){
+                                    Jump2View.getInstance().goHomePageView(ActUserLabelList.this, null);
+                                    finish();
+                                }
                             }
                         });
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/RechargePriceAdapter.java

@@ -51,8 +51,11 @@ public class RechargePriceAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder = null;
-        if (holder == null) {
+        Object tag = convertView == null ? null :convertView.getTag();
+        ViewHolder holder;
+        if (tag instanceof ViewHolder) {
+            holder = (ViewHolder) tag;
+        }else {
             holder = new ViewHolder();
             convertView = LayoutInflater.from(context).inflate(R.layout.rechargeprice_gridview_item, null);
 
@@ -65,20 +68,18 @@ public class RechargePriceAdapter extends BaseAdapter {
             convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, ViewGroup.LayoutParams.WRAP_CONTENT));
 //            convertView.setPadding(0,0,0,2);
             convertView.setTag(holder);
-        }else {
-            holder = (ViewHolder) convertView.getTag();
         }
         RechargePriceEntity priceShow = getItem(position);
         if(inPut){
-            convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
-            holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+            convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+            holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
         }else{
             if (priceShow.isSelectState()){
-                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_hold));
-                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.white));
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
             }else{
-                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
-                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
             }
         }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/RechargeQAdapter.java

@@ -52,8 +52,11 @@ public class RechargeQAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder = null;
-        if (holder == null) {
+        Object tag = convertView == null ? null :convertView.getTag();
+        ViewHolder holder;
+        if (tag instanceof ViewHolder) {
+            holder = (ViewHolder) tag;
+        }else {
             holder = new ViewHolder();
             convertView = LayoutInflater.from(context).inflate(R.layout.rechargeq_gridview_item, null);
 
@@ -67,23 +70,21 @@ public class RechargeQAdapter extends BaseAdapter {
             convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, ViewGroup.LayoutParams.WRAP_CONTENT));
 //            convertView.setPadding(0,0,0,2);
             convertView.setTag(holder);
-        }else {
-            holder = (ViewHolder) convertView.getTag();
         }
         RechargeQEntity priceShow = getItem(position);
         if(isInPut){
-            convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
-            holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
-            holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+            convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+            holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
+            holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
         }else{
             if (priceShow.isSelectState()){
-                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_hold));
-                holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.white));
-                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.white));
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
+                holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
             }else{
-                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
-                holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
-                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+                holder.item_tv_qb.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
             }
         }
 

app/src/main/res/drawable/btn_main_stroke_no_check.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/radius_25" />
+    <corners android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@color/main_tab" />

app/src/main/res/drawable/btn_main_stroke_no_check_small.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/main_tab" />
+</shape>

app/src/main/res/drawable/layer_list_check_rectgangle.xml

@@ -4,7 +4,7 @@
     <item>
         <shape
             android:shape="rectangle">
-            <corners android:radius="@dimen/radius_25" />
+            <corners android:radius="15dp" />
             <solid
                 android:color="@color/theme_app_highlight_more_trans" />
         </shape>
@@ -13,7 +13,7 @@
     <item>
         <shape xmlns:android="http://schemas.android.com/apk/res/android"
             android:shape="rectangle">
-            <corners android:radius="@dimen/radius_25" />
+            <corners android:radius="15dp" />
             <stroke
                 android:width="1dp"
                 android:color="@color/theme_app_highlight_more" />

app/src/main/res/drawable/layer_list_check_rectgangle_small.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--第一层-->
+    <item>
+        <shape
+            android:shape="rectangle">
+            <corners android:radius="10dp" />
+            <solid
+                android:color="@color/theme_app_highlight_more_trans" />
+        </shape>
+    </item>
+    <!--第二层-->
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle">
+            <corners android:radius="10dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/theme_app_highlight_more" />
+        </shape>
+    </item>
+
+</layer-list>

app/src/main/res/drawable/shape_blue_stroke_rectangle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="11dp" />
+    <corners android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@color/blue_end" />

app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_white.xml

@@ -10,7 +10,7 @@
                 android:color="@color/white_ededed"
                 />
 
-            <corners android:radius="15dp" />
+            <corners android:radius="10dp" />
         </shape>
     </item>
     <!--第二层-->
@@ -26,7 +26,7 @@
                 android:width="0.33dp"
                 android:color="@color/white" />
 
-            <corners android:radius="15dp" />
+            <corners android:radius="10dp" />
         </shape>
     </item>
 

app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_white_big.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--第一层-->
+    <item>
+        <shape>
+            <solid android:color="@color/white_ededed" />
+            <!--描边-->
+            <stroke
+                android:width="1px"
+                android:color="@color/white_ededed"
+                />
+
+            <corners android:radius="15dp" />
+        </shape>
+    </item>
+    <!--第二层-->
+    <item
+        android:left="1px"
+        android:top="1px"
+        android:bottom="1px"
+        android:right="1px">
+        <shape>
+            <solid android:color="@color/white" />
+            <!--描边-->
+            <stroke
+                android:width="0.33dp"
+                android:color="@color/white" />
+
+            <corners android:radius="15dp" />
+        </shape>
+    </item>
+
+</layer-list>

app/src/main/res/layout/act_my_money.xml

@@ -19,6 +19,7 @@
             android:id="@+id/img_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/layout_heigh_default"
+            android:paddingEnd="@dimen/content_padding_20"
             android:gravity="center_vertical"
             android:scaleType="centerInside"
             android:src="@drawable/narrow_back_white"
@@ -60,6 +61,7 @@
                 android:id="@+id/my_money_agent_extract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
                 android:text="@string/agent_extract"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
@@ -154,7 +156,7 @@
                 android:layout_marginStart="@dimen/content_padding_10"
                 android:layout_weight="1"
                 android:textColor="@color/gray_4"
-                android:textSize="17sp"
+                android:textSize="15sp"
                 android:text="充值"/>
             <ImageView
                 android:layout_width="15dp"
@@ -190,7 +192,7 @@
                 android:layout_marginStart="@dimen/content_padding_10"
                 android:layout_weight="1"
                 android:textColor="@color/gray_4"
-                android:textSize="17sp"
+                android:textSize="15sp"
                 android:text="提现"/>
             <ImageView
                 android:layout_width="15dp"

app/src/main/res/layout/homepage_item_top2.xml

@@ -71,10 +71,10 @@
             android:id="@+id/recharge"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white_big"
             android:gravity="center"
             android:minWidth="100dp"
-            android:text="充值"
+            android:text="充 值"
             android:textColor="@color/blue_34a6e7"
             android:textSize="@dimen/text_size_4"
             android:layout_alignParentRight="true"
@@ -86,7 +86,7 @@
             android:layout_width="wrap_content"
             android:layout_height="30dp"
             android:layout_alignParentEnd="true"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white_big"
             android:gravity="center"
             android:minWidth="100dp"
             android:text="提 现"

app/src/main/res/layout/rechargeprice_gridview_item.xml

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10"
+    android:paddingTop="5dp"
+    android:paddingBottom="5dp"
     android:orientation="vertical">
 
     <TextView

app/src/main/res/layout/sign_record_layout.xml

@@ -21,14 +21,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/content_padding_10"
-        android:layout_marginRight="@dimen/content_padding_10"
+        android:layout_marginLeft="@dimen/content_padding_20"
+        android:layout_marginRight="@dimen/content_padding_20"
         android:layout_marginTop="@dimen/content_padding_10"
         android:orientation="horizontal">
 
         <TextView
             android:layout_width="0.0dp"
-            android:layout_height="22dp"
+            android:layout_height="30dp"
             android:layout_weight="1"
             android:background="@drawable/shape_blue_stroke_rectangle"
             android:gravity="center"
@@ -38,8 +38,8 @@
 
         <TextView
             android:layout_width="0.0dp"
-            android:layout_height="22dp"
-            android:layout_marginLeft="30dp"
+            android:layout_height="30dp"
+            android:layout_marginStart="40dp"
             android:layout_weight="1"
             android:background="@drawable/shape_blue_stroke_rectangle"
             android:gravity="center"
@@ -53,8 +53,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/content_padding_10"
-        android:layout_marginRight="@dimen/content_padding_10"
+        android:layout_marginLeft="@dimen/content_padding_20"
+        android:layout_marginRight="@dimen/content_padding_20"
         android:layout_marginTop="@dimen/content_padding_10"
         android:orientation="horizontal">
 
@@ -72,7 +72,7 @@
             android:id="@+id/sign_tv_ljjj"
             android:layout_width="0.0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_marginStart="40dp"
             android:layout_weight="1"
             android:gravity="center"
             android:text="0.00元"

app/src/main/res/layout/tab_item.xml

@@ -17,7 +17,7 @@
             android:gravity="center"
             android:text="TAB"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="15sp" />
 
         <View
             android:id="@+id/tab_line"

app/src/main/res/layout/user_label_item.xml

@@ -11,15 +11,15 @@
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
     <ImageView
         android:id="@+id/user_label_iv"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
         app:layout_constraintStart_toStartOf="parent"
         android:src="@mipmap/user_label"/>
     <TextView
         android:id="@+id/user_label_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="20sp"
+        android:textSize="15sp"
         android:textColor="@color/black_6_3"
         android:layout_gravity="center_vertical"
         app:layout_constraintTop_toTopOf="@+id/user_label_iv"

app/src/main/res/layout/x_msg_dialog.xml

@@ -15,7 +15,7 @@
         android:text="内容"
         android:gravity="center"
         android:textColor="@color/black_text_deep"
-        android:textSize="20sp" />
+        android:textSize="14sp" />
     <TextView
         android:id="@+id/dialog_msg_more"
         android:layout_width="match_parent"
@@ -29,7 +29,7 @@
         android:gravity="center_horizontal"
         android:textColor="@color/red"
         android:visibility="gone"
-        android:textSize="24sp" />
+        android:textSize="14sp" />
     <include layout="@layout/x_msg_dialog_btn"/>
     <TextView
         android:id="@+id/dialog_tip"
@@ -43,5 +43,5 @@
         android:gravity="center_horizontal"
         android:textColor="@color/black_text_deep"
         android:visibility="gone"
-        android:textSize="18sp" />
+        android:textSize="14sp" />
 </merge>

app/src/main/res/values/dd_styles.xml

@@ -46,7 +46,7 @@
         <item name="android:textColor">@color/selector_color_main_tab</item>
         <item name="android:background">@drawable/selector_check_stroke_main</item>
         <item name="android:layout_margin">@dimen/content_padding_10</item>
-        <item name="android:textSize">@dimen/text_size_15</item>
+        <item name="android:textSize">@dimen/text_size_13</item>
     </style>
 
     <style name="style_button_margin15" parent="button">