image update

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

@@ -31,7 +31,7 @@ public enum MainTab {
             return R.drawable.drawable_selector_task;
         }
     },
-    FgtMainAskGetMoney(R.string.main_tab_invite) {
+    FgtMainAskGetMoney(R.string.empty) {
         @Override
         public Fragment getFragment() {
 //            return SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();

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

@@ -210,9 +210,9 @@ public class ActMain extends BaseActYmPermissionCheck {
             View view = tab_container.getChildAt(index);
             if (view instanceof TextView) {
                 ((TextView) view).setText(mainTab.getStringId());
-                if (mainTab.getDrawableId() == R.drawable.drawable_selector_askgetmoney) {
-                    new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId(), 150 / 170.0f).commit();
-                }
+//                if (mainTab.getDrawableId() == R.drawable.drawable_selector_askgetmoney) {
+//                    new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId(), 150 / 170.0f).commit();
+//                }
             }
             tabs.add(view);
             final int position = index;

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

@@ -222,7 +222,6 @@ public class ActPay extends BaseActivity {
                         } else {
                             temp.append("respCode=").append(resp.respCode).append("\n").append("respMsg=").append(resp.respMsg);
                         }
-//                        Toast.makeText(RechargeAct.this, "onIpaynowTransResult:" + temp.toString(), Toast.LENGTH_LONG).show();
                         Log.e("PayRet----", temp.toString());
                         if (resp.respCode.equals("00")) {
                             status = STATUS_PAY_ORDER_SUCCESS;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -871,11 +871,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     //fullHomeList有数据时，要让fullHomeList上下遮盖相邻组件
     private void checkFullHomeList() {
-        if (/*SkinUtil.curPlugin == Plugin.skin_new_year && */!fullHomeList.isEmpty()) {
+        if (!fullHomeList.isEmpty()) {
             LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp(G.DENSITY).setTopMargin(-3).setBottomMargin(0));
             LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp().setTopMargin(0));
         } else {
-            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(0).setBottomMargin(0));
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(G.getRealPix(6)).setBottomMargin(0));
             LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp(G.DENSITY).setTopMargin(12));
         }
     }

app/src/main/res/color/selector_color_tab_game.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false" android:color="@color/main_tab" />
+    <item android:state_activated="true" android:color="#8c22e7" />
+    <item android:state_focused="true" android:color="#8c22e7" />
+    <item android:state_checked="true" android:color="#8c22e7"/>
+    <item android:state_selected="true" android:color="#8c22e7"/>
+    <item android:state_pressed="true" android:color="#8c22e7"/>
+    <item android:color="@color/main_tab"/>
+</selector>

app/src/main/res/color/selector_color_tab_home.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false" android:color="@color/main_tab" />
+    <item android:state_activated="true" android:color="#fb8b01" />
+    <item android:state_focused="true" android:color="#fb8b01" />
+    <item android:state_checked="true" android:color="#fb8b01"/>
+    <item android:state_selected="true" android:color="#fb8b01"/>
+    <item android:state_pressed="true" android:color="#fb8b01"/>
+    <item android:color="@color/main_tab"/>
+</selector>

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

@@ -21,7 +21,7 @@
     <View
         android:id="@+id/tab_line"
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="2px"
         android:layout_above="@id/tab_container"
         android:background="#e6e6e6" />
 
@@ -46,22 +46,18 @@
             android:gravity="center"
             android:paddingTop="@dimen/bottom_tab_pt"
             android:text="@string/tab_viewpager_gamestore"
-            android:textColor="@color/selector_color_main_tab"
+            android:textColor="@color/selector_color_tab_home"
             android:textSize="10sp" />
 
         <RadioButton
             android:id="@+id/tab_2"
-            android:layout_width="0dip"
-            android:layout_height="65dp"
+            android:layout_width="75dp"
+            android:layout_height="68dp"
             android:layout_gravity="bottom"
-            android:layout_weight="1"
-            android:background="#0000ff00"
+            android:background="@drawable/tab_big_yq"
             android:button="@null"
-            android:drawableTop="@drawable/drawable_selector_askgetmoney"
             android:gravity="center"
-            android:text="@string/mine_hoggerel"
-            android:textColor="@color/selector_color_main_tab"
-            android:textSize="10sp" />
+            android:textSize="0sp" />
 
         <RadioButton
             android:id="@+id/tab_3"
@@ -74,7 +70,7 @@
             android:gravity="center"
             android:paddingTop="@dimen/bottom_tab_pt"
             android:text="@string/tab_viewpager_classification"
-            android:textColor="@color/selector_color_main_tab"
+            android:textColor="@color/selector_color_tab_game"
             android:textSize="10sp" />
 
     </RadioGroup>

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

@@ -13,10 +13,17 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        style="@style/style_tab_2" />
+        style="@style/style_tab_3" />
+
+    <View
+        android:layout_below="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/media_white_DEDEDE"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
+        android:layout_marginTop="0.5dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/indicator" />

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

@@ -65,9 +65,9 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="13dp"
+                    android:layout_height="8dp"
                     android:layout_below="@id/home_notice_ll"
-                    android:background="@android:color/white"/>
+                    android:background="@color/bg_home_color"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/home_list_rv"
@@ -89,6 +89,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/bg_home_color"
+                    android:layout_marginTop="6dp"
                     android:layout_below="@id/home_list_more_iv" />
 
                 <ImageView

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

@@ -5,23 +5,21 @@
     android:layout_height="wrap_content"
     android:padding="7dp">
 
-    <ImageView
-        android:id="@+id/notice_currenttime_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="3dp"
-        android:layout_marginEnd="5dp"
-        android:src="@mipmap/homepage_mianyangtt" />
-
     <LinearLayout
         android:id="@+id/homepage_notice_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:gravity="center"
         android:orientation="horizontal">
 
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="3dp"
+            android:padding="4dp"
+            android:layout_marginEnd="5dp"
+            android:src="@mipmap/ic_notify" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,15 +53,22 @@
         android:textSize="10sp"
         android:textColor="#37C1F3"
         android:layout_marginEnd="9dp"
-        android:text="详情"/>
+        android:text="查看详情"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/homepage_notice_layout"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:gravity="center"
         android:orientation="horizontal">
 
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:padding="4dp"
+            android:layout_marginStart="3dp"
+            android:layout_marginEnd="5dp"
+            android:src="@mipmap/ic_trend" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -411,6 +411,19 @@
         <item name="tabTextColor">#90ffffff</item>
     </style>
 
+    <style name="style_tab_3">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="tabBackground">@android:color/transparent</item>
+        <item name="tabIndicatorHeight">2dp</item>
+        <item name="tabGravity">center</item>
+        <item name="tabIndicatorColor">@color/white</item>
+        <item name="tabMode">scrollable</item>
+        <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearance2</item>
+        <item name="tabSelectedTextColor">@color/black_333333</item>
+        <item name="tabTextColor">@color/black_999999</item>
+    </style>
+
     <style name="style_tab_askgetmoney">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">36dp</item>

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

@@ -27,5 +27,6 @@
 
 
     <string name="label_download_mgr">下载管理</string>
+    <string name="empty"></string>
 
 </resources>