Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

# Conflicts:
#	RvClient/build.gradle

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 152
-        versionName "1.5.2"
+        versionCode 151
+        versionName "1.5.1"
         multiDexEnabled true
 
 

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

@@ -175,7 +175,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
      */
     private void checkPermissions() {
         if (!EasyPermissions.hasPermissions(this, permissions)) {
-            EasyPermissions.requestPermissions(this, "App需要此权限，否则无法正常使用", IChatView.REQUEST_PERMISSION_FILE, permissions);
+            EasyPermissions.requestPermissions(this, "App正常使用，需要以下权限", IChatView.REQUEST_PERMISSION_FILE, permissions);
             return;
         }
     }
@@ -444,12 +444,21 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 1001) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                updateAppUtils.download();
+            } else {
+                Toast.makeText(getApplicationContext(), "授权失败,无法下载最新App", Toast.LENGTH_SHORT).show();
+            }
+        } else {
             EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
         }
 
+    }
+
     @Override
     public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
-
+        Log.d(TAG, "授权成功");
     }
 
     @Override

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

@@ -50,7 +50,7 @@ import me.jessyan.autosize.onAdaptListener;
 public class RvClientApplication extends FrameApp {
     final public static String token = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzc2NjY2NjY2NiIsInVzZXJJZCI6IjE1IiwicmVxdWVzdFR5cGUiOiJBUFAiLCJleHAiOjE1NTk4MDU4Mjd9.NAzU25an3hqrbQI2dsroONtckMmQZRUikqBXxThGRQb578Adq7lQKM-jPw2ViCuXUcGuNRPG47d1hCzyRZH_-8nkG2ls7F0zRMATbcWIL0fozLKS4puMYT_I359JIdp_a6onEmfX0RMunupp0tbRlrbdaVLIIXIvA4nU8b_b4Rc";
     //ARouter 调试开关
-    private boolean isDedugARouter = false;
+    private boolean isDedugARouter = true;
 
     @Override
     public void onCreate() {

RvClient/src/sit/res/values/strings.xml

 <resources>
     <string name="app_name">滴房车(测试)</string>
-	<string name="share_install_key">B2BK2RRE67RHH7</string>
-	<string name="share_install_scheme">ceck9380</string>
+	<string name="share_install_key">FBBK26FRR667RB</string>
+	<string name="share_install_scheme">dgqq8993</string>
 </resources>

RvWrapper/src/main/assets/city.json

@@ -1176,6 +1176,10 @@
     }, {
       "name": "中山区",
       "id": 210202
+    },{
+      "name": "中山市",
+      "id": 442000
+
     }, {
       "name": "钟山区",
       "id": 520201

plugin_poster/src/main/java/com/rv/poster/plugin/CarPosterActivity.java

@@ -197,11 +197,11 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
     /******
      * 分享
      */
-    public void share(View view) {
+    public void share(ScrollView view) {
         if (shareManager == null) {
 
             if (view != null && bitmap == null) {
-                bitmap = ShareUtils.viewConversionBitmap(view);
+                bitmap = ShareUtils.getBitmapByView(view);
             }
             File file = null;
             if (bitmap != null) {

plugin_poster/src/main/java/com/rv/poster/plugin/PosterActivity.java

@@ -204,11 +204,11 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
     /******
      * 分享
      */
-    public void share(View view) {
+    public void share(ScrollView view) {
         if (shareManager == null) {
 
             if (view != null && bitmap == null) {
-                bitmap = ShareUtils.viewConversionBitmap(view);
+                bitmap = ShareUtils.getBitmapByView(view);
             }
             File file = null;
             if (bitmap != null) {