feature:add custom close

Author: sherry

README.md

@@ -1,6 +1,8 @@
 # JVerification-React-Native
 
 ## ChangeLog
+### v 2.4.4
+- android增加弹窗自定义关闭按钮
 
 ### v 2.4.3
 - iOS、android增加弹窗登录

android/src/main/java/cn/jiguang/plugins/verification/JVerificationModule.java

@@ -3,6 +3,8 @@
 import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.ImageButton;
+import android.view.ViewGroup;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactRootView;
@@ -441,6 +443,22 @@ private void convertToConfig(ReadableMap readableMap){
             ReadableArray array = readableMap.getArray(JConstans.PRIVACY_DIALOG_THEME);
             builder.setDialogTheme(array.getInt(0), array.getInt(1),array.getInt(2), array.getInt(3), array.getBoolean(4));
         }
+        // 弹窗是否需要关闭
+        if (readableMap.hasKey(JConstans.PRIVACY_NEED_CLOSE) && readableMap.hasKey(JConstans.PRIVACY_CLOSE_THEME)) {
+            boolean needClose = readableMap.getBoolean(JConstans.PRIVACY_NEED_CLOSE);
+            if(needClose) {
+                //自定义返回按钮示例 
+                ImageButton sampleReturnBtn = new ImageButton(reactContext);
+                sampleReturnBtn.setImageResource(R.drawable.umcsdk_return_bg);
+                RelativeLayout.LayoutParams returnLP = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                // 返回按钮样式
+                ReadableArray array = readableMap.hasKey(JConstans.PRIVACY_CLOSE_THEME) ? readableMap.getArray(JConstans.PRIVACY_CLOSE_THEME) : null;
+                returnLP.setMargins(array.getInt(0), array.getInt(1),array.getInt(2), array.getInt(3));
+                sampleReturnBtn.setLayoutParams(returnLP);
+                builder.addCustomView(sampleReturnBtn,true,null);
+            }
+        }
+
     }
 
     private ReactRootView convertToView(ReadableMap readableMap){

android/src/main/java/cn/jiguang/plugins/verification/common/JConstans.java

@@ -106,5 +106,9 @@ public class JConstans {
     public static final String PRIVACY_NEED_CLOSE_ANIM = "privacyNeedCloseAnim";
     // 授权页弹窗模式
     public static final String PRIVACY_DIALOG_THEME = "privacyDialogTheme";
+    // 弹窗是否需要配置关闭按钮
+    public static final String PRIVACY_NEED_CLOSE = "privacyNeedClose";
+    // 弹窗关闭按钮模式
+    public static final String PRIVACY_CLOSE_THEME = "privacyCloseTheme";
 
 }

example/App.js

@@ -155,10 +155,8 @@ const codeConfig = {
 };
 //安卓授权页弹窗模式
 const androidDialogConfig = {
-    // navHidden: false,                         //导航栏是否隐藏
-    // navColor: -16777216,                      //导航栏颜色
-    // navReturnHidden: false,                   //导航栏返回按钮是否隐藏
-    // navReturnImage: 'close',                  //导航栏左侧返回按钮图标
+    privacyNeedClose:true,                       //弹窗是否需要关闭按钮 
+    privacyCloseTheme:[10, 60, 0, 0],            //弹窗关闭按钮偏移量 privacyNeedClose为true时，必须设置它的偏移量
     privacyDialogTheme: [300, 400, 0, 0, false], //授权页弹窗模式
     privacyNeedStartAnim: true,                  //设置拉起授权页时是否需要显示默认动画 默认展示
     privacyNeedCloseAnim: true,                  //设置关闭授权页时是否需要显示默认动画 默认展示
@@ -258,6 +256,7 @@ export default class App extends React.Component {
 
                 <Button title='设置获取验证码时间间隔' onPress={() => JVerification.setCodeTime(1000)}/>
 
+
             </View>
         );
     }

example/android/settings.gradle

@@ -3,6 +3,6 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
 include ':app'
 
 include ':jverification-react-native'
-project(':jverification-react-native').projectDir = new File(rootProject.projectDir, '../../android')
+project(':jverification-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jverification-react-native/android')
 include ':jcore-react-native'
 project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')

example/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "jcore-react-native": "^1.7.0",
-    "jverification-react-native": "2.4.3",
+    "jverification-react-native": "2.4.4",
     "react": "16.8.6",
     "react-native": "0.60.5"
   },

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "license": "ISC",
   "author": "wicked.tc130",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/jpush/jverification-react-native"