Browse Source

公告支持h5内容显示;我的资产中充值跳转充值绵羊币

zengjiebin 8 years ago
parent
commit
8e155a157a

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -111,7 +111,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goWithdrawal(ActMyMoney.this, null);
                 break;
             case R.id.my_money_recharge_tv://充值
-                Jump2View.getInstance().goRechargeQAct(ActMyMoney.this, null);
+                Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);
                 break;
         }
     }

File diff suppressed because it is too large
+ 50 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/ActNotice.java


+ 35 - 34
app/src/main/res/layout/act_notice.xml

@@ -6,49 +6,50 @@
 
     <include layout="@layout/title" />
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:layout_margin="@dimen/content_padding_10"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+        android:layout_weight="1"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:orientation="vertical"
+        android:padding="@dimen/content_padding_10">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/act_notice_title_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="@dimen/content_padding_10">
+            android:layout_marginStart="2dp"
+            android:text="@string/app_name"
+            android:textColor="#444444"
+            android:textSize="15sp" />
 
-            <TextView
-                android:id="@+id/act_notice_title_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:text="@string/app_name"
-                android:textColor="#444444"
-                android:textSize="15sp" />
+        <TextView
+            android:id="@+id/act_notice_time_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/app_name"
+            android:textColor="#afafaf"
+            android:textSize="12sp" />
 
-            <TextView
-                android:id="@+id/act_notice_time_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:layout_marginTop="8dp"
-                android:text="@string/app_name"
-                android:textColor="#afafaf"
-                android:textSize="12sp" />
+        <TextView
+            android:id="@+id/act_notice_content_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:lineSpacingExtra="5dp"
+            android:scrollbars="vertical"
+            android:text="@string/app_name"
+            android:textColor="#939393"
+            android:textSize="13sp" />
+        <WebView
+            android:id="@+id/act_notice_content_wb"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
-            <TextView
-                android:id="@+id/act_notice_content_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:lineSpacingExtra="5dp"
-                android:text="@string/app_name"
-                android:textColor="#939393"
-                android:textSize="13sp" />
-        </LinearLayout>
-    </ScrollView>
+    </LinearLayout>
 
     <TextView
         android:id="@+id/act_notice_back_tv"