merge jg

Author: JoshLipan

JVerification_Hbuilder_Demo/manifest.json

@@ -52,13 +52,13 @@
             "sdkConfigs" : {}
         },
         "nativePlugins" : {
-            "JIGUANG-JVerification" : {
-                "JPUSH_APPKEY_ANDROID" : "",
-                "JPUSH_CHANNEL_IOS" : "",
+            "JG-JVerification" : {
                 "JPUSH_APPKEY_IOS" : "",
-                "JPUSH_CHANNEL_ANDROID" : "",
+                "JPUSH_CHANNEL_ANDROID" : "3bc7fe126f892557a954aa07",
+                "JPUSH_APPKEY_ANDROID" : "3bc7fe126f892557a954aa07",
+                "JPUSH_CHANNEL_IOS" : "",
                 "__plugin_info__" : {
-                    "name" : "JIGUANG-JVerification",
+                    "name" : "JG-JVerification",
                     "description" : "极光认证Hbuilder插件",
                     "platforms" : "Android,iOS",
                     "url" : "",
@@ -68,16 +68,6 @@
                     "bought" : -1,
                     "pid" : "",
                     "parameters" : {
-                        "JPUSH_APPKEY_ANDROID" : {
-                            "des" : "[Android]极光 portal 配置应用信息时分配的 AppKey",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_IOS" : {
-                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值 developer-default",
-                            "key" : "JVerification:CHANNEL",
-                            "value" : ""
-                        },
                         "JPUSH_APPKEY_IOS" : {
                             "des" : "[iOS]极光 portal 配置应用信息时分配的 AppKey",
                             "key" : "JVerification:APP_KEY",
@@ -87,6 +77,16 @@
                             "des" : "[Android]用于统计分发渠道，不需要可填默认值 developer-default",
                             "key" : "JPUSH_CHANNEL",
                             "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光 portal 配置应用信息时分配的 AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值 developer-default",
+                            "key" : "JVerification:CHANNEL",
+                            "value" : ""
                         }
                     }
                 }

JVerification_Hbuilder_Demo/nativeplugins/JIGUANG-JVerification/android/libs/arm64-v8a/libCtaApiLib.so JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/arm64-v8a/libCtaApiLib.so

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Headers/JVerificationModule.h</key>
+		<data>
+		C7CBfnA7xVmtoEwoxT2ZYUikKAA=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		EaQs9GvG+ji+9SX0zTBwEfSdgtA=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/JVerificationModule.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			C7CBfnA7xVmtoEwoxT2ZYUikKAA=
+			</data>
+			<key>hash2</key>
+			<data>
+			hPa2AkGyC8u/NmUo7wJ3QulS73C8W44clRoRK9A5IzA=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

JVerification_Hbuilder_Demo/nativeplugins/JIGUANG-JVerification/android/libs/arm64-v8a/libjcore224.so JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/arm64-v8a/libjcore224.so

@@ -1,14 +1,14 @@
 {
-	"name": "JIGUANG-JVerification",
-	"id": "JIGUANG-JVerification",
-	"version": "1.0.0",
+	"name": "JG-JVerification",
+	"id": "JG-JVerification",
+	"version": "1.0.1",
 	"description": "极光认证Hbuilder插件",
 	"_dp_type":"nativeplugin",
 	"_dp_nativeplugin":{
 		"ios": {
 			"plugins": [{
 				"type": "module",
-				"name": "JIGUANG-JVerification",
+				"name": "JG-JVerification",
 				"class": "JVerificationModule"
 			}],
 			"integrateType": "framework",
@@ -46,7 +46,7 @@
 			"plugins": [
 				{
 					"type": "module",
-					"name": "JIGUANG-JVerification",
+					"name": "JG-JVerification",
 					"class": "cn.jiguang.uniplugin_jverification.JVerificationWXModule"
 				}
 			],

JVerification_Hbuilder_Demo/nativeplugins/JIGUANG-JVerification/android/libs/armeabi-v7a/libCtaApiLib.so JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/armeabi-v7a/libCtaApiLib.so

@@ -12,5 +12,15 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

JVerification_Hbuilder_Demo/nativeplugins/JIGUANG-JVerification/android/libs/armeabi-v7a/libjcore224.so JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/armeabi-v7a/libjcore224.so

@@ -9,14 +9,15 @@
 		<button type="primary" @click="clearPreLoginCache()">清除预取号缓存</button>
 		<button type="primary" @click="loginAuth()">请求授权一键登录</button>
 		<button type="primary" @click="setCustomUIWithConfig()">自定义授权页面样式</button>
+		<button type="primary" @click="setCustomDialog()">自定义弹窗授权页</button>
 		<view class="msg-box" >
 			<text class="msg">{{msg}}</text>
 		</view>
 	</view>
 </template>
 
 <script>
-	const jv = uni.requireNativePlugin('JIGUANG-JVerification')
+	const jv = uni.requireNativePlugin('JG-JVerification')
 	export default {
 		data() {
 			return {
@@ -88,19 +89,121 @@
 			},
 			// 自定义授权页面 UI 样式
 			setCustomUIWithConfig:function(){
+				let self = this;
+				this.jv.addCustomViewsClickCallback(id=>{
+					self.showModal('customViewclick',"id:"+id);
+				});
+				
 				if(uni.getSystemInfoSync().platform == "ios"){
 					this.jv.setCustomUIWithConfigiOS({
 						navColor:0xff000000,
-						logBtnText:" 极光认证测试 ",
+						logBtnText:"极光认证测试",
 						privacyState:true,
-						appPrivacyColor:[0xff000000,0xff000000]
+						appPrivacyColor:[0xff000200,0xff000000],
+						addCustomViews:[{
+								type:"label",
+								width:120,
+								height:20,
+								top:320,
+								left:100,
+								backgroundColor:0xff7b68ee,
+								text:"自定义label",
+								textFont:20,
+								textAlignment:15,
+								numberOfLines:2,
+								cornerRadius:10,
+								textColor:0xff000000
+							},
+							{
+								type:"button",
+								id: "buttonTest",
+								width:80,
+								height:44,
+								textColor:0xFFC0CB,
+								cornerRadius:22,
+								left:50,
+								bottom: -100,
+								title:"点击测试",
+							},
+							{
+								type:"imageView",
+								width:50,
+								height:50,
+								cornerRadius:25,
+								right:-100,
+								bottom: -100,
+								imagePath:"static/qq.png"
+							}]
+					})
+				}else{
+					this.jv.addCustomViewsClickCallback(id=>{
+						self.showModal('customViewclick',"id:"+id);
+					});
+					this.jv.setCustomUIWithConfigAndroid({
+						setNavColor:0xff000000,
+						setLogBtnText:" 极光认证测试 ",
+						setPrivacyState:false,
+						setAppPrivacyColor:[0xff00f000,0xff000000],
+						addCustomViews:[{
+							type:"text",
+							finishFlag:false,
+							id:"id1",
+							width:100,
+							height:50,
+							text:"自定义tv",
+							textSize:20,
+							align:15,
+							margins:[0,100,0,0],
+							bgColor:0xff7b68ee
+						},
+						{
+							type:"image",
+							finishFlag:true,
+							id:"id2",
+							width:50,
+							height:50,
+							align:13,
+							margins:[0,0,0,0],
+							bgImgPath:"static/qq.png"
+						}]
+					})
+				}
+				
+			},
+			setCustomDialog:function(){
+				if(uni.getSystemInfoSync().platform == "ios"){
+					this.jv.setCustomUIWithConfigiOS({
+						navCustom:true,
+						autoLayout:true,
+						showWindow:true,
+						windowConstraints:[0,0,300,300],
+						windowBackgroundAlpha: 0.3,
+						//logo
+						logoImg:"static/logo.png",
+						logoConstraints:[0,-100,60,60],
+						//number
+						numberConstraints:[0,-42,200,14],
+						//slogn
+						sloganConstraints:[0,-20,200,14],
+						//登录按钮
+						logBtnConstraints:[0,20,220,40],
+						logBtnText:"一键登录",
+						logBtnTextColor:0x0000FF,
+						windowCornerRadius:10,
+						privacyConstraints:[0,100,200,40],
+						checkViewConstraints:[-108,100,10,10],
+						windowCloseBtnConstraints:[-135,-135,20,20],
+						loadingConstraints:[0,0,20,20],
+						windowCloseBtnImgs:["static/windowClose","static/windowClose"],
+						windowBackgroundImage:"static/bg.jpeg"
 					})
 				}else{
 					this.jv.setCustomUIWithConfigAndroid({
 						setNavColor:0xff000000,
 						setLogBtnText:" 极光认证测试 ",
 						setPrivacyState:false,
-						setAppPrivacyColor:[0xff00f000,0xff000000]
+						setAppPrivacyColor:[0xff00f000,0xff000000],
+						setDialogTheme:[300, 400, 0, 0, false]
 					})
 				}