Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -997,7 +997,7 @@ public interface ApiService {
     Observable<BaseMessage> getGiftBagList(@Query("page") int page, @Query("per_page") int per_page);
 
     /**
-     * 我的福利——我的礼包
+     * 我的礼包——我的礼包
      */
     @GET("app/gift_bag/my_gift_bag")
     Observable<BaseMessage> getMyGiftBagList(@Query("page") int page, @Query("per_page") int per_page);

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

@@ -2032,7 +2032,7 @@ public class Jump2View {
     }
 
     /**
-     * 进入我的福利界面
+     * 进入我的礼包界面
      */
     public void goMyWelfare(Activity activity) {
         Intent intent = new Intent(activity, ActMyWelfare.class);

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

@@ -166,7 +166,7 @@ public class UMConfigUtils {
         XIAOMI_GAME_RECEIVE("小米游戏账号领取"),//5123
         GAME_DOWNLOAD_WELFARE_LIST("下载福利列表"),
         GAME_GIFT_CENTER("礼包中心"),
-        GAME_MY_WELFARE("我的福利"),
+        GAME_MY_WELFARE("我的礼包"),
         BIND_QQ("绑定QQ"),
         BIND_WX("绑定微信"),
         GAME_EVERY_DAY_MORE("玩转游戏 -> 每日必做（type为0）或者近期最热（type为1）-> 更多  需要传type，如：{\"type\":1 } "),

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

@@ -36,7 +36,7 @@ public class ActMyWelfare extends BaseActivity {
         activity = this;
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
-                .setTitle(this, "我的福利")
+                .setTitle(this, "我的礼包")
                 .setTitleFinish(this);
 
     }
@@ -48,7 +48,7 @@ public class ActMyWelfare extends BaseActivity {
     @Override
     public void initListener() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(new FgtMyDownloadWelfareList(), "下载福利");
+        mAdapter.add(new FgtMyDownloadWelfareList(), "下载奖励");
         mAdapter.add(new FgtMyGift(), "我的礼包");
         mAdapter.add(new FgtWelfareUseRecord(), "使用记录");
         pager.setAdapter(mAdapter);

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

@@ -54,7 +54,7 @@ public class FgtGameCenter extends BaseFragment {
         backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
         mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
         mAdapter.add(new FgtPlayGame(), "玩转游戏");
-        mAdapter.add(new FgtWelfareCenter(), "福利中心");
+        mAdapter.add(new FgtWelfareCenter(), "礼包中心");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.setOffscreenPageLimit(3);

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

@@ -60,7 +60,7 @@
             android:lines="1"
             android:paddingEnd="17dp"
             android:paddingStart="17dp"
-            android:text="我的福利"
+            android:text="我的礼包"
             android:textColor="@color/black_text_deep"
             android:textSize="12sp"
             android:visibility="gone" />

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

@@ -42,7 +42,9 @@
         <TextView style="@style/style_item_end_next" />
 
     </LinearLayout>
-    <View style="@style/style_item_line_new"
+
+    <View
+        style="@style/style_item_line_new"
         android:visibility="gone" />
 
     <LinearLayout
@@ -62,7 +64,7 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new"/>
+    <View style="@style/style_item_line_new" />
 
     <LinearLayout
         android:id="@+id/order_layout"
@@ -83,16 +85,16 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new"/>
+    <View style="@style/style_item_line_new" />
 
     <RelativeLayout
         android:id="@+id/voucher_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/content_padding_16"
         android:paddingBottom="@dimen/content_padding_16"
-        android:paddingStart="@dimen/content_padding_8"
         android:paddingEnd="@dimen/content_padding_30"
+        android:paddingStart="@dimen/content_padding_8"
+        android:paddingTop="@dimen/content_padding_16"
         android:visibility="visible">
 
         <ImageView
@@ -104,33 +106,35 @@
             android:id="@+id/voucher_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/voucher_icon"
             android:layout_marginStart="12dp"
-            android:text="我的福利" />
+            android:layout_toRightOf="@+id/voucher_icon"
+            android:text="我的福利"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/voucher_red_dot"
-            android:text="new"
-            android:textColor="@android:color/white"
-            android:textSize="6sp"
-            android:rotation="-20"
-            android:padding="2dp"
-            android:layout_toRightOf="@+id/voucher_label"
-            android:layout_marginStart="4dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_red_solid_rectangle_18"/>
+            android:layout_marginStart="4dp"
+            android:layout_toRightOf="@+id/voucher_label"
+            android:background="@drawable/shape_red_solid_rectangle_18"
+            android:padding="2dp"
+            android:rotation="-20"
+            android:text="new"
+            android:textColor="@android:color/white"
+            android:textSize="6sp" />
 
         <TextView
-            android:layout_alignParentEnd="true"
             style="@style/style_item_end_next"
+            android:layout_alignParentEnd="true"
             android:visibility="visible" />
 
     </RelativeLayout>
 
     <View
         android:id="@+id/fgt_person_center_my_focus_line"
-        style="@style/style_item_line_new"/>
+        style="@style/style_item_line_new" />
 
     <LinearLayout
         android:id="@+id/fgt_person_center_my_focus"
@@ -174,8 +178,9 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new"
-        android:visibility="gone"/>
+    <View
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/proxy_game_account_layout"