ui tune up

app/src/main/java/com/sheep/gamegroup/model/entity/Applications.java

@@ -98,7 +98,7 @@ public class Applications implements IDownload, IGameGroup, Serializable {
     //道具数量
     private int welfare_num = 0;
     //赏金数量
-    private double reward_num = 0;
+    private double reward_sum = 0;
 
     public int getGame_discount_id() {
         return game_discount_id;
@@ -542,11 +542,11 @@ public class Applications implements IDownload, IGameGroup, Serializable {
         this.welfare_num = welfare_num;
     }
 
-    public double getRewardNum() {
-        return reward_num;
+    public double getRewardSum() {
+        return reward_sum;
     }
 
-    public void setRewardNum(double reward_num) {
-        this.reward_num = reward_num;
+    public void setRewardSum(double reward_sum) {
+        this.reward_sum = reward_sum;
     }
 }

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -90,8 +90,7 @@ public class FgtGameCenter extends BaseFragment {
 
             @Override
             public void onPageSelected(int i) {
-                ViewUtil.setVisibility(downloadBtn, i == 0);
-                ViewUtil.setVisibility(searchBtn, i == 0);
+
             }
 
             @Override

app/src/main/java/com/sheep/gamegroup/module/game/util/FocusGameHelper.java

@@ -81,7 +81,7 @@ public class FocusGameHelper {
     private void bindData() {
         ViewUtil.setText(titleView, apps.getName());
         ViewUtil.setText(sizeView, apps.getPackage_size() + "M");
-        tagView1.setText("赏金￥" + apps.getRewardNum());
+        tagView1.setText("赏金￥" + apps.getRewardSum());
         tagView2.setText("福利" + apps.getWelfareNum());
         tagView3.setText("礼包" + apps.getGiftNum());
 

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -513,8 +513,11 @@ public class TestUtil {
             case "测试支付":
                 Jump2View.getInstance().goActPay(activity, "6460393611589586944", SpUtils.getToken(activity));
                 break;
-            case "测试内部h5":
-                Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString(), "小绵羊官网");
+            case "测试内部h5": {
+//                Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString(), "小绵羊官网");
+                String url = "http://10.8.240.155:8082/#/game-coupon?authorization=64239%40de829becddb652d85efa02b312184abb&pf=android.sheep.app&device_id=e90a3bf5f9cfd223&invitation_code=73214122";
+                Jump2View.getInstance().goWeb(activity, url, "小绵羊官网");
+            }
                 break;
             case "测试外部h5":
                 Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString());

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

@@ -121,7 +121,7 @@ public class ActMain extends BaseActYmPermissionCheck {
 //             } else {
 //                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);//白色
 //             }
-            flag |= isDark ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : View.SYSTEM_UI_FLAG_VISIBLE;
+            flag |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
             flag |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
                     View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | // hide

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

@@ -14,7 +14,7 @@
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
         style="@style/style_tab_2"
-        android:layout_marginTop="20dp" />
+        android:layout_marginTop="26dp" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -16,7 +16,7 @@
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp">
+        android:layout_marginTop="26dp">
 
         <ImageView
             android:id="@+id/back_btn"

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

@@ -7,7 +7,7 @@
     <View
         android:id="@+id/home_search_top"
         android:layout_width="match_parent"
-        android:layout_height="20dp" />
+        android:layout_height="26dp" />
 
     <ImageView
         android:id="@+id/home_search_msg_iv"

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

@@ -4,10 +4,6 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/bg_home_color"/>
     <!--<include layout="@layout/hp_game_welfare_entrance"/>-->
     <TextView
         android:id="@+id/hp_focus_tv1"
@@ -73,7 +69,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/shape_red_stroke_rectangle_3_radius"
                 android:padding="2dp"
-                android:textColor="#cc8e8e8e"
+                android:textColor="@color/red_FD2D54"
                 android:textSize="10sp" />
 
             <TextView
@@ -85,7 +81,7 @@
                 android:padding="2dp"
                 android:singleLine="true"
                 android:text=""
-                android:textColor="#cc8e8e8e"
+                android:textColor="@color/red_FD2D54"
                 android:textSize="10sp"
                 android:visibility="gone" />
 
@@ -98,7 +94,7 @@
                 android:layout_marginStart="@dimen/content_padding"
                 android:singleLine="true"
                 android:text=""
-                android:textColor="#cc8e8e8e"
+                android:textColor="@color/red_FD2D54"
                 android:textSize="10sp"
                 android:visibility="gone" />
         </LinearLayout>

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

@@ -24,6 +24,7 @@
         android:layout_marginRight="20dp"
         android:layout_marginLeft="10dp"
         android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:paddingLeft="8dp"
         android:orientation="vertical">
     </LinearLayout>