Prechádzať zdrojové kódy

添加了共用按钮style

zengjiebin 8 rokov pred
rodič
commit
b9b76f2672

+ 9 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/LieMakeMoneyAct.java

@@ -92,20 +92,24 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
             }
         });
     }
-
+    private boolean isFirst = true;
     @Override
     protected void onResume() {
         super.onResume();
-        if(presenter == null){
-            if(BuildConfig.DEBUG) G.showToast("请刷新项目重试");
+        if(isFirst){
+            isFirst = false;
             return;
         }
-        presenter.getWebchat();
+        initData();
     }
 
     @Override
     public void initData() {
-
+        if(presenter == null){
+            if(BuildConfig.DEBUG) G.showToast("请刷新项目重试");
+            return;
+        }
+        presenter.getWebchat();
     }
 
     public static final int STATE_ON_HOOK_UNVERIFIED = 0;//未验证

BIN
app/src/main/res/drawable-xhdpi/commit_wx_logo.png


BIN
app/src/main/res/drawable-xhdpi/commit_wx_pwd.png


BIN
app/src/main/res/drawable-xxhdpi/commit_wx_logo.png


BIN
app/src/main/res/drawable-xxhdpi/commit_wx_pwd.png


+ 2 - 7
app/src/main/res/layout/activity_guide_on_hook.xml

@@ -19,11 +19,6 @@
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
     <TextView
         android:id="@+id/tv_next"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        style="@style/full.button_main"
-        android:gravity="center"
-        android:layout_margin="@dimen/content_padding_10"
-        android:text="下一步"
-        android:textSize="@dimen/text_size_15" />
+        style="@style/style_button"
+        android:text="下一步" />
 </LinearLayout>

+ 2 - 8
app/src/main/res/layout/commit_wx_make_money.xml

@@ -72,14 +72,8 @@
 
         <TextView
             android:id="@+id/tv_wx_commit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/style_button"
             android:layout_gravity="center_horizontal"
-            android:layout_margin="10dp"
-            style="@style/full.button_main"
-            android:gravity="center"
-            android:padding="@dimen/content_padding_10"
-            android:text="确定"
-            android:textSize="@dimen/text_size_18" />
+            android:text="确 定" />
     </LinearLayout>
 </LinearLayout>

+ 9 - 1
app/src/main/res/values/dd_styles.xml

@@ -55,7 +55,15 @@
         <item name="android:progressDrawable">@drawable/process_default</item>
         <!--<item name="android:indeterminateDrawable">@color/W</item>-->
     </style>
-
+    <style name="style_button" parent="button">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
     <style name="full.button_main" parent="button">
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>