Merge pull request #12 from andy6shen/dev

修复自定义视图无法点击的问题；修复安卓自定义视图不显示的问题

Author: andy6shen

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

@@ -1,11 +1,10 @@
 package cn.jiguang.plugins.verification;
 
-import android.app.Application;
 import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -15,9 +14,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.react.shell.MainReactPackage;
 
 import java.lang.reflect.Field;
 
@@ -403,16 +400,8 @@ private ReactRootView convertToView(ReadableMap readableMap){
             return null;
         }
         ReactRootView reactView = new ReactRootView(reactContext);
-        ReactInstanceManager reactInstanceManager = ReactInstanceManager.builder()
-                .setApplication((Application) reactContext.getApplicationContext())
-                .setCurrentActivity(getCurrentActivity())
-                .setBundleAssetName("index.android.bundle")
-                .setJSMainModulePath("index")
-                .addPackage(new MainReactPackage())
-                .setUseDeveloperSupport(true)
-                .setInitialLifecycleState(LifecycleState.RESUMED)
-                .build();
-        reactView.startReactApplication(reactInstanceManager, viewName, null);
+        ReactApplication application = (ReactApplication)getCurrentActivity().getApplication();
+        reactView.startReactApplication(application.getReactNativeHost().getReactInstanceManager(), viewName);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
         if (viewPoint != null) {
             int marginLeft = dp2Pix(viewPoint.getInt(0));

example/App.js

@@ -141,9 +141,9 @@ const customConfigParams = {
 };
 
 const customViewParams = [
-    {customViewName: 'customView1', customViewPoint: [20, 200]},
-    {customViewName: 'customView2', customViewPoint: [20, 300]},
-    {customViewName: 'customView3', customViewPoint: [20, 400]},
+    {customViewName: 'customView1', customViewPoint: [20, 200, 150, 30]},
+    {customViewName: 'customView2', customViewPoint: [20, 300, 150, 30]},
+    {customViewName: 'customView3', customViewPoint: [20, 400, 150, 30]},
 ];
 
 export default class App extends React.Component {

example/android/app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"

example/android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

index.js

@@ -122,6 +122,9 @@ export default class JVerification {
         if (Platform.OS == 'android') {
             JVerificationModule.dismissLoginAuthActivity();
         }
+        else {
+            JVerificationModule.dismissLoginController();
+        }
     }
 
     /**

ios/RCTJVerificationModule/RCTJVerificationModule.m

@@ -196,15 +196,26 @@ + (BOOL)requiresMainQueueSetup
     dispatch_async(dispatch_get_main_queue(), ^{
         [JVERIFICATIONService customUIWithConfig:config customViews:^(UIView *customAreaView) {
             for (int i = 0; i < viewParams.count; i++) {
-                NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-                RCTRootView *rctView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:viewParams[i][CUSTOM_VIEW_NAME] initialProperties:nil launchOptions:nil];
+                RCTRootView *rctView;
+                if (self.bridge) {
+                    rctView = [[RCTRootView alloc] initWithBridge:self.bridge moduleName:viewParams[i][CUSTOM_VIEW_NAME] initialProperties:nil];
+                }
+                else {
+                    NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+                    rctView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:viewParams[i][CUSTOM_VIEW_NAME] initialProperties:nil launchOptions:nil];
+                }
                 NSArray *point = viewParams[i][CUSTOM_VIEW_POINT];
                 NSNumber *pointX = point[0];
                 NSNumber *pointY = point[1];
+                NSNumber *pointW = point[2];
+                NSNumber *pointH = point[3];
                 CGFloat x = [pointX doubleValue];
                 CGFloat y = [pointY doubleValue];
+                CGFloat w = [pointW doubleValue];
+                CGFloat h = [pointH doubleValue];
                 CGRect customFrame = rctView.frame;
                 customFrame.origin = CGPointMake(x, y);
+                customFrame.size = CGSizeMake(w, h);
                 rctView.frame = customFrame;
                 [customAreaView addSubview:rctView];
             }