diff --git a/app/src/main/java/com/gh/common/view/CardLinearLayout.java b/app/src/main/java/com/gh/common/view/CardLinearLayout.java
index 7037b43778..0fa329f57e 100644
--- a/app/src/main/java/com/gh/common/view/CardLinearLayout.java
+++ b/app/src/main/java/com/gh/common/view/CardLinearLayout.java
@@ -14,8 +14,8 @@ import com.gh.gamecenter.R;
  */
 public class CardLinearLayout extends LinearLayout {
 
-	private Drawable leftDrawable, topDrawable, rightDrawable, bottomDrawable, centerDrawable;
-	private Drawable leftTopDrawable, rightTopDrawable, leftBottomDrawable, rightBottomDrawable;
+	private Drawable mLeftDrawable, mTopDrawable, mRightDrawable, mBottomDrawable, mCenterDrawable;
+	private Drawable mLeftTopDrawable, mRightTopDrawable, mLeftBottomDrawable, mRightBottomDrawable;
 
 	private int mLeft, mTop, mRight, mBottom;
 
@@ -35,18 +35,19 @@ public class CardLinearLayout extends LinearLayout {
 	}
 
 	private void init(Context context, AttributeSet attrs) {
+		setWillNotDraw(false);
 		isBottom = true;
 
-		leftDrawable = getContext().getResources().getDrawable(R.drawable.frame_left);
-		topDrawable = getContext().getResources().getDrawable(R.drawable.frame_top);
-		rightDrawable = getContext().getResources().getDrawable(R.drawable.frame_right);
-		bottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_bottom);
-		centerDrawable = getContext().getResources().getDrawable(R.drawable.frame_center);
+		mLeftDrawable = getContext().getResources().getDrawable(R.drawable.frame_left);
+		mTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_top);
+		mRightDrawable = getContext().getResources().getDrawable(R.drawable.frame_right);
+		mBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_bottom);
+		mCenterDrawable = getContext().getResources().getDrawable(R.drawable.frame_center);
 
-		leftTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_top_square);
-		rightTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_top_square);
-		leftBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_bottom_square);
-		rightBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_bottom_square);
+		mLeftTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_top_square);
+		mRightTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_top_square);
+		mLeftBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_bottom_square);
+		mRightBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_bottom_square);
 
 		if (attrs != null) {
 			TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.CardLayout);
@@ -65,124 +66,124 @@ public class CardLinearLayout extends LinearLayout {
 
 		if (mLeft != 0 && mTop != 0 && mRight != 0 && mBottom != 0) {
 			// 左、上、右、下
-			if (leftTopDrawable != null) {
-				leftTopDrawable.setBounds(0, 0, mLeft, mTop);
-				leftTopDrawable.draw(canvas);
+			if (mLeftTopDrawable != null) {
+				mLeftTopDrawable.setBounds(0, 0, mLeft, mTop);
+				mLeftTopDrawable.draw(canvas);
 			}
 
-			if (topDrawable != null) {
-				topDrawable.setBounds(mLeft, 0, getWidth() - mRight, mTop);
-				topDrawable.draw(canvas);
+			if (mTopDrawable != null) {
+				mTopDrawable.setBounds(mLeft, 0, getWidth() - mRight, mTop);
+				mTopDrawable.draw(canvas);
 			}
 
-			if (rightTopDrawable != null) {
-				rightTopDrawable.setBounds(getWidth() - mRight, 0, getWidth(), mTop);
-				rightTopDrawable.draw(canvas);
+			if (mRightTopDrawable != null) {
+				mRightTopDrawable.setBounds(getWidth() - mRight, 0, getWidth(), mTop);
+				mRightTopDrawable.draw(canvas);
 			}
 
-			if (leftDrawable != null) {
-				leftDrawable.setBounds(0, mTop, mLeft, getHeight() - mBottom);
-				leftDrawable.draw(canvas);
+			if (mLeftDrawable != null) {
+				mLeftDrawable.setBounds(0, mTop, mLeft, getHeight() - mBottom);
+				mLeftDrawable.draw(canvas);
 			}
 
-			if (rightDrawable != null) {
-				rightDrawable.setBounds(getWidth() - mRight, mTop, getWidth(), getHeight() - mBottom);
-				rightDrawable.draw(canvas);
+			if (mRightDrawable != null) {
+				mRightDrawable.setBounds(getWidth() - mRight, mTop, getWidth(), getHeight() - mBottom);
+				mRightDrawable.draw(canvas);
 			}
 
-			if (leftBottomDrawable != null) {
-				leftBottomDrawable.setBounds(0, getHeight() - mBottom, mLeft, getHeight());
-				leftBottomDrawable.draw(canvas);
+			if (mLeftBottomDrawable != null) {
+				mLeftBottomDrawable.setBounds(0, getHeight() - mBottom, mLeft, getHeight());
+				mLeftBottomDrawable.draw(canvas);
 			}
 
 			if (isBottom) {
-				if (bottomDrawable != null) {
-					bottomDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
-					bottomDrawable.draw(canvas);
+				if (mBottomDrawable != null) {
+					mBottomDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
+					mBottomDrawable.draw(canvas);
 				}
 			} else {
-				if (centerDrawable != null) {
-					centerDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
-					centerDrawable.draw(canvas);
+				if (mCenterDrawable != null) {
+					mCenterDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
+					mCenterDrawable.draw(canvas);
 				}
 			}
 
-			if (rightBottomDrawable != null) {
-				rightBottomDrawable.setBounds(getWidth() - mRight, getHeight() - mBottom, getWidth(), getHeight());
-				rightBottomDrawable.draw(canvas);
+			if (mRightBottomDrawable != null) {
+				mRightBottomDrawable.setBounds(getWidth() - mRight, getHeight() - mBottom, getWidth(), getHeight());
+				mRightBottomDrawable.draw(canvas);
 			}
 
 		} else if (mLeft != 0 && mTop != 0 && mRight != 0) {
 			// 左、上、右
-			if (leftTopDrawable != null) {
-				leftTopDrawable.setBounds(0, 0, mLeft, mTop);
-				leftTopDrawable.draw(canvas);
+			if (mLeftTopDrawable != null) {
+				mLeftTopDrawable.setBounds(0, 0, mLeft, mTop);
+				mLeftTopDrawable.draw(canvas);
 			}
 
-			if (topDrawable != null) {
-				topDrawable.setBounds(mLeft, 0, getWidth() - mRight, mTop);
-				topDrawable.draw(canvas);
+			if (mTopDrawable != null) {
+				mTopDrawable.setBounds(mLeft, 0, getWidth() - mRight, mTop);
+				mTopDrawable.draw(canvas);
 			}
 
-			if (rightTopDrawable != null) {
-				rightTopDrawable.setBounds(getWidth() - mRight, 0, getWidth(), mTop);
-				rightTopDrawable.draw(canvas);
+			if (mRightTopDrawable != null) {
+				mRightTopDrawable.setBounds(getWidth() - mRight, 0, getWidth(), mTop);
+				mRightTopDrawable.draw(canvas);
 			}
 
-			if (leftDrawable != null) {
-				leftDrawable.setBounds(0, mTop, mLeft, getHeight());
-				leftDrawable.draw(canvas);
+			if (mLeftDrawable != null) {
+				mLeftDrawable.setBounds(0, mTop, mLeft, getHeight());
+				mLeftDrawable.draw(canvas);
 			}
 
-			if (rightDrawable != null) {
-				rightDrawable.setBounds(getWidth() - mRight, mTop, getWidth(), getHeight());
-				rightDrawable.draw(canvas);
+			if (mRightDrawable != null) {
+				mRightDrawable.setBounds(getWidth() - mRight, mTop, getWidth(), getHeight());
+				mRightDrawable.draw(canvas);
 			}
 
 		} else if (mLeft != 0 && mBottom != 0 && mRight != 0) {
 			// 左、下、右
-			if (leftDrawable != null) {
-				leftDrawable.setBounds(0, 0, mLeft, getHeight() - mBottom);
-				leftDrawable.draw(canvas);
+			if (mLeftDrawable != null) {
+				mLeftDrawable.setBounds(0, 0, mLeft, getHeight() - mBottom);
+				mLeftDrawable.draw(canvas);
 			}
 
-			if (rightDrawable != null) {
-				rightDrawable.setBounds(getWidth() - mRight, 0, getWidth(), getHeight() - mBottom);
-				rightDrawable.draw(canvas);
+			if (mRightDrawable != null) {
+				mRightDrawable.setBounds(getWidth() - mRight, 0, getWidth(), getHeight() - mBottom);
+				mRightDrawable.draw(canvas);
 			}
 
-			if (leftBottomDrawable != null) {
-				leftBottomDrawable.setBounds(0, getHeight() - mBottom, mLeft, getHeight());
-				leftBottomDrawable.draw(canvas);
+			if (mLeftBottomDrawable != null) {
+				mLeftBottomDrawable.setBounds(0, getHeight() - mBottom, mLeft, getHeight());
+				mLeftBottomDrawable.draw(canvas);
 			}
 
 			if (isBottom) {
-				if (bottomDrawable != null) {
-					bottomDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
-					bottomDrawable.draw(canvas);
+				if (mBottomDrawable != null) {
+					mBottomDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
+					mBottomDrawable.draw(canvas);
 				}
 			} else {
-				if (centerDrawable != null) {
-					centerDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
-					centerDrawable.draw(canvas);
+				if (mCenterDrawable != null) {
+					mCenterDrawable.setBounds(mLeft, getHeight() - mBottom, getWidth() - mRight, getHeight());
+					mCenterDrawable.draw(canvas);
 				}
 			}
 
-			if (rightBottomDrawable != null) {
-				rightBottomDrawable.setBounds(getWidth() - mRight, getHeight() - mBottom, getWidth(), getHeight());
-				rightBottomDrawable.draw(canvas);
+			if (mRightBottomDrawable != null) {
+				mRightBottomDrawable.setBounds(getWidth() - mRight, getHeight() - mBottom, getWidth(), getHeight());
+				mRightBottomDrawable.draw(canvas);
 			}
 
 		} else if (mLeft != 0 && mRight != 0) {
 			// 左、右
-			if (leftDrawable != null) {
-				leftDrawable.setBounds(0, 0, mLeft, getHeight());
-				leftDrawable.draw(canvas);
+			if (mLeftDrawable != null) {
+				mLeftDrawable.setBounds(0, 0, mLeft, getHeight());
+				mLeftDrawable.draw(canvas);
 			}
 
-			if (rightDrawable != null) {
-				rightDrawable.setBounds(getWidth() - mRight, 0, getWidth(), getHeight());
-				rightDrawable.draw(canvas);
+			if (mRightDrawable != null) {
+				mRightDrawable.setBounds(getWidth() - mRight, 0, getWidth(), getHeight());
+				mRightDrawable.draw(canvas);
 			}
 		}
 
diff --git a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java
index a685d1856c..8bbab939fa 100644
--- a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java
+++ b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java
@@ -33,6 +33,7 @@ public class CardRelativeLayout extends RelativeLayout {
 	}
 
 	private void init(Context context, AttributeSet attrs) {
+		setWillNotDraw(false);
 		topDrawable = getContext().getResources().getDrawable(R.drawable.frame_top);
 		bottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_bottom);
 
diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadAdapter.java
index 913dba1fbb..f8f28fd55f 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadAdapter.java
@@ -523,12 +523,23 @@ public class GameDownloadAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			    deleteList.add(entry.getUrl());
 			    statusMap.remove(entry.getUrl());
 			    locationMap.remove(entry.getUrl());
+                initLocationMap();
 
 			    notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size());
 
 			    DownloadManager.getInstance(context).cancel(entry.getUrl());
 		    }
-	    });
+
+        });
+    }
+
+    private void initLocationMap() {
+        for (int i = 0; i < doneList.size(); i++) {
+            locationMap.put(doneList.get(i).getUrl(), i);
+        }
+        for (int i = 0; i < downloadingList.size(); i++) {
+            locationMap.put(downloadingList.get(i).getUrl(), i);
+        }
     }
 
     public List<DownloadEntity> getDownloadingList() {
diff --git a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java
index 53967cc023..66ec601e71 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java
+++ b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java
@@ -81,8 +81,8 @@ public class PackageManager {
 	}
 
 	public void getInstalledMapFromLocal() {
-		installedMap = new ArrayMap<String, Boolean>();
-		installedList = new ArrayList<String>();
+		installedMap = new ArrayMap<>();
+		installedList = new ArrayList<>();
 		ArrayList<String> list = PackageUtils.getAllPackageName(context);
 		for (String str : list) {
 			installedMap.put(str, true);
@@ -97,7 +97,7 @@ public class PackageManager {
 	 */
 	public static ArrayList<GameUpdateEntity> getUpdateList() {
 		if (updateList == null) {
-			updateList = new ArrayList<GameUpdateEntity>();
+			updateList = new ArrayList<>();
 		}
 		return updateList;
 	}
@@ -105,7 +105,8 @@ public class PackageManager {
 	public static boolean isCanUpdate(String packageName) {
 		if (updateList != null && updateList.size() != 0) {
 			for (GameUpdateEntity entity : updateList) {
-				if (entity.getPackageName().equals(packageName)) {
+				if (entity.getPackageName().equals(packageName)
+						&& !entity.isPluggable()) {
 					return true;
 				}
 			}
@@ -183,7 +184,7 @@ public class PackageManager {
 	 */
 	public static ArrayList<String> getLocalPackageName(Context context) {
 		FilterManager filterManager = new FilterManager(context);
-		ArrayList<String> list = new ArrayList<String>();
+		ArrayList<String> list = new ArrayList<>();
 		List<PackageInfo> packageInfos = context.getPackageManager()
 				.getInstalledPackages(0);
 		for (int i = 0, size = packageInfos.size(); i < size; i++) {
@@ -214,7 +215,7 @@ public class PackageManager {
 			if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
 				if (!context.getPackageName().equals(packageInfo.packageName)) {
 					if (!filterManager.isFilter(packageInfo.packageName)) {
-						HashMap<String, String> params = new HashMap<String, String>();
+						HashMap<String, String> params = new HashMap<>();
 						params.put("package", packageInfo.packageName);
 						if (TextUtils.isEmpty(packageInfo.versionName)) {
 							params.put("version", "");
diff --git a/app/src/main/res/drawable-hdpi/frame_bottom.png b/app/src/main/res/drawable-xhdpi/frame_bottom.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_bottom.png
rename to app/src/main/res/drawable-xhdpi/frame_bottom.png
diff --git a/app/src/main/res/drawable-hdpi/frame_center.png b/app/src/main/res/drawable-xhdpi/frame_center.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_center.png
rename to app/src/main/res/drawable-xhdpi/frame_center.png
diff --git a/app/src/main/res/drawable-hdpi/frame_left.png b/app/src/main/res/drawable-xhdpi/frame_left.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_left.png
rename to app/src/main/res/drawable-xhdpi/frame_left.png
diff --git a/app/src/main/res/drawable-hdpi/frame_left_bottom_square.png b/app/src/main/res/drawable-xhdpi/frame_left_bottom_square.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_left_bottom_square.png
rename to app/src/main/res/drawable-xhdpi/frame_left_bottom_square.png
diff --git a/app/src/main/res/drawable-hdpi/frame_left_top_square.png b/app/src/main/res/drawable-xhdpi/frame_left_top_square.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_left_top_square.png
rename to app/src/main/res/drawable-xhdpi/frame_left_top_square.png
diff --git a/app/src/main/res/drawable-hdpi/frame_right.png b/app/src/main/res/drawable-xhdpi/frame_right.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_right.png
rename to app/src/main/res/drawable-xhdpi/frame_right.png
diff --git a/app/src/main/res/drawable-hdpi/frame_right_bottom_square.png b/app/src/main/res/drawable-xhdpi/frame_right_bottom_square.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_right_bottom_square.png
rename to app/src/main/res/drawable-xhdpi/frame_right_bottom_square.png
diff --git a/app/src/main/res/drawable-hdpi/frame_right_top_square.png b/app/src/main/res/drawable-xhdpi/frame_right_top_square.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_right_top_square.png
rename to app/src/main/res/drawable-xhdpi/frame_right_top_square.png
diff --git a/app/src/main/res/drawable-hdpi/frame_top.png b/app/src/main/res/drawable-xhdpi/frame_top.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/frame_top.png
rename to app/src/main/res/drawable-xhdpi/frame_top.png
diff --git a/app/src/main/res/layout/dialog_modify_nickname.xml b/app/src/main/res/layout/dialog_modify_nickname.xml
index 7b445c2ff4..e63c08566a 100644
--- a/app/src/main/res/layout/dialog_modify_nickname.xml
+++ b/app/src/main/res/layout/dialog_modify_nickname.xml
@@ -28,7 +28,7 @@
         android:textColor="@color/title"
         android:background="@drawable/dialog_edit_bg"
         android:textColorHint="#9a9a9a"
-        android:maxLength="12"
+        android:maxLength="10"
         android:padding="8dp"
         android:singleLine="true"
         android:imeOptions="actionDone"
diff --git a/app/src/main/res/layout/downloadmanager_item_head.xml b/app/src/main/res/layout/downloadmanager_item_head.xml
index 924179481c..0fbc797888 100644
--- a/app/src/main/res/layout/downloadmanager_item_head.xml
+++ b/app/src/main/res/layout/downloadmanager_item_head.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background"
     android:padding="8dp"
     app:left="8dp"
     app:right="8dp">
diff --git a/app/src/main/res/layout/news_list_item_category.xml b/app/src/main/res/layout/news_list_item_category.xml
index fb5c624338..27e414a524 100644
--- a/app/src/main/res/layout/news_list_item_category.xml
+++ b/app/src/main/res/layout/news_list_item_category.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background"
     android:paddingBottom="8dp"
     android:paddingTop="8dp"
     app:left="8dp"