Merge remote-tracking branch 'upstream/master' into dev

Author: hyhSuper

android/build.gradle

@@ -1,4 +1,3 @@
-
 group 'com.jiguang.jverify'
 version '1.0-SNAPSHOT'
 
@@ -29,13 +28,13 @@ android {
         minSdkVersion 17
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-
+        // library 混淆 -> 随 library 引用，自动添加到 apk 打包混淆
+        consumerProguardFiles 'consumer-rules.pro'
     }
+
     lintOptions {
         disable 'InvalidPackage'
     }
-
-
 }
 
 dependencies {

android/consumer-rules.pro

@@ -0,0 +1,25 @@
+# 极光一键认证
+
+-dontoptimize
+-dontpreverify
+
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
+
+-dontwarn cn.com.chinatelecom.**
+-keep class cn.com.chinatelecom.** { *; }
+-dontwarn com.ct.**
+-keep class com.ct.** { *; }
+-dontwarn a.a.**
+-keep class a.a.** { *; }
+-dontwarn com.cmic.**
+-keep class com.cmic.** { *; }
+-dontwarn com.unicom.**
+-keep class com.unicom.** { *; }
+-dontwarn com.sdk.**
+-keep class com.sdk.** { *; }
+
+-dontwarn com.sdk.**
+-keep class com.sdk.** { *; }

android/src/main/java/com/jiguang/jverify/JverifyPlugin.java

@@ -506,6 +506,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
         Object navReturnImgPath = valueForKey(uiconfig, "navReturnImgPath");
         Object navHidden = valueForKey(uiconfig, "navHidden");
         Object navReturnBtnHidden = valueForKey(uiconfig, "navReturnBtnHidden");
+        Object navTransparent = valueForKey(uiconfig, "navTransparent");
 
         Object logoImgPath = valueForKey(uiconfig, "logoImgPath");
         Object logoWidth = valueForKey(uiconfig, "logoWidth");
@@ -649,6 +650,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
         if (navReturnBtnHidden != null) {
             builder.setNavReturnBtnHidden((Boolean) navReturnBtnHidden);
         }
+        if (navTransparent != null) {
+            builder.setNavTransparent((Boolean) navTransparent);
+        }
         if (navColor != null) {
             builder.setNavColor(exchangeObject(navColor));
         }

ios/Classes/JverifyPlugin.m

@@ -477,6 +477,10 @@ - (void)setCustomUIWithUIConfig:(JVUIConfig *)uiconfig configArguments:(NSDictio
     if(imageName){
         uiconfig.navReturnImg  = [UIImage imageNamed:imageName];
     }
+    NSNumber *navTransparent = [self getValue:config key:@"navTransparent"];
+    if (navTransparent) {
+        uiconfig.navTransparent = [navTransparent boolValue];
+    }
     uiconfig.navReturnHidden = NO;
 
     /************** logo ***************/

lib/jverify.dart

@@ -463,6 +463,7 @@ class JVUIConfig {
   String navReturnImgPath;
   bool navHidden = false;
   bool navReturnBtnHidden = false;
+  bool navTransparent = false;
 
   /// logo
   int logoWidth;
@@ -576,6 +577,7 @@ class JVUIConfig {
       "navReturnImgPath": navReturnImgPath ??= null,
       "navHidden": navHidden,
       "navReturnBtnHidden": navReturnBtnHidden,
+      "navTransparent": navTransparent,
       "logoImgPath": logoImgPath ??= null,
       "logoWidth": logoWidth ??= null,
       "logoHeight": logoHeight ??= null,