Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

RvClient/build.gradle

@@ -107,6 +107,11 @@ dependencies {
     api 'com.jakewharton:butterknife:9.0.0-rc1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.6.1'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
+
+
     //    api project(path: ':RvTravel')
     api project(':component_resource')
     api project(path: ':module_home')

RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java

@@ -22,6 +22,7 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.util.LogUtils;
 import com.rv.component.utils.LogUtil;
 import com.sh.sdk.shareinstall.ShareInstall;
+import com.squareup.leakcanary.LeakCanary;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.smtt.sdk.QbSdk;
 import com.tencent.smtt.sdk.TbsListener;
@@ -103,6 +104,15 @@ public class RvClientApplication extends FrameApp {
             ARouter.openDebug();
         }
         ARouter.init(RvClientApplication.this);
+
+      /**********************内存检测****************************/
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+        /**********************************************/
     }
 
     private void initX5() {

RvClient/src/main/res/drawable/start_back_icon.xml

@@ -8,7 +8,7 @@
     <item>
         <bitmap
             android:gravity="bottom"
-            android:scaleType="centerCrop"
+            android:scaleType="matrix"
             android:src="@drawable/bottom_backgroud2"
             android:tileMode="disabled" />
     </item>

RvClient/src/main/res/values/styles.xml

@@ -17,6 +17,7 @@
         <item name="windowActionBar">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
+        <!-- 设置全屏 -->
         <item name="android:windowFullscreen">true</item>
     </style>
 

module_discovery/src/main/res/layout/activity_post_pat.xml

@@ -53,12 +53,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_15"
             android:layout_marginRight="@dimen/size_15"
-            android:paddingTop="@dimen/size_20"
-            android:paddingBottom="@dimen/size_20">
+            android:gravity="center_vertical"
+            android:paddingTop="@dimen/size_10"
+            android:paddingBottom="@dimen/size_10">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingTop="@dimen/size_8"
+                android:paddingBottom="@dimen/size_8"
                 android:src="@drawable/campsite_icon_citylocation_hint" />
 
             <TextView
@@ -72,6 +75,14 @@
                 android:text="您所在的位置"
                 android:textColor="@color/colorGray"
                 android:textSize="@dimen/text_12" />
+
+            <ImageView
+                android:id="@+id/iv_item_delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/size_8"
+                android:visibility="gone"
+                android:src="@drawable/common_icon_circle_delete" />
         </LinearLayout>
 
         <View

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -52,7 +52,6 @@ import com.rv.component.utils.DisplayUtil;
 import com.rv.component.utils.LogUtil;
 import com.rv.component.utils.MyUtils;
 import com.rv.component.utils.ObservableScrollView;
-
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
@@ -153,7 +152,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     TextView tvSeeMorePopular;
     @BindView(R2.id.rl_item_layout)
     RelativeLayout rlItemLayout;
-    @BindView(R2.id.scrollview)
+    @BindView(R2.id.os_scrollview)
     ObservableScrollView scrollview;
     @BindView(R2.id.ll_item_title)
     LinearLayout llItemTitle;
@@ -1081,7 +1080,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                     buffer.append("(").append(getCityName).append(")");
                 }
 
-                if (buffer.length() > 0) {
+                if (buffer != null && buffer.length() > 0) {
                     headTvGetShop.setText(buffer.toString());
                 } else {
                     headTvGetShop.setText("");
@@ -1102,7 +1101,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 if (!TextUtils.isEmpty(outCityName)) {
                     buffer.append("(").append(outCityName).append(")");
                 }
-                if (buffer.length() > 0) {
+                if (buffer != null && buffer.length() > 0) {
                     headTvOutShop.setText(buffer.toString());
                 } else {
                     headTvOutShop.setText("");

module_home/src/main/res/layout/activity_travel_order_details.xml

@@ -53,8 +53,6 @@
         </RelativeLayout>
     </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
-    <include layout="@layout/common_line" />
-
     <ProgressBar
         android:id="@+id/pb_progress"
         style="?android:attr/progressBarStyleHorizontal"

module_home/src/main/res/layout/fragment_home.xml

@@ -13,7 +13,7 @@
         android:layout_height="match_parent">
 
         <com.rv.component.utils.ObservableScrollView
-            android:id="@+id/scrollview"
+            android:id="@+id/os_scrollview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="none">