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 c15eda4ff3..8e5a98a8fd 100644
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@@ -165,7 +165,7 @@ public class DownloadItemUtils {
                 } else if (gh_id == null || gh_id.equals(gameEntity.getId())) {
                     holder.gameDownloadBtn.setText(R.string.launch);
                     holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-                    holder.gameDownloadBtn.setBackgroundResource(R.drawable.detail_downloading_normal_style);
+                    holder.gameDownloadBtn.setBackgroundResource(R.drawable.detail_download_open_style);
                 } else {
                     holder.gameDownloadBtn.setText(R.string.download);
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
index 1ee6275c29..0cf5ecde31 100644
--- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
+++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
@@ -20,6 +20,9 @@ import com.gh.gamecenter.R;
 
 public class DownloadProgressBar extends ProgressBar {
     private static final int MAX_LENGTH = 1000;
+    private static final int DOWNLOAD_NORMAL_STYLE = 0;
+    private static final int DOWNLOAD_RECT_STYLE = 1;
+    private static final int DOWNLOAD_IMAGE_STYLE = 2;
 
     public enum DownloadType {
         NORMAL,
@@ -39,7 +42,7 @@ public class DownloadProgressBar extends ProgressBar {
 
     private String mText;
 
-    private boolean mIsRectStyle;
+    private int mDownloadStyle;
     private int mDefaultColor;
     private int mTextSize;
 
@@ -51,7 +54,7 @@ public class DownloadProgressBar extends ProgressBar {
         super(context, attrs);
         if (attrs != null) {
             TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.DownloadProgressBar);
-            mIsRectStyle = ta.getBoolean(R.styleable.DownloadProgressBar_rectStyle, false);
+            mDownloadStyle = ta.getInteger(R.styleable.DownloadProgressBar_downloadStyle, DOWNLOAD_NORMAL_STYLE);
             mTextSize = ta.getDimensionPixelSize(R.styleable.DownloadProgressBar_textSize, DisplayUtils.sp2px(getContext(), 14));
             ta.recycle();
         }
@@ -86,7 +89,7 @@ public class DownloadProgressBar extends ProgressBar {
         mPaint.setTextAlign(Paint.Align.CENTER);
         srcCanvas.drawText(mText, getWidth() / 2, baseline, mPaint);
         mPaint.setXfermode(mDuffXFerMode);
-        mPaint.setColor(Color.WHITE); // 反向颜色
+        mPaint.setColor(DOWNLOAD_IMAGE_STYLE == mDownloadStyle ? Color.BLACK : Color.WHITE); // 反向颜色
 
         srcCanvas.drawRect(rectF, mPaint);
         canvas.drawBitmap(srcBitmap, 0, 0, null);
@@ -109,34 +112,66 @@ public class DownloadProgressBar extends ProgressBar {
         switch (downloadType) {
             case NORMAL:
             case INSTALL_NORMAL:
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
-                        ? R.drawable.detail_download_normal_rect_style : R.drawable.game_item_btn_download_style));
-                mDefaultColor = Color.WHITE;
+                switch (mDownloadStyle) {
+                    case DOWNLOAD_RECT_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_normal_rect_style));
+                        mDefaultColor = Color.WHITE;
+                        break;
+                    case DOWNLOAD_IMAGE_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_normal_image_style));
+                        mDefaultColor = Color.BLACK;
+                        break;
+                    default:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.game_item_btn_download_style));
+                        mDefaultColor = Color.WHITE;
+                        break;
+                }
                 break;
             case PLUGIN:
             case INSTALL_PLUGIN:
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
+                setProgressDrawable(getResources().getDrawable(mDownloadStyle == DOWNLOAD_RECT_STYLE
                         ? R.drawable.detail_download_plugin_install_rect_style : R.drawable.game_item_btn_plugin_style));
                 mDefaultColor = Color.WHITE;
                 break;
             case NONE:
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
+                setProgressDrawable(getResources().getDrawable(mDownloadStyle == DOWNLOAD_RECT_STYLE
                         ? R.drawable.detail_download_none_rect_style : R.drawable.news_detail_comment));
                 mDefaultColor = ContextCompat.getColor(getContext(), R.color.hint);
                 break;
             case LAUNCH_OR_OPEN:
-                setProgress(0);
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
-                        ? R.drawable.detail_download_open_rect_style : R.drawable.detail_download_open_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                switch (mDownloadStyle) {
+                    case DOWNLOAD_RECT_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_rect_style));
+                        mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                        break;
+                    case DOWNLOAD_IMAGE_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_image_style));
+                        mDefaultColor = Color.WHITE;
+                        break;
+                    default:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_style));
+                        mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                        break;
+                }
                 break;
             case DOWNLOADING_NORMAL:
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
-                        ? R.drawable.detail_downloading_normal_rect_style : R.drawable.detail_downloading_normal_style));
-                mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                switch (mDownloadStyle) {
+                    case DOWNLOAD_RECT_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_rect_style));
+                        mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                        break;
+                    case DOWNLOAD_IMAGE_STYLE:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_image_style));
+                        mDefaultColor = Color.WHITE;
+                        break;
+                    default:
+                        setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style));
+                        mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme);
+                        break;
+                }
                 break;
             case DOWNLOADING_PLUGIN:
-                setProgressDrawable(getResources().getDrawable(mIsRectStyle
+                setProgressDrawable(getResources().getDrawable(mDownloadStyle == DOWNLOAD_RECT_STYLE
                         ? R.drawable.detail_downloading_plugin_rect_style : R.drawable.detail_downloading_plugin_style));
                 mDefaultColor = ContextCompat.getColor(getContext(), R.color.btn_plugin);
                 break;
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java
index 594d448a9d..9f6482c74c 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.BaseRecyclerViewHolder;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.databinding.GameImageItemBinding;
 
 import butterknife.BindView;
 
@@ -19,6 +20,14 @@ public class GameImageViewHolder extends BaseRecyclerViewHolder {
     @BindView(R.id.game_image_line)
     public View line;
 
+    public GameImageItemBinding binding;
+
+    public GameImageViewHolder(GameImageItemBinding bind) {
+        super(bind.getRoot());
+        this.binding = bind;
+    }
+
+
     public GameImageViewHolder(View itemView) {
         super(itemView);
     }
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java
index fb3fac02bb..858855942b 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java
@@ -48,23 +48,14 @@ public class GameViewHolder extends BaseRecyclerViewHolder {
 
     public void initServerType(GameEntity gameEntity, Context context) {
         int paddRight = 0;
-        String serverType = gameEntity.getServerType();
-        if (TextUtils.isEmpty(serverType)) {
+        String serverRemark = gameEntity.getServerRemark();
+        if (TextUtils.isEmpty(serverRemark)) {
             gameServerType.setVisibility(View.GONE);
         } else {
             gameServerType.setVisibility(View.VISIBLE);
-            gameServerType.setText(serverType);
-            if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
-                gameServerType.setBackgroundResource(R.drawable.textview_server_tag);
-                if ("删档内测".equals(serverType)) {
-                    paddRight = DisplayUtils.dip2px(context, 50);
-                } else {
-                    paddRight = DisplayUtils.dip2px(context, 60);
-                }
-            } else {
-                gameServerType.setBackgroundResource(R.drawable.textview_orange_up);
-                paddRight = DisplayUtils.dip2px(context, 30);
-            }
+            gameServerType.setText(serverRemark);
+            gameServerType.setBackgroundResource(R.drawable.textview_orange_up);
+            paddRight = DisplayUtils.dip2px(context, 50);
         }
         gameName.setPadding(0, 0, paddRight, 0);
     }
diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java
index a2e7e7b1bc..d22e185cde 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java
@@ -192,7 +192,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                             SpeedUtils.getSpeed(downloadEntity.getSpeed()),
                             SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024)));
                     viewHolder.dmDelete.setVisibility(View.GONE);
-                    viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style);
+                    viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg);
                     viewHolder.dmStartorpause.setText("暂停");
                     viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
                     viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%");
@@ -246,7 +246,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                                 downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024)));
                                 viewHolder.dmDelete.setVisibility(View.GONE);
 
-                                viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style);
+                                viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg);
                                 viewHolder.dmStartorpause.setText("暂停");
                                 viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
 
@@ -273,7 +273,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                                         downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024)));
                                         viewHolder.dmDelete.setVisibility(View.GONE);
 
-                                        viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style);
+                                        viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg);
                                         viewHolder.dmStartorpause.setText("暂停");
                                         viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
                                         statusMap.put(url, "downloading");
diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
index 7cc04e7f37..49d1ba7b24 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
@@ -54,10 +54,10 @@ class GameEntity : Parcelable {
     @SerializedName("libao_exists")
     var isLibaoExists: Boolean = false
 
-    @SerializedName("server_type")
-    var serverType: String? = null
+    @SerializedName("server_remark")
+    var serverRemark: String? = null
 
-    @SerializedName("server")
+    @SerializedName("servers")
     var serverList: List<KaiFuCalendarEntity>? = null
 
     var kaifuTimeHint: Long? = null
@@ -170,7 +170,7 @@ class GameEntity : Parcelable {
         dest.writeByte(if (this.isNewsExists) 1.toByte() else 0.toByte())
         dest.writeString(this.downloadOffText)
         dest.writeByte(if (this.isLibaoExists) 1.toByte() else 0.toByte())
-        dest.writeString(this.serverType)
+        dest.writeString(this.serverRemark)
         dest.writeValue(this.kaifuTimeHint)
     }
 
@@ -202,7 +202,7 @@ class GameEntity : Parcelable {
         this.isNewsExists = `in`.readByte().toInt() != 0
         this.downloadOffText = `in`.readString()
         this.isLibaoExists = `in`.readByte().toInt() != 0
-        this.serverType = `in`.readString()
+        this.serverRemark = `in`.readString()
         this.kaifuTimeHint = `in`.readValue(Long::class.java.classLoader) as Long?
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
index 54a4c0108e..344ec00125 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
@@ -10,6 +10,7 @@ import android.view.View
 import com.gh.base.fragment.BaseFragment
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.baselist.LoadStatus
 import com.gh.gamecenter.databinding.FragmentGameBinding
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.eventbus.EBPackage
@@ -72,10 +73,9 @@ class GameFragment : BaseFragment<Any>() {
         })
 
         mBinding?.gameRefresh?.setOnRefreshListener {
+            mViewModel?.loadStatus?.postValue(LoadStatus.INIT_LOADING)
             mViewModel?.initData()
         }
-
-        mBinding?.gameRefresh?.isRefreshing
     }
 
 
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
index b982ede97d..6bb53ac40a 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
@@ -17,10 +17,7 @@ import com.gh.gamecenter.*
 import com.gh.gamecenter.adapter.ImagePagerAdapter
 import com.gh.gamecenter.adapter.viewholder.*
 import com.gh.gamecenter.baselist.LoadStatus
-import com.gh.gamecenter.databinding.GameHeadItemBinding
-import com.gh.gamecenter.databinding.GameHorizontalListBinding
-import com.gh.gamecenter.databinding.GameItemBinding
-import com.gh.gamecenter.databinding.GameViewpagerItemBinding
+import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.halo.assistant.fragment.game.GamePluginAdapter
@@ -28,6 +25,7 @@ import com.halo.assistant.fragment.game.GamePluginViewHolder
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.download.DownloadEntity
 import java.util.*
+import kotlin.collections.ArrayList
 
 class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
 
@@ -50,7 +48,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
 
 
     fun setItemDataList(itemDataList: MutableList<ItemData>) {
-        mItemDataList = itemDataList
+        mItemDataList = itemDataList.toMutableList()
         notifyDataSetChanged()
     }
 
@@ -61,17 +59,17 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
 
 
     override fun getItemViewType(position: Int): Int {
+        if (position == 0) return ItemViewType.GAME_SLIDE
         if (itemCount == position + 1) return ItemViewType.LOADING
 
         val itemData = mItemDataList[position]
-        if (itemData.subjectDigest != null || itemData.slideList != null) return ItemViewType.GAME_SLIDE
         if (itemData.pluginList != null) return ItemViewType.GAME_PULGIN
         if (itemData.columnHead != null) return ItemViewType.COLUMN_HEADER
         if (itemData.game != null) return ItemViewType.GAME_NORMAL
         if (itemData.image != null) return ItemViewType.GAME_IMAGE
         if (itemData.horizontalColumn != null) return ItemViewType.GAME_SUBJECT
 
-        throw NullPointerException()
+        return ItemViewType.LOADING
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder? {
@@ -91,9 +89,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
             ItemViewType.GAME_NORMAL -> {
                 GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false)))
             }
-
             ItemViewType.GAME_IMAGE -> {
-                GameImageViewHolder(mLayoutInflater.inflate(R.layout.game_image_item, parent, false))
+                GameImageViewHolder(GameImageItemBinding.bind(mLayoutInflater.inflate(R.layout.game_image_item, parent, false)))
             }
             ItemViewType.COLUMN_HEADER -> {
                 GameHeadViewHolder(GameHeadItemBinding.bind(mLayoutInflater.inflate(R.layout.game_head_item, parent, false)))
@@ -116,7 +113,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
                     holder.binding.headMore.setOnClickListener({
                         if ("all" == column?.home) {
                             SubjectActivity.startSubjectActivity(mContext, column.id, column.name, column.isOrder, "(游戏-专题:" + column.name + "-全部)")
-                        } else{
+                        } else {
                             holder.binding.headPb.visibility = View.VISIBLE
                             mViewModel.changeSubjectGame(column?.id!!)
                         }
@@ -195,7 +192,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
                     val subjectDigestList = mItemDataList[position].subjectDigest
                     val binding = holder.binding
                     binding.list = subjectDigestList
-                    binding.clickListener = OnViewClickListener { _, data ->
+                    binding.clickListener = OnViewClickListener { v, data ->
                         if (data is Int) {
                             when (data) {
                                 0, 1, 2, 3 -> {
@@ -212,6 +209,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
                                     DataCollectionUtils.uploadPosition(mContext, "游戏", "4", "开服表")
                                 }
                             }
+                        } else {
+
                         }
                     }
 
@@ -290,9 +289,12 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
             ItemViewType.GAME_IMAGE -> {
                 if (holder is GameImageViewHolder) {
                     val entity = mItemDataList[position].image
+                    holder.binding.game = entity
+
                     val name = entity?.name
                     val link = entity?.link
-                    holder.image.setOnClickListener(View.OnClickListener {
+                    ImageUtils.getInstance().display(holder.binding.gameImageIcon, entity?.image, mContext.resources.displayMetrics.widthPixels - DisplayUtils.dip2px(mContext, 16F))
+                    holder.binding.gameImageIcon.setOnClickListener({
                         val kv = HashMap<String, Any>()
                         kv["名字"] = name!!
                         kv["位置"] = "大图"
@@ -338,7 +340,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel) : BaseRecycler
     }
 
     override fun getItemCount(): Int {
-        return mItemDataList.size + 1
+        return if (mItemDataList.size > 0) mItemDataList.size + 1 else mItemDataList.size
     }
 
     fun notifyItemByDownload(download: DownloadEntity) {
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt
index b1261f1511..d24375bfde 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt
@@ -33,7 +33,7 @@ class GameViewModel(application: Application) : AndroidViewModel(application) {
     var subjectList: MutableList<SubjectEntity> = ArrayList() // 专题
     var subjectDigestList: List<SubjectDigestEntity>? = null // 专题入口
 
-    var itemDataList: MutableLiveData<List<ItemData>> = MutableLiveData() // 轮播图
+    var itemDataList: MutableLiveData<List<ItemData>> = MutableLiveData()
 
     val loadStatus = MutableLiveData<LoadStatus>()
 
@@ -53,10 +53,14 @@ class GameViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     fun initData() {
+        slideList = null
+        pluginList = null
+        subjectList.clear()
+        subjectDigestList = null
+
         itemDataListCache.clear()
         loadStatus.postValue(LoadStatus.INIT_LOADED)
         getSlideData(true)
-        initPlugin()
     }
 
     fun initPlugin() {
@@ -130,11 +134,19 @@ class GameViewModel(application: Application) : AndroidViewModel(application) {
                 .subscribe(object : Response<List<SubjectDigestEntity>>() {
                     override fun onResponse(response: List<SubjectDigestEntity>) {
                         subjectDigestList = response
-                        if (initData) getSubjectList(initData)
+                        transformationItemData()
+                        if (initData) {
+                            initPlugin()
+                            getSubjectList(initData)
+                        }
                     }
 
                     override fun onFailure(e: HttpException) {
-                        if (initData) getSubjectList(initData)
+                        transformationItemData()
+                        if (initData) {
+                            initPlugin()
+                            getSubjectList(initData)
+                        }
                     }
                 })
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
index a75e9d7ff0..767debd44e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
@@ -309,23 +309,14 @@ public class GameDetailFragment extends NormalFragment {
         }
 
         int paddRight = 0;
-        String serverType = mGameEntity.getServerType();
-        if (TextUtils.isEmpty(serverType)) {
+        String serverRemark = mGameEntity.getServerRemark();
+        if (TextUtils.isEmpty(serverRemark)) {
             mServerType.setVisibility(View.GONE);
         } else {
             mServerType.setVisibility(View.VISIBLE);
-            mServerType.setText(serverType);
-            if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
-                mServerType.setBackgroundResource(R.drawable.textview_server_tag);
-                if ("删档内测".equals(serverType)) {
-                    paddRight = DisplayUtils.dip2px(getContext(), 50);
-                } else {
-                    paddRight = DisplayUtils.dip2px(getContext(), 60);
-                }
-            } else {
-                mServerType.setBackgroundResource(R.drawable.textview_orange_up);
-                paddRight = DisplayUtils.dip2px(getContext(), 30);
-            }
+            mServerType.setText(serverRemark);
+            mServerType.setBackgroundResource(R.drawable.textview_orange_up);
+            paddRight = DisplayUtils.dip2px(getContext(), 50);
         }
         mGameName.setPadding(0, 0, paddRight, 0);
 
diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
index 5ece31ad1d..e0b9f8063c 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
@@ -215,7 +215,7 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter {
         } else if (viewType == 1) {
             return new KaiFuTimeViewHolder(mLayoutInflater.inflate(R.layout.kaifu_item_time, parent, false));
         } else {
-            return new GameTestViewHolder(mLayoutInflater.inflate(R.layout.game_test_item, parent, false));
+            return new GameTestViewHolder(mLayoutInflater.inflate(R.layout.kaifu_game_item, parent, false));
         }
     }
 
@@ -276,6 +276,10 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter {
                 remarkTv.setText(remark);
                 remarkTv.setBackgroundColor(ContextCompat.getColor(mContext, R.color.tag_orange));
             }
+
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.topMargin = DisplayUtils.dip2px(5);
+            viewHolder.gameLabelList.addView(view, params);
         }
 
 
diff --git a/app/src/main/res/drawable/detail_download_normal_image_style.xml b/app/src/main/res/drawable/detail_download_normal_image_style.xml
new file mode 100644
index 0000000000..0f32e68d0b
--- /dev/null
+++ b/app/src/main/res/drawable/detail_download_normal_image_style.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:shape = "rectangle" >
+
+    <solid android:color = "@android:color/white" />
+
+    <corners android:radius = "999dp" />
+
+</shape >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/detail_download_open_image_style.xml b/app/src/main/res/drawable/detail_download_open_image_style.xml
new file mode 100644
index 0000000000..7fd2a64472
--- /dev/null
+++ b/app/src/main/res/drawable/detail_download_open_image_style.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android = "http://schemas.android.com/apk/res/android" >
+
+    <item android:id = "@android:id/background" >
+        <shape >
+            <stroke
+                android:width = "0.6dp"
+                android:color = "@android:color/white" />
+
+            <corners android:radius = "999dp" />
+
+            <solid android:color = "@android:color/transparent" />
+        </shape >
+
+    </item >
+</layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/detail_download_open_rect_style.xml b/app/src/main/res/drawable/detail_download_open_rect_style.xml
index 3108ec9c93..d2b8708441 100644
--- a/app/src/main/res/drawable/detail_download_open_rect_style.xml
+++ b/app/src/main/res/drawable/detail_download_open_rect_style.xml
@@ -13,16 +13,5 @@
         </shape >
 
     </item >
-    <item android:id = "@android:id/progress" >
-        <clip >
-            <shape >
-                <corners android:radius = "1.5dp" />
-
-                <gradient
-                    android:endColor = "@color/theme"
-                    android:startColor = "@color/theme" />
-            </shape >
-        </clip >
-    </item >
 
 </layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/detail_download_open_style.xml b/app/src/main/res/drawable/detail_download_open_style.xml
index b2596c8fb5..7359053629 100644
--- a/app/src/main/res/drawable/detail_download_open_style.xml
+++ b/app/src/main/res/drawable/detail_download_open_style.xml
@@ -13,16 +13,5 @@
         </shape >
 
     </item >
-    <item android:id = "@android:id/progress" >
-        <clip >
-            <shape >
-                <corners android:radius = "999dp" />
-
-                <gradient
-                    android:endColor = "@color/theme"
-                    android:startColor = "@color/theme" />
-            </shape >
-        </clip >
-    </item >
 
 </layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/detail_downloading_normal_image_style.xml b/app/src/main/res/drawable/detail_downloading_normal_image_style.xml
new file mode 100644
index 0000000000..9ea58ea040
--- /dev/null
+++ b/app/src/main/res/drawable/detail_downloading_normal_image_style.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android = "http://schemas.android.com/apk/res/android" >
+
+    <item android:id = "@android:id/background" >
+        <shape >
+            <stroke
+                android:width = "0.6dp"
+                android:color = "@android:color/white" />
+
+            <corners android:radius = "999dp" />
+
+            <solid android:color = "@android:color/transparent" />
+        </shape >
+
+    </item >
+    <item android:id = "@android:id/progress" >
+        <clip >
+            <shape >
+                <corners android:radius = "999dp" />
+
+                <gradient
+                    android:endColor = "@android:color/white"
+                    android:startColor = "@android:color/white" />
+            </shape >
+        </clip >
+    </item >
+
+</layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_game.xml b/app/src/main/res/layout/fragment_game.xml
index 3837f062bf..1b8e35c661 100644
--- a/app/src/main/res/layout/fragment_game.xml
+++ b/app/src/main/res/layout/fragment_game.xml
@@ -18,21 +18,22 @@
 
         <android.support.v4.widget.SwipeRefreshLayout
             android:id = "@+id/game_refresh"
+            isRefreshing = "@{loadStatus}"
             visibleGone = "@{loadStatus == LoadStatus.INIT_FAILED? false: true}"
             android:layout_width = "match_parent"
-            android:layout_height = "match_parent"
-            isRefreshing="@{loadStatus}">
+            android:layout_height = "match_parent" >
 
             <android.support.v7.widget.RecyclerView
                 android:id = "@+id/game_list"
                 android:layout_width = "match_parent"
-                android:layout_height = "wrap_content" />
+                android:layout_height = "wrap_content"
+                visibleGone = "@{loadStatus == LoadStatus.INIT_LOADING? false: true}"/>
 
         </android.support.v4.widget.SwipeRefreshLayout >
 
         <com.gc.materialdesign.views.ProgressBarCircularIndeterminate
             android:id = "@+id/game_loading"
-            visibleGone = "@{loadStatus == LoadStatus.LIST_LOADING? true: false}"
+            visibleGone = "@{loadStatus == LoadStatus.INIT_LOADING? true: false}"
             android:layout_width = "40dp"
             android:layout_height = "40dp"
             android:layout_centerInParent = "true"
diff --git a/app/src/main/res/layout/game_image_item.xml b/app/src/main/res/layout/game_image_item.xml
index 03761a36df..605665a2b9 100644
--- a/app/src/main/res/layout/game_image_item.xml
+++ b/app/src/main/res/layout/game_image_item.xml
@@ -28,14 +28,12 @@
             fresco:fadeDuration = "500"
             fresco:placeholderImage = "@drawable/preload"
             fresco:pressedStateOverlayImage = "@color/pressed_bg"
-            fresco:viewAspectRatio = "2.28"
-            imageUrl="@{game.image}"/>
+            fresco:viewAspectRatio = "2.28" />
 
         <android.support.constraint.ConstraintLayout
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
             android:orientation = "horizontal"
-            android:visibility = "gone"
             app:layout_constraintBottom_toBottomOf = "parent"
             app:layout_constraintRight_toRightOf = "parent"
             app:layout_constraintTop_toBottomOf = "@id/game_image_line"
@@ -47,6 +45,7 @@
                 android:layout_height = "60dp"
                 android:layout_marginLeft = "40dp"
                 android:layout_marginRight = "40dp"
+                imageUrl="@{game.icon}"
                 app:layout_constraintLeft_toLeftOf = "parent"
                 app:layout_constraintRight_toRightOf = "parent" />
 
@@ -55,6 +54,7 @@
                 android:layout_width = "wrap_content"
                 android:layout_height = "wrap_content"
                 android:layout_marginTop = "6dp"
+                android:text = "@{game.name}"
                 android:textColor = "@android:color/white"
                 app:layout_constraintLeft_toLeftOf = "parent"
                 app:layout_constraintRight_toRightOf = "parent"
@@ -65,7 +65,7 @@
                 android:layout_width = "wrap_content"
                 android:layout_height = "wrap_content"
                 android:layout_marginTop = "6dp"
-                android:text = "dsdas"
+                android:text = "@{game.apk.size>0? game.apk.get(0).size:`测试`}"
                 android:textColor = "@android:color/white"
                 app:layout_constraintLeft_toLeftOf = "parent"
                 app:layout_constraintRight_toRightOf = "parent"
@@ -78,6 +78,7 @@
                 android:layout_width = "55dp"
                 android:layout_height = "22dp"
                 android:layout_marginTop = "8dp"
+                app:downloadStyle = "2"
                 app:layout_constraintLeft_toLeftOf = "parent"
                 app:layout_constraintRight_toRightOf = "parent"
                 app:layout_constraintTop_toBottomOf = "@id/game_size"
diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml
index 1bbdac585e..54a54cb277 100644
--- a/app/src/main/res/layout/game_test_item.xml
+++ b/app/src/main/res/layout/game_test_item.xml
@@ -166,7 +166,7 @@
             <LinearLayout
                 android:id = "@+id/home2_label_list"
                 android:layout_width = "wrap_content"
-                android:layout_height = "16dp"
+                android:layout_height = "wrap_content"
                 android:layout_gravity = "fill_vertical"
                 android:orientation = "horizontal"
                 android:visibility = "visible" >
diff --git a/app/src/main/res/layout/game_viewpager_item.xml b/app/src/main/res/layout/game_viewpager_item.xml
index 1248ccf912..43fa2d2c74 100644
--- a/app/src/main/res/layout/game_viewpager_item.xml
+++ b/app/src/main/res/layout/game_viewpager_item.xml
@@ -55,9 +55,11 @@
 
             <TextView
                 android:id = "@+id/viewpager_tv_failure"
+                visibleGone = "@{list == null? true: false,default = false}"
                 android:layout_width = "match_parent"
                 android:layout_height = "match_parent"
                 android:gravity = "center"
+                android:onClick = "@{(v)->clickListener.onClick(v, null)}"
                 android:text = "@string/tap_to_reload"
                 android:textColor = "@color/title"
                 android:textSize = "14sp"
@@ -76,11 +78,12 @@
 
             <TextView
                 android:id = "@+id/home_subject_failure"
-                visibleGone = "@{list == null? true: false}"
+                visibleGone = "@{list == null? true: false,default = false}"
                 android:layout_width = "match_parent"
                 android:layout_height = "match_parent"
                 android:layout_gravity = "center"
                 android:gravity = "center"
+                android:onClick = "@{(v)->clickListener.onClick(v, null)}"
                 android:text = "@string/tap_to_reload"
                 android:textColor = "@color/title"
                 android:textSize = "14sp" />
@@ -101,7 +104,7 @@
                     android:layout_height = "match_parent"
                     android:layout_weight = "1"
                     android:gravity = "center"
-                    android:onClick="@{(v)->clickListener.onClick(v, 0)}"
+                    android:onClick = "@{(v)->clickListener.onClick(v, 0)}"
                     android:orientation = "vertical" >
 
                     <com.facebook.drawee.view.SimpleDraweeView
@@ -124,7 +127,7 @@
                     android:layout_height = "match_parent"
                     android:layout_weight = "1"
                     android:gravity = "center"
-                    android:onClick="@{(v)->clickListener.onClick(v, 1)}"
+                    android:onClick = "@{(v)->clickListener.onClick(v, 1)}"
                     android:orientation = "vertical" >
 
                     <com.facebook.drawee.view.SimpleDraweeView
@@ -147,7 +150,7 @@
                     android:layout_height = "match_parent"
                     android:layout_weight = "1"
                     android:gravity = "center"
-                    android:onClick="@{(v)->clickListener.onClick(v, 2)}"
+                    android:onClick = "@{(v)->clickListener.onClick(v, 2)}"
                     android:orientation = "vertical" >
 
                     <com.facebook.drawee.view.SimpleDraweeView
@@ -170,7 +173,7 @@
                     android:layout_height = "match_parent"
                     android:layout_weight = "1"
                     android:gravity = "center"
-                    android:onClick="@{(v)->clickListener.onClick(v, 3)}"
+                    android:onClick = "@{(v)->clickListener.onClick(v, 3)}"
                     android:orientation = "vertical" >
 
                     <com.facebook.drawee.view.SimpleDraweeView
@@ -193,7 +196,7 @@
                     android:layout_height = "match_parent"
                     android:layout_weight = "1"
                     android:gravity = "center"
-                    android:onClick="@{(v)->clickListener.onClick(v, 4)}"
+                    android:onClick = "@{(v)->clickListener.onClick(v, 4)}"
                     android:orientation = "vertical" >
 
                     <ImageView
diff --git a/app/src/main/res/layout/gamedetail_item_kaifu.xml b/app/src/main/res/layout/gamedetail_item_kaifu.xml
index 0c22f31311..f58576b729 100644
--- a/app/src/main/res/layout/gamedetail_item_kaifu.xml
+++ b/app/src/main/res/layout/gamedetail_item_kaifu.xml
@@ -110,7 +110,7 @@
             android:id = "@+id/kaifu_rl"
             android:layout_width = "wrap_content"
             android:layout_height = "256dp"
-            android:layout_marginBottom = "15dp"
+            android:layout_marginBottom = "10dp"
             android:layout_marginTop = "12dp" >
 
             <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/kaifu_game_item.xml b/app/src/main/res/layout/kaifu_game_item.xml
new file mode 100644
index 0000000000..1fff22fbfb
--- /dev/null
+++ b/app/src/main/res/layout/kaifu_game_item.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
+    xmlns:fresco = "http://schemas.android.com/apk/res-auto"
+    android:layout_width = "match_parent"
+    android:layout_height = "wrap_content"
+    android:orientation = "vertical" >
+
+    <TextView
+        android:id = "@+id/home2_game_kaifu_top"
+        android:layout_width = "match_parent"
+        android:layout_height = "35dp"
+        android:layout_marginBottom = "8dp"
+        android:gravity = "center"
+        android:textColor = "@color/hint"
+        android:visibility = "gone" />
+
+    <RelativeLayout
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:background = "@drawable/reuse_listview_item_style"
+        android:paddingBottom = "6dp"
+        android:paddingLeft = "11dp"
+        android:paddingRight = "18dp"
+        android:paddingTop = "6dp" >
+
+        <TextView
+            android:id = "@+id/home2_game_order"
+            android:layout_width = "25dp"
+            android:layout_height = "wrap_content"
+            android:layout_centerVertical = "true"
+            android:layout_marginLeft = "-3dp"
+            android:layout_marginRight = "0dp"
+            android:gravity = "center"
+            android:maxLength = "3"
+            android:textColor = "@color/title"
+            android:textSize = "15sp"
+            android:visibility = "visible" />
+
+        <RelativeLayout
+            android:id = "@+id/home2_game_rl"
+            android:layout_width = "68dp"
+            android:layout_height = "74dp"
+            android:layout_toRightOf = "@id/home2_game_order" >
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id = "@+id/home2_game_thumb"
+                style = "@style/frescoStyle"
+                android:layout_width = "60dp"
+                android:layout_height = "60dp"
+                android:layout_alignParentRight = "true"
+                android:layout_centerVertical = "true"
+                fresco:roundedCornerRadius = "10dp" />
+
+            <ImageView
+                android:id = "@+id/home2_game_libao"
+                android:layout_width = "24dp"
+                android:layout_height = "24dp"
+                android:src = "@drawable/game_libao_icon"
+                android:visibility = "gone" />
+
+        </RelativeLayout >
+
+        <LinearLayout
+            android:layout_width = "wrap_content"
+            android:layout_height = "wrap_content"
+            android:layout_marginLeft = "10dp"
+            android:layout_marginRight = "13dp"
+            android:layout_marginTop="4dp"
+            android:layout_toLeftOf = "@+id/home2_download_btn"
+            android:layout_toRightOf = "@id/home2_game_rl"
+            android:orientation = "vertical" >
+
+            <RelativeLayout
+                android:layout_width = "match_parent"
+                android:layout_height = "wrap_content" >
+
+                <TextView
+                    android:id = "@+id/home2_game_nameAndsize"
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "wrap_content"
+                    android:layout_centerVertical = "true"
+                    android:ellipsize = "end"
+                    android:includeFontPadding = "false"
+                    android:lineSpacingMultiplier = "0.9"
+                    android:singleLine = "true"
+                    android:textColor = "@color/text_3a3a3a"
+                    android:textSize = "14sp" />
+
+                <TextView
+                    android:id = "@+id/home2_game_server_type"
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "wrap_content"
+                    android:layout_alignRight = "@+id/home2_game_nameAndsize"
+                    android:layout_centerVertical = "true"
+                    android:maxLines = "1"
+                    android:paddingBottom = "0.5dp"
+                    android:paddingLeft = "3dp"
+                    android:paddingRight = "3dp"
+                    android:textColor = "@android:color/white"
+                    android:textSize = "9sp"
+                    android:visibility = "gone" />
+            </RelativeLayout >
+
+            <RelativeLayout
+                android:layout_width = "match_parent"
+                android:layout_height = "28dp" >
+
+                <TextView
+                    android:id = "@+id/home2_game_des"
+                    android:layout_width = "match_parent"
+                    android:layout_height = "wrap_content"
+                    android:layout_marginBottom = "8dp"
+                    android:layout_marginTop = "8dp"
+                    android:ellipsize = "end"
+                    android:includeFontPadding = "false"
+                    android:lineSpacingMultiplier = "0.9"
+                    android:singleLine = "true"
+                    android:textColor = "@color/text_9a9a9a"
+                    android:textSize = "10sp" />
+
+                <LinearLayout
+                    android:id = "@+id/home2_game_ll_info"
+                    android:layout_width = "match_parent"
+                    android:layout_height = "wrap_content"
+                    android:layout_marginBottom = "2.5dp"
+                    android:layout_marginTop = "3dp"
+                    android:orientation = "horizontal"
+                    android:visibility = "gone" >
+
+                    <TextView
+                        android:id = "@+id/home2_download_speed"
+                        android:layout_width = "0dp"
+                        android:layout_height = "wrap_content"
+                        android:layout_weight = "4"
+                        android:ellipsize = "end"
+                        android:singleLine = "true"
+                        android:text = "@string/game_downloading_formattable"
+                        android:textColor = "@color/text_9a9a9a"
+                        android:textSize = "9sp" />
+
+                    <TextView
+                        android:id = "@+id/home2_download_percentage"
+                        android:layout_width = "0dp"
+                        android:layout_height = "wrap_content"
+                        android:layout_weight = "1"
+                        android:ellipsize = "end"
+                        android:gravity = "right"
+                        android:singleLine = "true"
+                        android:textColor = "@color/content"
+                        android:textSize = "9sp" />
+
+                </LinearLayout >
+
+                <ProgressBar
+                    android:id = "@+id/home2_game_progressbar"
+                    style = "?android:attr/progressBarStyleHorizontal"
+                    android:layout_width = "match_parent"
+                    android:layout_height = "3dp"
+                    android:layout_below = "@+id/home2_game_ll_info"
+                    android:layout_marginBottom = "4dp"
+                    android:layout_marginRight = "5dp"
+                    android:max = "1000"
+                    android:progress = "500"
+                    android:progressDrawable = "@drawable/progressbar_bg_style"
+                    android:visibility = "gone" />
+
+            </RelativeLayout >
+
+            <LinearLayout
+                android:id = "@+id/home2_label_list"
+                android:layout_width = "wrap_content"
+                android:layout_height = "wrap_content"
+                android:layout_gravity = "fill_vertical"
+                android:orientation = "horizontal"
+                android:visibility = "visible" >
+
+                <TextView
+                    android:id = "@+id/home2_test_type"
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "match_parent"
+                    android:layout_marginRight = "6dp"
+                    android:paddingBottom = "1dp"
+                    android:paddingLeft = "3dp"
+                    android:paddingRight = "3dp"
+                    android:paddingTop = "1dp"
+                    android:singleLine = "true"
+                    android:textColor = "@android:color/white"
+                    android:textSize = "10sp" />
+
+                <TextView
+                    android:id = "@+id/home2_test_time"
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "match_parent"
+                    android:layout_marginRight = "5dp"
+                    android:background = "@color/btn_plugin"
+                    android:paddingBottom = "1dp"
+                    android:paddingLeft = "3dp"
+                    android:paddingRight = "3dp"
+                    android:paddingTop = "1dp"
+                    android:singleLine = "true"
+                    android:textColor = "@android:color/white"
+                    android:textSize = "10sp" />
+            </LinearLayout >
+
+        </LinearLayout >
+
+        <TextView
+            android:id = "@+id/home2_download_btn"
+            android:layout_width = "60dp"
+            android:layout_height = "28.5dp"
+            android:layout_alignParentRight = "true"
+            android:layout_centerVertical = "true"
+            android:background = "@drawable/game_item_btn_download_style"
+            android:gravity = "center"
+            android:text = "@string/download_down"
+            android:textColor = "@android:color/white"
+            android:textSize = "12sp" />
+    </RelativeLayout >
+
+    <TextView
+        android:id = "@+id/home2_game_kaifu_bottom"
+        android:layout_width = "match_parent"
+        android:layout_height = "35dp"
+        android:layout_marginTop = "8dp"
+        android:gravity = "center"
+        android:textColor = "@color/hint"
+        android:visibility = "gone" />
+</LinearLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/personal_game_item.xml b/app/src/main/res/layout/personal_game_item.xml
index 8f0c928104..5375799ff0 100644
--- a/app/src/main/res/layout/personal_game_item.xml
+++ b/app/src/main/res/layout/personal_game_item.xml
@@ -40,7 +40,7 @@
             android:layout_width = "50dp"
             android:layout_height = "21dp"
             android:layout_marginTop = "8dp"
-            app:rectStyle = "true"
+            app:downloadStyle="1"
             app:textSize = "12sp" />
     </LinearLayout >
 </layout >
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index b48533bb0b..405d1ba483 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,7 +19,7 @@
 
     <declare-styleable name = "DownloadProgressBar" >
         <attr name = "textSize" format = "dimension" />
-        <attr name = "rectStyle" format = "boolean" />
+        <attr name = "downloadStyle" format = "integer" />
     </declare-styleable >
 
 </resources >
\ No newline at end of file