From f9f533ef2b66f1bc46413e9d27f4f0ba0476698d Mon Sep 17 00:00:00 2001
From: maning <maning@yqjr.com.cn>
Date: Tue, 9 Jan 2018 15:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                         |  2 +-
 README.md                                              |  6 ++++++
 app/src/main/res/layout/item_train.xml                 |  7 +++----
 .../main/res/layout/layout_refresh_footer_normal.xml   | 10 +++++-----
 app/src/main/res/layout/layout_refresh_header.xml      | 10 +++++-----
 build.gradle                                           |  4 ++--
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 635999d..ba7052b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index 7ffca09..a8c660c 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,12 @@
 
 
 ## 更新日志：
+### V1.6.8 :
+    1.VectorDrawableCompat使用不规范而造成的崩溃问题
+    2.图片浏览新增收藏和取消收藏功能
+    3.更换提示ProgressDialog库
+    4.修复部分界面图片显示不出来问题
+
 ### V1.6.7 :
     1.Umeng统计页面的修复
     2.修复省份天气获取失败Bug
diff --git a/app/src/main/res/layout/item_train.xml b/app/src/main/res/layout/item_train.xml
index c98321c..ac80a4e 100644
--- a/app/src/main/res/layout/item_train.xml
+++ b/app/src/main/res/layout/item_train.xml
@@ -1,6 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
@@ -157,9 +156,9 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="16dp"
             android:layout_marginTop="16dp"
-            wheel:matProg_barColor="@color/white"
-            wheel:matProg_barWidth="2dp"
-            wheel:matProg_progressIndeterminate="true" />
+            app:matProg_barColor="@color/white"
+            app:matProg_barWidth="2dp"
+            app:matProg_progressIndeterminate="true" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerViewDetails"
diff --git a/app/src/main/res/layout/layout_refresh_footer_normal.xml b/app/src/main/res/layout/layout_refresh_footer_normal.xml
index d073fb5..4f4cca6 100755
--- a/app/src/main/res/layout/layout_refresh_footer_normal.xml
+++ b/app/src/main/res/layout/layout_refresh_footer_normal.xml
@@ -2,8 +2,8 @@
 <com.maning.gankmm.ui.view.ClassicLoadMoreFooterView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -16,9 +16,9 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="4dp"
             android:layout_toLeftOf="@+id/tvLoadMore"
-            wheel:matProg_barColor="@color/black_text2_color"
-            wheel:matProg_barWidth="2dp"
-            wheel:matProg_progressIndeterminate="true"/>
+            app:matProg_barColor="@color/black_text2_color"
+            app:matProg_barWidth="2dp"
+            app:matProg_progressIndeterminate="true"/>
 
         <ImageView
             android:id="@+id/ivSuccess"
diff --git a/app/src/main/res/layout/layout_refresh_header.xml b/app/src/main/res/layout/layout_refresh_header.xml
index c030b83..4ebfefb 100755
--- a/app/src/main/res/layout/layout_refresh_header.xml
+++ b/app/src/main/res/layout/layout_refresh_header.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.maning.gankmm.ui.view.TwitterRefreshHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/tools">
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -36,9 +36,9 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="44dp"
             android:layout_toLeftOf="@+id/tvRefresh"
-            wheel:matProg_barColor="?refresh_text_color"
-            wheel:matProg_barWidth="2dp"
-            wheel:matProg_progressIndeterminate="true" />
+            app:matProg_barColor="?refresh_text_color"
+            app:matProg_barWidth="2dp"
+            app:matProg_progressIndeterminate="true" />
 
         <TextView
             android:id="@+id/tvRefresh"
diff --git a/build.gradle b/build.gradle
index 02e06ff..7a534e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,8 +37,8 @@ ext {
     buildToolsVersion = "26.0.2"
     minSdkVersion = 16
     targetSdkVersion = 25
-    versionCode = 23
-    versionName = "1.6.7"
+    versionCode = 25
+    versionName = "1.6.8"
     storePassword = "123456"
     keyAlias = "Gank"
     keyPassword = "123456"