From 627f513da08d39833719bb21cb6beae2db91217e Mon Sep 17 00:00:00 2001
From: huangzhuanghua <401742778@qq.com>
Date: Wed, 21 Dec 2016 17:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=90=8E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/util/DownloadItemUtils.java |   2 -
 .../main/res/layout/gamedetail_item_gift.xml  |  61 ++++-----
 .../res/layout/gamedetail_item_gift_rv.xml    |  63 ++++-----
 app/src/main/res/layout/gift_item.xml         | 129 +++++++++---------
 .../main/res/layout/giftdetail_item_top.xml   |  25 ++--
 5 files changed, 130 insertions(+), 150 deletions(-)

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 a5a11ecf6a..90baf9a5b6 100644
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@@ -25,8 +25,6 @@ import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.manager.PackageManager;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class DownloadItemUtils {
diff --git a/app/src/main/res/layout/gamedetail_item_gift.xml b/app/src/main/res/layout/gamedetail_item_gift.xml
index 7cc131972a..2334f550b0 100644
--- a/app/src/main/res/layout/gamedetail_item_gift.xml
+++ b/app/src/main/res/layout/gamedetail_item_gift.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="122dp"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/cardview_mar_left"
-    android:layout_marginRight="@dimen/cardview_mar_left"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="1dp"
-    app:cardUseCompatPadding="true"
-    app:cardBackgroundColor="@android:color/white">
+<com.gh.common.view.CardLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     android:layout_width="122dp"
+     android:layout_height="wrap_content"
+     android:orientation="vertical"
+     android:background="@android:color/white"
+     app:left="8dp"
+     app:right="8dp"
+     app:top="4dp"
+     app:bottom="4dp">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/gamedetail_gift_name"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <TextView
-            android:id="@+id/gamedetail_gift_name"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:textSize="14sp"
-            android:textColor="@color/title"
-            android:gravity="center"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" />
+        android:layout_height="60dp"
+        android:textSize="14sp"
+        android:textColor="@color/title"
+        android:gravity="center"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp" />
 
-        <TextView
-            android:id="@+id/gamedetail_gift_btn"
-            android:layout_width="match_parent"
-            android:layout_height="33dp"
-            android:background="#ff6a28"
-            android:text="领取"
-            android:gravity="center"
-            android:textSize="13sp"
-            android:textColor="@android:color/white"/>
-    </LinearLayout>
+    <TextView
+        android:id="@+id/gamedetail_gift_btn"
+        android:layout_width="match_parent"
+        android:layout_height="33dp"
+        android:background="#ff6a28"
+        android:text="领取"
+        android:gravity="center"
+        android:textSize="13sp"
+        android:textColor="@android:color/white"/>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</com.gh.common.view.CardLinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gamedetail_item_gift_rv.xml b/app/src/main/res/layout/gamedetail_item_gift_rv.xml
index a4d8492308..62671529f9 100644
--- a/app/src/main/res/layout/gamedetail_item_gift_rv.xml
+++ b/app/src/main/res/layout/gamedetail_item_gift_rv.xml
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.gh.common.view.CardLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/cardview_mar_left"
-    android:layout_marginRight="@dimen/cardview_mar_left"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="1dp"
-    app:cardUseCompatPadding="true"
-    app:contentPaddingBottom="15dp"
-    app:contentPaddingLeft="12dp"
-    app:contentPaddingRight="12dp"
-    app:contentPaddingTop="12dp"
-    app:cardBackgroundColor="@android:color/white">
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    android:paddingBottom="15dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
+    android:paddingTop="12dp"
+    app:left="8dp"
+    app:right="8dp"
+    app:top="4dp"
+    app:bottom="4dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_marginBottom="12dp"
+        android:text="游戏礼包"
+        android:textColor="#3a3a3a"
+        android:textSize="16dp" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:text="游戏礼包"
-            android:textColor="#3a3a3a"
-            android:textSize="16dp" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="15dp"
+        android:background="@color/cutting_line"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="15dp"
-            android:background="@color/cutting_line"/>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/gamedetail_item_gift_gallery"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp">
+    </android.support.v7.widget.RecyclerView>
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/gamedetail_item_gift_gallery"
-            android:layout_width="wrap_content"
-            android:layout_height="100dp">
-        </android.support.v7.widget.RecyclerView>
-
-    </LinearLayout>
-
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</com.gh.common.view.CardLinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gift_item.xml b/app/src/main/res/layout/gift_item.xml
index a3690f820d..ca49452e70 100644
--- a/app/src/main/res/layout/gift_item.xml
+++ b/app/src/main/res/layout/gift_item.xml
@@ -1,80 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.gh.common.view.CardLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/cardview_mar_left"
-    android:layout_marginRight="@dimen/cardview_mar_left"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="1dp"
-    app:cardUseCompatPadding="true"
-    app:contentPaddingBottom="15dp"
-    app:contentPaddingLeft="12dp"
-    app:contentPaddingRight="12dp"
-    app:contentPaddingTop="15dp"
-    app:cardBackgroundColor="@android:color/white">
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@android:color/white"
+    android:paddingBottom="15dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
+    android:paddingTop="15dp"
+    app:left="8dp"
+    app:right="8dp"
+    app:top="4dp"
+    app:bottom="4dp">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/gift_game_icon"
+        android:layout_width="62dp"
+        android:layout_height="62dp"
+        android:layout_marginRight="11dp"
+        android:layout_centerVertical="true"/>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/gift_game_icon"
-            android:layout_width="62dp"
-            android:layout_height="62dp"
-            android:layout_marginRight="11dp"
-            android:layout_centerVertical="true"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-            android:id="@+id/gift_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/title"
-            android:textSize="16sp"
-            android:singleLine="true"
-            android:text="暖床萌萌大礼包"/>
-
-            <TextView
-            android:id="@+id/gift_game_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/content"
-            android:textSize="12sp"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="8dp"
-            android:singleLine="true"
-            android:text="刀塔传奇"/>
-
-            <TextView
-            android:id="@+id/gift_des"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/title"
-            android:textSize="12sp"
-            android:singleLine="true"
-            android:text="绑定金币20"/>
-
-        </LinearLayout>
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
         <TextView
-            android:id="@+id/gift_btn_status"
-            android:layout_width="60dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:textColor="@android:color/white"
-            android:gravity="center"/>
+        android:id="@+id/gift_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/title"
+        android:textSize="16sp"
+        android:singleLine="true"
+        android:text="暖床萌萌大礼包"/>
+
+        <TextView
+        android:id="@+id/gift_game_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/content"
+        android:textSize="12sp"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="8dp"
+        android:singleLine="true"
+        android:text="刀塔传奇"/>
+
+        <TextView
+        android:id="@+id/gift_des"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/title"
+        android:textSize="12sp"
+        android:singleLine="true"
+        android:text="绑定金币20"/>
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+    <TextView
+        android:id="@+id/gift_btn_status"
+        android:layout_width="60dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="10dp"
+        android:textColor="@android:color/white"
+        android:gravity="center"/>
+
+</com.gh.common.view.CardLinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/giftdetail_item_top.xml b/app/src/main/res/layout/giftdetail_item_top.xml
index 43284d1709..52488113f8 100644
--- a/app/src/main/res/layout/giftdetail_item_top.xml
+++ b/app/src/main/res/layout/giftdetail_item_top.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.gh.common.view.CardLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/cardview_mar_left"
-    android:layout_marginRight="@dimen/cardview_mar_left"
-    android:layout_marginTop="4dp"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="1dp"
-    app:contentPaddingLeft="12dp"
-    app:contentPaddingRight="12dp"
-    app:contentPaddingTop="15dp"
-    app:contentPaddingBottom="15dp"
-    app:cardUseCompatPadding="true">
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@android:color/white"
+    android:paddingBottom="15dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
+    android:paddingTop="15dp"
+    app:left="8dp"
+    app:right="8dp"
+    app:top="4dp"
+    app:bottom="4dp">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -96,4 +97,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</com.gh.common.view.CardLinearLayout>
\ No newline at end of file