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

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

@@ -144,7 +144,7 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
                                 .apkPath(versionCheckBean.getData().getDownloadUrl())
                                 .updateInfo(versionCheckBean.getData().getContent())
                                 .apkSize(versionCheckBean.getData().getPackagesize())
-                                .isForce(versionCheckBean.getData().getIsCompe() == 0 ? false : true)
+                                .isForce(versionCheckBean.getData().getIsCompel() == 0 ? false : true)
                                 .update();
                     }
                 }

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

@@ -85,6 +85,12 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
         return R.layout.rv_act_share_image;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
+    }
+
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);

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

@@ -3,36 +3,44 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/colorYellow"
     android:orientation="vertical"
     tools:context=".rv.module.ui.main.home.ShareImageActivity">
 
-    <RelativeLayout
+    <com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
+        app:use_type="use_padding_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_50">
-
-        <ImageView
-            android:id="@+id/img_title_left"
-            android:layout_width="@dimen/size_32"
-            android:layout_height="@dimen/size_32"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/size_5"
-            android:clickable="true"
-            android:padding="@dimen/size_8"
-            android:src="@drawable/rv_common_icon_back_dark" />
-
-        <TextView
-            android:id="@+id/tv_share"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:padding="@dimen/size_15"
-            android:text="分享"
-            android:textColor="@color/colorWrite"
-            android:textSize="@dimen/text_16" />
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/size_50">
+
+            <ImageView
+                android:id="@+id/img_title_left"
+                android:layout_width="@dimen/size_32"
+                android:layout_height="@dimen/size_32"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/size_5"
+                android:clickable="true"
+                android:padding="@dimen/size_8"
+                android:src="@drawable/rv_common_icon_back_dark" />
+
+            <TextView
+                android:id="@+id/tv_share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerInParent="true"
+                android:padding="@dimen/size_15"
+                android:text="分享"
+                android:textColor="@color/colorWrite"
+                android:textSize="@dimen/text_16" />
+        </RelativeLayout>
+    </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
     <View
         android:layout_width="match_parent"

module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java

@@ -114,7 +114,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
                             .apkPath(versionCheckBean.getData().getDownloadUrl())
                             .updateInfo(versionCheckBean.getData().getContent())
                             .apkSize(versionCheckBean.getData().getPackagesize())
-                            .isForce(versionCheckBean.getData().getIsCompe() == 0 ? false : true)
+                            .isForce(versionCheckBean.getData().getIsCompel() == 0 ? false : true)
                             .update();
                 }
             } else {

plugin_version/src/main/java/com/rv/version/bean/VersionCheckBean.java

@@ -31,7 +31,16 @@ public class VersionCheckBean extends BaseBean {
         private String content;
         private String downloadUrl;
         private int downloadSwitch;
-        private int isCompe ;
+        private int isCompel ;
+
+        public int getIsCompel() {
+            return isCompel;
+        }
+
+        public void setIsCompel(int isCompel) {
+            this.isCompel = isCompel;
+        }
+
         private int weigh;
         private long crtTime;
         private int isDel;
@@ -124,12 +133,5 @@ public class VersionCheckBean extends BaseBean {
             this.isDel = isDel;
         }
 
-        public int getIsCompe() {
-            return isCompe;
-        }
-
-        public void setIsCompe(int isCompe) {
-            this.isCompe = isCompe;
-        }
     }
 }