diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
index 321525a421..17b4168814 100644
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@@ -13,6 +13,12 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
@@ -66,12 +72,6 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import androidx.databinding.BindingAdapter;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
 /**
  * Created by khy on 12/02/18.
  */
@@ -227,7 +227,7 @@ public class BindingAdapters {
             view.setVisibility(View.VISIBLE);
         }
     }
-    
+
     /**
      * lazy 的 paddingTop
      */
@@ -633,27 +633,9 @@ public class BindingAdapters {
         }
     }
 
-    @BindingAdapter({"gameLabelList", "subjectTag"})
-    public static void setGameLabelList(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
-        if (gameEntity == null) return;
-        if (gameEntity.getTest() != null) {
-            layout.removeAllViews();
-            View testView = LayoutInflater.from(layout.getContext()).inflate(R.layout.game_test_label, null);
-            TextView testType = testView.findViewById(R.id.test_type);
-            TextView testTime = testView.findViewById(R.id.test_time);
-            testType.setText(gameEntity.getTest().getType());
-            testType.setBackgroundColor(ContextCompat.getColor(layout.getContext(), R.color.tag_yellow));
-
-            if (gameEntity.getTest().getStart() == 0) {
-                testTime.setVisibility(View.GONE);
-            } else {
-                testTime.setText(GameViewUtils.getGameTestDate(gameEntity.getTest().getStart()));
-            }
-            layout.addView(testView);
-        } else {
-            GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTag(), subjectTag, gameEntity.getTagStyle());
-        }
-
+    @BindingAdapter("gameLabelList")
+    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
+        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
     }
 
     @BindingAdapter("isRefreshing")
diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
index 08893ab6d6..19be73c0af 100644
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@@ -8,6 +8,12 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.collection.ArrayMap;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.CertificationDialog;
 import com.gh.common.dialog.DeviceRemindDialog;
@@ -34,12 +40,6 @@ import com.lightgame.utils.Utils;
 
 import java.util.concurrent.LinkedBlockingQueue;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.collection.ArrayMap;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * todo 下载判断不能以按钮文案为判断条件,否则按钮文案修改时又要修改判断逻辑
  */
@@ -130,11 +130,6 @@ public class DownloadItemUtils {
             holder.gameDownloadBtn.setTextColor(Color.WHITE);
             holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_dn);
         }
-        if (gameEntity.isLibaoExists()) {
-            holder.gameLibaoIcon.setVisibility(View.VISIBLE);
-        } else {
-            holder.gameLibaoIcon.setVisibility(View.GONE);
-        }
     }
 
     public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder,
@@ -157,12 +152,6 @@ public class DownloadItemUtils {
             holder.gameDownloadBtn.setVisibility(View.VISIBLE);
         }
 
-        if (gameEntity.isLibaoExists()) {
-            holder.gameLibaoIcon.setVisibility(View.VISIBLE);
-        } else {
-            holder.gameLibaoIcon.setVisibility(View.GONE);
-        }
-
         // 显示预约
         if (gameEntity.isReservable()) {
             holder.gameDes.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java
index 6282b22160..9d827d533b 100644
--- a/app/src/main/java/com/gh/common/util/GameViewUtils.java
+++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java
@@ -10,6 +10,9 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+
+import com.gh.common.view.DrawableView;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.entity.TagStyleEntity;
 
@@ -21,8 +24,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import androidx.core.content.ContextCompat;
-
 /**
  * @author 温冠超
  * @email 294299195@qq.com
@@ -32,21 +33,16 @@ import androidx.core.content.ContextCompat;
  */
 public class GameViewUtils {
 
-    public static void setLabelList(Context context, LinearLayout labelLayout, List<String> tag, String tagType, List<TagStyleEntity> tagStyle) {
+    public static void setLabelList(Context context, LinearLayout labelLayout, List<TagStyleEntity> tagStyle) {
         labelLayout.removeAllViews();
-        if (tag == null || tag.isEmpty()) {
-            labelLayout.addView(getGameTagView(context, "官方版", 0, tagType, null));
+        if (tagStyle == null || tagStyle.isEmpty()) {
+            TagStyleEntity tagEntity = new TagStyleEntity();
+            tagEntity.setName("官方版");
+            labelLayout.addView(getNewGameTagView(context, tagEntity, 0));
         } else {
-            for (int i = 0, size = tag.size(); i < size; i++) {
-                View view;
-                if (i == size - 1) {
-                    view = getGameTagView(context, tag.get(i), 0, tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
-                } else {
-                    view = getGameTagView(context, tag.get(i), DisplayUtils.dip2px(context, 8), tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
-                }
-                if (view != null) {
-                    labelLayout.addView(view);
-                }
+            for (int i = 0, size = tagStyle.size(); i < size; i++) {
+                View view = getNewGameTagView(context, tagStyle.get(i), i == size - 1 ? 0 : DisplayUtils.dip2px(context, 8));
+                labelLayout.addView(view);
                 if (labelLayout.getChildCount() == 3) {
                     break;
                 }
@@ -76,6 +72,28 @@ public class GameViewUtils {
         }
     }
 
+    // 新的游戏标签样式 version>=4.0.0
+    private static TextView getNewGameTagView(Context context, TagStyleEntity tagEntity, int rightMargin) {
+        LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
+                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        lparams.rightMargin = rightMargin;
+        TextView tag = new TextView(context);
+        tag.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+        tag.setSingleLine(true);
+        tag.setText(tagEntity.getName());
+        tag.setLayoutParams(lparams);
+        tag.setPadding(
+                DisplayUtils.dip2px(context, 4),
+                0,
+                DisplayUtils.dip2px(context, 4),
+                DisplayUtils.dip2px(context, 1));
+
+        // todo 背景要色
+        tag.setTextColor(context.getResources().getColor(R.color.theme_font));
+        tag.setBackground(DrawableView.getOvalDrawable(R.color.text_E8F3FF, 2));
+        return tag;
+    }
+
     private static TextView getGameTagView(Context context, String tagStr, int rightMargin, String tagType, TagStyleEntity tagEntity) {
         LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
                 LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt
index aa8e129038..1f31035f0a 100644
--- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt
@@ -54,7 +54,6 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa
                 holder.initServerType(gameEntity)
                 holder.binding.subjectTag = "type"
                 holder.binding.executePendingBindings()
-                holder.binding.gameLibaoIcon.visibleIf(gameEntity.isLibaoExists)
 
                 holder.itemView.setOnClickListener {
                     GameDetailActivity.startGameDetailActivity(mContext, gameEntity.id, "(浏览记录:游戏)")
diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml
index 476ac97982..6dbfe434eb 100644
--- a/app/src/main/res/layout/game_attach_item.xml
+++ b/app/src/main/res/layout/game_attach_item.xml
@@ -34,18 +34,6 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:roundedCornerRadius="5dp" />
 
-            <ImageView
-                android:id="@+id/libao_icon"
-                visibleGone="@{game.isLibaoExists}"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:src="@drawable/game_libao_icon"
-                android:visibility="visible"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/game_horizontal_item.xml b/app/src/main/res/layout/game_horizontal_item.xml
index 5640cbe678..abd9382480 100644
--- a/app/src/main/res/layout/game_horizontal_item.xml
+++ b/app/src/main/res/layout/game_horizontal_item.xml
@@ -39,16 +39,6 @@
                 android:layout_centerInParent="true"
                 fresco:roundedCornerRadius="10dp" />
 
-            <ImageView
-                android:id="@+id/game_libao_icon"
-                visibleGone="@{game.libaoExists}"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:src="@drawable/game_libao_icon"
-                android:visibility="visible" />
-
         </RelativeLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml
index 82f2e50147..ba5fae6568 100644
--- a/app/src/main/res/layout/game_item.xml
+++ b/app/src/main/res/layout/game_item.xml
@@ -113,26 +113,26 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="22dp">
+                android:layout_height="28dp">
 
                 <TextView
                     android:id="@+id/game_des"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="6dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="11dp"
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:singleLine="true"
                     android:text="@{(game.apk.size > 0 &amp;&amp; !hideSize) ? game.getApk().get(0).getSize() + `  ` + game.brief : game.brief }"
                     android:textColor="@color/text_999999"
-                    android:textSize="11sp" />
+                    android:textSize="10sp" />
 
                 <LinearLayout
                     android:id="@+id/game_info"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="2.5dp"
+                    android:layout_marginTop="2dp"
                     android:orientation="horizontal"
                     android:visibility="gone">
 
@@ -178,12 +178,12 @@
 
             <LinearLayout
                 android:id="@+id/label_list"
-                gameLabelList="@{game}"
-                subjectTag="@{subjectTag}"
+                gameLabelList="@{game.tagStyle}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="fill_vertical"
-                android:orientation="horizontal" />
+                android:orientation="horizontal"
+                android:visibility="visible" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/home_game_item.xml b/app/src/main/res/layout/home_game_item.xml
index 81d994557b..c8a1191ee7 100644
--- a/app/src/main/res/layout/home_game_item.xml
+++ b/app/src/main/res/layout/home_game_item.xml
@@ -45,18 +45,6 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:roundedCornerRadius="5dp" />
 
-                <ImageView
-                    android:id="@+id/libao_icon"
-                    visibleGone="@{data.isLibaoExists}"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:src="@drawable/game_libao_icon"
-                    android:visibility="visible"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/item_game_detail_related_version.xml b/app/src/main/res/layout/item_game_detail_related_version.xml
index 5a05c3d6e6..7ecbb7f80a 100644
--- a/app/src/main/res/layout/item_game_detail_related_version.xml
+++ b/app/src/main/res/layout/item_game_detail_related_version.xml
@@ -29,26 +29,27 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="12dp"
             android:layout_marginTop="8dp"
+            android:text="@{relatedVersion.gameName}"
             android:textColor="@color/text_333333"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:text="@{relatedVersion.gameName}"
             app:layout_constraintStart_toEndOf="@+id/gameIconSdv"
             app:layout_constraintTop_toTopOf="@+id/gameIconSdv"
             tools:text="武侠小掌门" />
 
-        <TextView
+        <LinearLayout
             android:id="@+id/gameLabelTv"
+            gameLabelList="@{relatedVersion.gameTags}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="12dp"
             android:layout_marginBottom="8dp"
+            android:orientation="horizontal"
             android:textColor="@color/text_333333"
             android:textSize="11sp"
-            setGameTags="@{relatedVersion.gameTags}"
-            setMaxGameTags="@{3}"
             app:layout_constraintBottom_toBottomOf="@+id/gameIconSdv"
             app:layout_constraintStart_toEndOf="@+id/gameIconSdv"
             tools:text="全局加速/无需root" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 488bbeb8e6..b6c1a324dd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -170,4 +170,5 @@
     <color name="text_2A85FB">#2A85FB</color>
     <color name="text_F3F3F3">#F3F3F3</color>
     <color name="text_3CB9FF">#3CB9FF</color>
+    <color name="text_E8F3FF">#E8F3FF</color>
 </resources>
\ No newline at end of file