Merge pull request #15 from jpush/dev

Dev v0.2.0

Author: raoxudong

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
++ 新增：设置授权页背景图片
++ 新增：支持隐藏导航栏、返回按钮
 ## 0.1.0
 + 新增：SDK 清除预取号缓存接口
 + 新增：可设置横竖屏授权页接口

README.md

@@ -7,7 +7,7 @@
 
 ```yaml
 dependencies:
-  jverify: 0.1.0
+  jverify: 0.2.0
 ```
 
 ### 配置

android/build.gradle

@@ -40,5 +40,5 @@ android {
 dependencies {
     compileOnly files('libs/flutter.jar')
     implementation 'cn.jiguang.sdk:jverification:2.4.8'
-    implementation 'cn.jiguang.sdk:jcore:2.1.0'
+    implementation 'cn.jiguang.sdk:jcore:2.1.2'
 }

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

@@ -392,10 +392,14 @@ private void setCustomAuthorizationView(MethodCall call, Result result) {
   private  void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) {
     Log.d(TAG,"layoutOriginOuthView:");
 
+    Object authBackgroundImage = valueForKey(uiconfig,"authBackgroundImage");
+
     Object navColor = valueForKey(uiconfig,"navColor");
     Object navText = valueForKey(uiconfig,"navText");
     Object navTextColor = valueForKey(uiconfig,"navTextColor");
     Object navReturnImgPath = valueForKey(uiconfig,"navReturnImgPath");
+    Object navHidden = valueForKey(uiconfig,"navHidden");
+    Object navReturnBtnHidden = valueForKey(uiconfig,"navReturnBtnHidden");
 
     Object logoImgPath = valueForKey(uiconfig,"logoImgPath");
     Object logoWidth = valueForKey(uiconfig,"logoWidth");
@@ -455,7 +459,21 @@ private  void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder
     Object privacyNavReturnBtnImage = valueForKey(uiconfig,"privacyNavReturnBtnImage");
 
 
+
+    /************** 背景 ***************/
+    if (authBackgroundImage != null ){
+      int res_id = getResourceByReflect((String)authBackgroundImage);
+      if (res_id > 0) {
+        builder.setAuthBGImgPath((String)authBackgroundImage);
+      }
+    }
     /************** nav ***************/
+    if (navHidden != null) {
+      builder.setNavHidden((Boolean)navHidden);
+    }
+    if (navReturnBtnHidden != null) {
+      builder.setNavReturnBtnHidden((Boolean)navReturnBtnHidden);
+    }
     if (navColor != null){
       builder.setNavColor(exchangeObject(navColor));
     }

example/lib/main.dart

@@ -290,8 +290,10 @@ class _MyAppState extends State<MyApp> {
         /// ios项目存放在 Assets.xcassets。
         /// 
         JVUIConfig uiConfig = JVUIConfig();
-        uiConfig.navColor = Colors.red.value;
+        //uiConfig.authBackgroundImage = ;
 
+        //uiConfig.navHidden = true;
+        uiConfig.navColor = Colors.red.value;
         uiConfig.navText = "登录";
         uiConfig.navTextColor = Colors.blue.value;
         uiConfig.navReturnImgPath = "return_bg";//图片必须存在

example/pubspec.lock

@@ -52,7 +52,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.2.0"
   matcher:
     dependency: transitive
     description:

ios/Classes/JverifyPlugin.m

@@ -393,6 +393,29 @@ - (void)setCustomUIWithConfigWithMobile:(JVUIConfig *)mobileUIConfig
     unicomUIConfig.barStyle = 0;
     telecomUIConfig.barStyle = 0;
 
+     /************** 背景 ***************/
+    NSString *authBackgroundImage = [config objectForKey:@"authBackgroundImage"];
+    authBackgroundImage = authBackgroundImage?:nil;
+    if (authBackgroundImage) {
+        mobileUIConfig.authPageBackgroundImage = [UIImage imageNamed:authBackgroundImage];
+        unicomUIConfig.authPageBackgroundImage = [UIImage imageNamed:authBackgroundImage];
+        telecomUIConfig.authPageBackgroundImage = [UIImage imageNamed:authBackgroundImage];
+    }
+    
+     /************** 导航栏 ***************/
+    NSNumber *navHidden = [self getValue:config key:@"navHidden"];
+    if (navHidden) {
+        mobileUIConfig.navCustom = [navHidden boolValue];
+        unicomUIConfig.navCustom = [navHidden boolValue];
+        telecomUIConfig.navCustom = [navHidden boolValue];
+    }
+    NSNumber *navReturnBtnHidden = [self getValue:config key:@"navReturnBtnHidden"];
+    if (navReturnBtnHidden) {
+        mobileUIConfig.navReturnHidden = [navReturnBtnHidden boolValue];
+        unicomUIConfig.navReturnHidden = [navReturnBtnHidden boolValue];
+        telecomUIConfig.navReturnHidden = [navReturnBtnHidden boolValue];
+    }
+    
     NSNumber *navColor = [self getValue:config key:@"navColor"];
     if (navColor) {
         mobileUIConfig.navColor  = UIColorFromRGB([navColor intValue]);

lib/jverify.dart

@@ -251,10 +251,17 @@ class Jverify {
 *     Android   以屏幕左侧为 0 作为起点，往右侧则加，如果不传或者传 null，则默认屏幕居中
 * */
 class JVUIConfig {
+
+  /// 授权页背景图片
+  String authBackgroundImage;
+
+  /// 导航栏
   int navColor;
   String navText;
   int navTextColor;
   String navReturnImgPath;
+  bool navHidden = false;
+  bool navReturnBtnHidden = false;
 
   /// logo
   int logoWidth;
@@ -326,10 +333,13 @@ class JVUIConfig {
 
   Map toJsonMap() {
     return {
+      "authBackgroundImage": authBackgroundImage ??=null,
       "navColor": navColor ??= null,
       "navText": navText ??= null,
       "navTextColor": navTextColor ??= null,
       "navReturnImgPath": navReturnImgPath ??= null,
+      "navHidden": navHidden,
+      "navReturnBtnHidden": navReturnBtnHidden,
       "logoImgPath": logoImgPath ??= null,
       "logoWidth": logoWidth ??= null,
       "logoHeight": logoHeight ??= null,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jverify
 description: JIGUANG Official Jverifycation SDK flutter plugin project.
-version: 0.1.0
+version: 0.2.0
 author:  shikk <[email protected]>
 homepage: https://www.jiguang.cn