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

Animset/build.gradle

@@ -10,6 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -21,12 +22,21 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-    }
 }
 
 dependencies {

Banner/build.gradle

@@ -10,6 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -23,12 +24,23 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+    }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-    }
 }
 
 dependencies {

MyFrame/build.gradle

@@ -8,6 +8,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         //testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         //新版Gradle 是 implementation 为了兼容compile,写上这句话
         javaCompileOptions {
@@ -21,6 +22,18 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
+
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
@@ -29,7 +42,6 @@ android {
             //compile(name:'camerascan-1.0', ext:'aar')
         }
     }
-    }
 }
 
 dependencies {

OkGo/build.gradle

@@ -10,6 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -27,6 +28,18 @@ android {
             }
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

Resource/build.gradle

@@ -10,6 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -21,12 +22,25 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-    }
 }
 
 dependencies {

RvClient/build.gradle

 apply plugin: 'com.android.application'
 
 android {
+    String appId = "com.xxfc.rv"
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-
+        flavorDimensions "default"
         versionCode 135
         versionName "1.3.5"
         multiDexEnabled true
@@ -28,32 +28,34 @@ android {
         }
     }
     signingConfigs {
-        release {
-            keyAlias rootProject.ext.sign_xinxin.keyAlias
-            keyPassword rootProject.ext.sign_xinxin.keyPassword
-            storeFile file(rootProject.ext.sign_xinxin.storeReleaseFile)
-            storePassword rootProject.ext.sign_xinxin.storePassword
-        }
         debug {
             keyAlias 'xinxin'
             keyPassword '123456'
             storeFile file('../keystore/xinxin.jks')
             storePassword '123456'
         }
+        release {
+            keyAlias 'xinxin'
+            keyPassword '123456'
+            storeFile file('../keystore/xinxin.jks')
+            storePassword '123456'
+        }
+
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
         debug {
             debuggable true
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
 
         android.applicationVariants.all { variant ->
             variant.outputs.all {
-                //MedicalClient_{time}_v1.0.1_{build号}.apk
+
                 if (variant.buildType.name == 'release') {
                     def productVersion = "RV" + releaseTime() + "V" + defaultConfig.versionName + "Release" + ".apk";
                     outputFileName = productVersion
@@ -62,7 +64,26 @@ android {
         }
 
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+//            applicationId = appId + ".dev"
+
+            applicationId = appId
+        }
+
+        sit {
+//            applicationId = appId + ".sit"
+            applicationId = appId
+        }
+
+        pro {
+            applicationId = appId
+        }
+    }
 }
+
 //打包的时间
 static def releaseTime() {
     return new Date().format("yyyyMMddHHss", TimeZone.getTimeZone("GMT+8"))

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

+<resources>
+    <string name="app_name">滴房车(开发)</string>
+</resources>

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

+<resources>
+    <string name="app_name">滴房车(测试)</string>
+</resources>

RvFrame/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -19,17 +19,30 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-    }
     sourceSets {
         main {
             jniLibs.srcDir 'libs'

RvFrame/src/dev/java/com/frame/rv/config/RvFrameConfig.java

+package com.frame.rv.config;
+
+
+/**
+ * Created :Auser
+ * Date: 2019/5/9.
+ * Desc:
+ */
+
+public interface RvFrameConfig extends RvFrameConstant {
+//    String HOST = "https://xxtest.upyuns.com";
+//    String HOST = "http://10.1.37.192:8765";
+//    String HOST = "http://10.1.37.245:10000";
+    String HOST = "https://dev.dfangche.com";
+    String HOST_H5_DETAIL = HOST;
+    String ADMIN_POST = HOST + "/api/admin/";
+    String AUTH_POST = HOST + "/api/auth/";
+    String VEHICLE_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_UPLOAD = HOST + "/api/universal/";
+    String VEHICLE_ORDER = HOST + "/api/order/";
+    String VEHICLE_TOURUSER = HOST + "/api/tour/";
+    String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
+
+    String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
+
+    class RvFrameInfo {
+        public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
+    }
+
+}

RvFrame/src/pro/java/com/frame/rv/config/RvFrameConfig.java

+package com.frame.rv.config;
+
+
+/**
+ * Created :Auser
+ * Date: 2019/5/9.
+ * Desc:
+ */
+
+public interface RvFrameConfig extends RvFrameConstant {
+//    String HOST = "https://xxtest.upyuns.com";
+//    String HOST = "http://10.1.37.192:8765";
+//    String HOST = "http://10.1.37.245:10000";
+//    String HOST = "https://dev.dfangche.com";
+//    String HOST = "https://api.dfangche.com";
+    String HOST = "https://mgmt.dfangche.com";
+    String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
+    String ADMIN_POST = HOST + "/api/admin/";
+    String AUTH_POST = HOST + "/api/auth/";
+    String VEHICLE_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_UPLOAD = HOST + "/api/universal/";
+    String VEHICLE_ORDER = HOST + "/api/order/";
+    String VEHICLE_TOURUSER = HOST + "/api/tour/";
+    String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
+
+    String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
+
+    class RvFrameInfo {
+        public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
+    }
+
+}

RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java → RvFrame/src/sit/java/com/frame/rv/config/RvFrameConfig.java

@@ -8,15 +8,14 @@ package com.frame.rv.config;
  */
 
 public interface RvFrameConfig extends RvFrameConstant {
-//    String HOST = "https://xxtest.upyuns.com";
+    String HOST = "https://xxtest.upyuns.com";
 //    String HOST = "http://10.1.37.192:8765";
 //    String HOST = "http://10.1.37.245:10000";
-    String HOST = "https://dev.dfangche.com";
+//    String HOST = "https://dev.dfangche.com";
 //    String HOST = "https://api.dfangche.com";
 //    String HOST = "https://mgmt.dfangche.com";
 //    String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
-//    String HOST_H5_DETAIL = "https://xxtest.upyuns.com";
-    String HOST_H5_DETAIL = "https://dev.dfangche.com";
+    String HOST_H5_DETAIL = HOST;
     String ADMIN_POST = HOST + "/api/admin/";
     String AUTH_POST = HOST + "/api/auth/";
     String VEHICLE_POST = HOST + "/vehicle/";//租车

RvTravel/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -33,6 +33,8 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
@@ -41,6 +43,17 @@ android {
             //compile(name:'camerascan-1.0', ext:'aar')
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
     }
 
 

RvWrapper/build.gradle

@@ -8,7 +8,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
     }
 
     buildTypes {
@@ -28,6 +28,17 @@ android {
             jniLibs.srcDir 'libs'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java

@@ -82,6 +82,7 @@ public class GlideManager {
                 .error(R.drawable.glide_icon_error)
                 .apply(new RequestOptions()
                         .skipMemoryCache(false)
+                        .disallowHardwareConfig()
                         .diskCacheStrategy(DiskCacheStrategy.ALL))
                 .into(image);
     }

SweetDialog/build.gradle

@@ -9,6 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -20,14 +21,25 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-
-    }
 }
 
 dependencies {

Utils/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
+        flavorDimensions "default"
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -29,12 +30,24 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
     repositories {
         flatDir {
             dirs 'libs' //this way we can find the .aar file in libs folder
         }
     }
-    }
 }
 
 dependencies {

component_control/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -21,6 +21,18 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
 }
 
 dependencies {

component_dialog/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -21,6 +21,16 @@ android {
         }
 
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {

component_resource/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -20,7 +20,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
 
+        pro {
+        }
+    }
 }
 
 dependencies {

component_utils/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -21,6 +21,18 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
 }
 
 dependencies {

module_camp/build.gradle

@@ -20,7 +20,7 @@ android {
 
             }
         }
-
+        flavorDimensions "default"
     }
 
     buildTypes {
@@ -29,6 +29,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {
@@ -36,7 +46,7 @@ dependencies {
     api 'com.jakewharton:butterknife:9.0.0-rc1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
-    annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     api project(':RvWrapper')
     api project(':component_control')
     api project(':component_resource')

module_discovery/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -34,6 +34,16 @@ android {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {

module_home/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         javaCompileOptions {
 
             annotationProcessorOptions {
@@ -28,6 +28,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {

module_mine/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
 
         javaCompileOptions {
 
@@ -28,6 +28,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {

module_tourism/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
 
         javaCompileOptions {
 
@@ -29,6 +29,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+        sit {
+        }
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_calendar/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_carpurchase/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_coupon/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_imcamera/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_login/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -20,6 +20,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_member/build.gradle

@@ -9,7 +9,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -21,6 +21,18 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
 }
 
 dependencies {

plugin_points/build.gradle

@@ -10,7 +10,7 @@ android {
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -22,6 +22,17 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_search/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {

plugin_share/build.gradle

@@ -8,7 +8,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -19,6 +19,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 repositories {

plugin_share/src/main/java/com/rv/share/BillActivity.java

@@ -131,6 +131,11 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
         public void finish() {
 
         }
+
+        @Override
+        public void showShareIcon(String url, String imgUrl, String title, String circleTitle, String desc) {
+
+        }
     };
 
 

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -22,6 +22,7 @@ import android.widget.Toast;
 
 import com.base.utils.ui.image.round.RoundImageView;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.ruiwenliu.wrapper.SPConstance;
@@ -90,7 +91,9 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
                 .asBitmap()
                 .load(R.drawable.bg_bill)
                 .apply(options)
-                .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight()))
+                .apply(RequestOptions
+                        .bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight())
+                        .disallowHardwareConfig())
                 .into(utils);
 
         UserInfoBean userInfoBean = (UserInfoBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.USER);

plugin_share/src/main/java/com/rv/share/WebViewActivity.java

@@ -10,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.base.utils.tools.android.NetworkUtil;
+import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
@@ -24,6 +25,7 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
     private String url;
     private String title;
     private RvWebView rvWebView;
+    private TitleView titleView;
 
     public static Intent getIntent(Context context, String url, String name) {
         Intent intent = new Intent(context, WebViewActivity.class);
@@ -93,17 +95,37 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
     private RvWebView.WebViewListener listener = new RvWebView.WebViewListener() {
         @Override
         public void share(String url, String imgUrl, String title, String circleTitle, String desc) {
-            mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc);
+            String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
+            mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
         }
 
         @Override
         public void share(String url, String title, String desc) {
-            mPresenter.showShareDialog(url, null, title, null, desc);
+            mPresenter.showShareDialog(url, null, title, null, desc, null);
         }
 
         @Override
         public void finish() {
 
         }
+
+        @Override
+        public void showShareIcon(final String url, final String imgUrl, final String title, final String circleTitle, final String desc) {
+
+//            runOnUiThread(new Runnable() {
+//                @Override
+//                public void run() {
+//                    titleView.setVisible(R.id.iv_title_right, true);
+//                    titleView.setImageResource(R.id.iv_title_right, R.drawable.tourism_rv_rentingcar_icon_share);
+//                    titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
+//                        @Override
+//                        public void onClick(View v) {
+//                            String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
+//                            mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
+//                        }
+//                    });
+//                }
+//            });
+        }
     };
 }

plugin_share/src/main/java/com/rv/share/presenter/WebViewPresenter.java

@@ -35,12 +35,14 @@ public class WebViewPresenter extends CommonPresenter {
     private String mImgUrl;
     private String mCircleTitle;
     private RvWebView webView;
+    private String billUrl;
 
     public void setWebView(RvWebView webView) {
         this.webView = webView;
     }
 
-    public void showShareDialog(String url, String imgUrl, String title, String circleTitle, String descript) {
+    public void showShareDialog(String url, String imgUrl, String title, String circleTitle, String descript, String newPersonbillUrl) {
+        this.billUrl = newPersonbillUrl;
         this.mUrl = url;
         this.mImgUrl = imgUrl;
         this.mCircleTitle = circleTitle;
@@ -187,8 +189,7 @@ public class WebViewPresenter extends CommonPresenter {
 
         @Override
         public void billShare() {
-            String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
-//            String billUrl = "https://xxtest.upyuns.com/h5/appHtml/view/poster.html" ;
+            if (!TextUtils.isEmpty(billUrl))
                 getPresenterContext().startActivity(BillActivity.getIntent(getPresenterContext(), billUrl));
         }
 

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -82,7 +82,7 @@ public class RvWebView extends WebView {
         setWebChromeClient(webChromeClient);
     }
 
-    public WebViewClient webViewClient = new WebViewClient() {
+    private WebViewClient webViewClient = new WebViewClient() {
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
             return super.shouldOverrideUrlLoading(view, request);
@@ -182,6 +182,13 @@ public class RvWebView extends WebView {
             }
         }
 
+        @JavascriptInterface
+        public void showShareIcon(String url, String imgUrl, String title, String titleCircle, String desc) {
+            if (listener != null) {
+                listener.showShareIcon(url, imgUrl, title, titleCircle, desc);
+            }
+        }
+
 
         @JavascriptInterface
         public void toMyWallet() {
@@ -208,6 +215,8 @@ public class RvWebView extends WebView {
         void share(String url, String title, String desc);
 
         void finish();
+
+        void showShareIcon(String url, String imgUrl, String title, String circleTitle, String desc);
     }
 
     @Override

plugin_time/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
 }
 
 dependencies {

plugin_version/build.gradle

@@ -7,8 +7,8 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 24
-
+        targetSdkVersion 28
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -20,6 +20,19 @@ android {
         }
     }
 
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
+
+
 }
 
 dependencies {

plugin_wallet/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
+        flavorDimensions "default"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -29,6 +29,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        //开发环境
+        dev {
+        }
+
+        sit {
+        }
+
+        pro {
+        }
+    }
 }
 
 dependencies {