合并林峰代码

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 134
-        versionName "1.3.4"
+        versionCode 135
+        versionName "1.3.5"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

module_tourism/src/main/res/layout/activity_travel_details.xml

@@ -26,12 +26,12 @@
 
                 <ImageView
                     android:id="@+id/iv_back"
-                    android:layout_width="@dimen/size_32"
-                    android:layout_height="@dimen/size_32"
+                    android:layout_width="@dimen/size_40"
+                    android:layout_height="@dimen/size_40"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/size_5"
                     android:padding="@dimen/size_8"
-                    android:src="@drawable/rv_common_icon_back_dark" />
+                    android:src="@drawable/icon_webview_back" />
 
                 <TextView
                     android:id="@+id/tv_center"
@@ -56,21 +56,21 @@
 
                     <ImageView
                         android:id="@+id/iv_collect"
-                        android:layout_width="@dimen/size_32"
-                        android:layout_height="@dimen/size_32"
+                        android:layout_width="@dimen/size_38"
+                        android:layout_height="@dimen/size_38"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="@dimen/size_5"
                         android:padding="@dimen/size_8"
-                        android:src="@drawable/tourism_rv_collect" />
+                        android:src="@drawable/icon_webview_collect" />
 
                     <ImageView
                         android:id="@+id/iv_share"
-                        android:layout_width="@dimen/size_32"
-                        android:layout_height="@dimen/size_32"
+                        android:layout_width="@dimen/size_40"
+                        android:layout_height="@dimen/size_40"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="@dimen/size_5"
                         android:padding="@dimen/size_8"
-                        android:src="@drawable/tourism_rv_rentingcar_icon_share" />
+                        android:src="@drawable/icon_webview_share" />
 
                 </LinearLayout>
             </RelativeLayout>