Skip to content

Commit 4359697

Browse files
committed
2 parents 9ce735f + be87df0 commit 4359697

37 files changed

+147
-65
lines changed

JVerification_Hbuilder_Demo/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"JPUSH_APPKEY_IOS" : "60e02a2a65ac4cdc6f80b776",
5858
"JPUSH_CHANNEL_IOS" : "test",
5959
"JPUSH_CHANNEL_ANDROID" : "",
60-
"JPUSH_APPKEY_ANDROID" : "9c0aa59694d967b7f9df7f3c",
60+
"JPUSH_APPKEY_ANDROID" : "7b4b94cca0d185d611e53cca",
6161
"__plugin_info__" : {
6262
"name" : "JG-JCore",
6363
"description" : "极光推送JCore插件",

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

100644100755
File mode changed.

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

100644100755
File mode changed.

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

100644100755
File mode changed.

JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/x86/libCtaApiLib.so

100644100755
File mode changed.

JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/android/libs/x86_64/libCtaApiLib.so

100644100755
File mode changed.

JVerification_Hbuilder_Demo/nativeplugins/JG-JVerification/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "JG-JVerification",
33
"id": "JG-JVerification",
4-
"version": "2.0.8",
4+
"version": "2.0.9",
55
"description": "极光认证Hbuilder插件",
66
"_dp_type":"nativeplugin",
77
"_dp_nativeplugin":{

JVerification_Hbuilder_Demo/pages/index/index.vue

+18-5
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,32 @@
162162
setNavColor:0xff000000,
163163
setLogBtnText:" 极光认证测试 ",
164164
setPrivacyState:false,
165-
setAppPrivacyColor:[0xff00f000,0xff000000],
165+
setPrivacyNameAndUrlBeanList:[{
166+
name:"条款1",
167+
url:"https://www.jiguang.cn/about",
168+
beforeName:",",
169+
afterName:","
170+
},{
171+
name:"条款2",
172+
url:"https://www.jiguang.cn/about",
173+
beforeName:"",
174+
afterName:""
175+
},{
176+
name:"条款3",
177+
url:"https://www.jiguang.cn/about",
178+
beforeName:",",
179+
afterName:","
180+
}],
181+
setAppPrivacyColor:[0xff4169E1,0xffFF6347],
166182
setLogoImgPathFromJs:"static/weixin.png",
167183
setLogBtnImgPathFromJs:"static/login.png",
168-
// setAuthBGImgPathFromJs:"static/bg.jpeg",
184+
setAuthBGImgPathFromJs:"static/bg.jpeg",
169185
setPrivacyNavReturnBtnPathFromJs:"static/weixin.png",
170-
setAuthBGVideoPathFromJs:"static/videmo.mp4",
171186
setPrivacyTextSize:12,
172187
setPrivacyCheckboxSize:14,
173188
enableHintToast:true,
174189
setLoadingViewEnable:true,
175190
setStatusBarTransparent:true,
176-
setCheckedImgPathFromJs:"static/weixin.png",
177-
setUncheckedImgPathFromJs:"static/qq.png",
178191
addCustomViews:[{
179192
type:"text",
180193
finishFlag:false,
1.71 KB
Loading
843 Bytes
Loading

UniPlugin-JVerification-Android/.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/.idea/jarRepositories.xml

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniappchooselocation.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Loading

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniappopenlocation.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniapppicker.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniappquill.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniappquillimageresize.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/__uniappscan.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
<!DOCTYPE html>
2-
<html lang="zh-CN">
3-
4-
<head>
5-
<meta charset="UTF-8" />
6-
<script>
7-
var __UniViewStartTime__ = Date.now();
8-
document.addEventListener('DOMContentLoaded', function() {
9-
document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
10-
})
11-
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
12-
CSS.supports('top: constant(a)'))
13-
document.write(
14-
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
15-
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
16-
</script>
17-
<title>View</title>
18-
<link rel="stylesheet" href="view.css" />
19-
</head>
20-
21-
<body>
22-
<div id="app"></div>
23-
<script src="__uniappes6.js"></script>
24-
<script src="view.umd.min.js"></script>
25-
<script src="app-view.js"></script>
26-
</body>
27-
28-
</html>
1+
<!DOCTYPE html>
2+
<html lang="zh-CN">
3+
4+
<head>
5+
<meta charset="UTF-8" />
6+
<script>
7+
var __UniViewStartTime__ = Date.now();
8+
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
9+
CSS.supports('top: constant(a)'))
10+
document.write(
11+
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
12+
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
13+
</script>
14+
<title>View</title>
15+
<link rel="stylesheet" href="view.css" />
16+
</head>
17+
18+
<body>
19+
<div id="app"></div>
20+
<script src="__uniappes6.js"></script>
21+
<script src="view.umd.min.js"></script>
22+
<script src="app-view.js"></script>
23+
</body>
24+
25+
</html>

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/app-config-service.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/app-service.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/app-view.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__6D60B07","name":"JVerification_Hbuilder_Demo","version":{"name":"1.0.0","code":"100"},"description":"极光认证 Hbuilder 集成 Demo","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nativePlugins":{"JG-JCore":{"JPUSH_APPKEY_IOS":"60e02a2a65ac4cdc6f80b776","JPUSH_CHANNEL_IOS":"test","JPUSH_CHANNEL_ANDROID":"","JPUSH_APPKEY_ANDROID":"9c0aa59694d967b7f9df7f3c","__plugin_info__":{"name":"JG-JCore","description":"极光推送JCore插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{"JPUSH_APPKEY_IOS":{"des":"[iOS]极光portal配置应用信息时分配的AppKey","key":"JCore:APP_KEY","value":""},"JPUSH_CHANNEL_IOS":{"des":"[iOS]用于统计分发渠道,不需要可填默认值developer-default","key":"JCore:CHANNEL","value":""},"JPUSH_CHANNEL_ANDROID":{"des":"[Android]用于统计分发渠道,不需要可填默认值developer-default","key":"JPUSH_CHANNEL","value":""},"JPUSH_APPKEY_ANDROID":{"des":"[Android]极光portal配置应用信息时分配的AppKey","key":"JPUSH_APPKEY","value":""}}}},"JG-JVerification":{"__plugin_info__":{"name":"JG-JVerification","description":"极光认证Hbuilder插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"2.8.11","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}
1+
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__6D60B07","name":"JVerification_Hbuilder_Demo","version":{"name":"1.0.0","code":"100"},"description":"极光认证 Hbuilder 集成 Demo","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nativePlugins":{"JG-JCore":{"JPUSH_APPKEY_IOS":"60e02a2a65ac4cdc6f80b776","JPUSH_CHANNEL_IOS":"test","JPUSH_CHANNEL_ANDROID":"","JPUSH_APPKEY_ANDROID":"9c0aa59694d967b7f9df7f3c","__plugin_info__":{"name":"JG-JCore","description":"极光推送JCore插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{"JPUSH_APPKEY_IOS":{"des":"[iOS]极光portal配置应用信息时分配的AppKey","key":"JCore:APP_KEY","value":""},"JPUSH_CHANNEL_IOS":{"des":"[iOS]用于统计分发渠道,不需要可填默认值developer-default","key":"JCore:CHANNEL","value":""},"JPUSH_CHANNEL_ANDROID":{"des":"[Android]用于统计分发渠道,不需要可填默认值developer-default","key":"JPUSH_CHANNEL","value":""},"JPUSH_APPKEY_ANDROID":{"des":"[Android]极光portal配置应用信息时分配的AppKey","key":"JPUSH_APPKEY","value":""}}}},"JG-JVerification":{"__plugin_info__":{"name":"JG-JVerification","description":"极光认证Hbuilder插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.1.22","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/view.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/app/src/main/assets/apps/__UNI__6D60B07/www/view.umd.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UniPlugin-JVerification-Android/uniplugin_jverification/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ dependencies {
3939
debugImplementation fileTree(include: ['uniapp-release.aar'], dir: '../app/libs')
4040
debugImplementation 'com.alibaba:fastjson:1.2.70'
4141
debugImplementation 'com.facebook.fresco:fresco:1.13.0'
42-
debugImplementation 'cn.jiguang.sdk:jverification:2.7.2'
42+
debugImplementation 'cn.jiguang.sdk:jverification:2.7.3'
4343
debugImplementation 'cn.jiguang.sdk:jcore:2.8.2'
4444

4545
// releaseCompileOnly fileTree(include: ['*.jar'], dir: 'libs')
4646
releaseCompileOnly fileTree(include: ['uniapp-release.aar'], dir: '../app/libs')
4747
releaseCompileOnly 'com.alibaba:fastjson:1.2.70'
4848
releaseCompileOnly 'com.facebook.fresco:fresco:1.13.0'
49-
releaseCompileOnly 'cn.jiguang.sdk:jverification:2.7.2'
49+
releaseCompileOnly 'cn.jiguang.sdk:jverification:2.7.3'
5050
releaseCompileOnly 'cn.jiguang.sdk:jcore:2.8.2'
5151
}
5252

UniPlugin-JVerification-Android/uniplugin_jverification/proguard-rules.pro

+23
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,26 @@
1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
2121
#-renamesourcefileattribute SourceFile
22+
-dontoptimize
23+
-dontpreverify
24+
25+
-dontwarn cn.jpush.**
26+
-keep class cn.jpush.** { *; }
27+
-dontwarn cn.jiguang.**
28+
-keep class cn.jiguang.** { *; }
29+
30+
-dontwarn cn.com.chinatelecom.**
31+
-keep class cn.com.chinatelecom.** { *; }
32+
-dontwarn com.ct.**
33+
-keep class com.ct.** { *; }
34+
-dontwarn a.a.**
35+
-keep class a.a.** { *; }
36+
-dontwarn com.cmic.**
37+
-keep class com.cmic.** { *; }
38+
-dontwarn com.unicom.**
39+
-keep class com.unicom.** { *; }
40+
-dontwarn com.sdk.**
41+
-keep class com.sdk.** { *; }
42+
43+
-dontwarn com.sdk.**
44+
-keep class com.sdk.** { *; }

UniPlugin-JVerification-Android/uniplugin_jverification/src/main/java/cn/jiguang/uniplugin_jverification/JVerificationWXModule.java

+32-9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.io.File;
2626
import java.io.IOException;
2727
import java.io.InputStream;
28+
import java.util.ArrayList;
29+
import java.util.List;
2830

2931
import cn.jiguang.uniplugin_jverification.common.CopyUtils;
3032
import cn.jiguang.uniplugin_jverification.common.JConstants;
@@ -35,6 +37,7 @@
3537
import cn.jiguang.verifysdk.api.JVerifyUIConfig;
3638
import cn.jiguang.verifysdk.api.LoginSettings;
3739
import cn.jiguang.verifysdk.api.PreLoginListener;
40+
import cn.jiguang.verifysdk.api.PrivacyBean;
3841
import cn.jiguang.verifysdk.api.RequestCallback;
3942
import cn.jiguang.verifysdk.api.VerifyListener;
4043

@@ -434,13 +437,33 @@ private void setUiConfig(JVerifyUIConfig.Builder uiConfigBuilder, JSONObject jso
434437
}
435438

436439
// 授权页隐私栏
437-
if (jsonObject.containsKey(JConstants.setAppPrivacyOne)) {
438-
JSONArray jsonArraySetAppPrivacyOne = jsonObject.getJSONArray(JConstants.setAppPrivacyOne);
439-
uiConfigBuilder.setAppPrivacyOne(jsonArraySetAppPrivacyOne.getString(0), jsonArraySetAppPrivacyOne.getString(1));
440-
}
441-
if (jsonObject.containsKey(JConstants.setAppPrivacyTwo)) {
442-
JSONArray jsonArraySetAppPrivacyTwo = jsonObject.getJSONArray(JConstants.setAppPrivacyTwo);
443-
uiConfigBuilder.setAppPrivacyTwo(jsonArraySetAppPrivacyTwo.getString(0), jsonArraySetAppPrivacyTwo.getString(1));
440+
// 273 后 setAppPrivacyOne和setAppPrivacyTwo废弃,用 setPrivacyNameAndUrlBeanList 代替
441+
// if (jsonObject.containsKey(JConstants.setAppPrivacyOne)) {
442+
// JSONArray jsonArraySetAppPrivacyOne = jsonObject.getJSONArray(JConstants.setAppPrivacyOne);
443+
// uiConfigBuilder.setAppPrivacyOne(jsonArraySetAppPrivacyOne.getString(0), jsonArraySetAppPrivacyOne.getString(1));
444+
// }
445+
// if (jsonObject.containsKey(JConstants.setAppPrivacyTwo)) {
446+
// JSONArray jsonArraySetAppPrivacyTwo = jsonObject.getJSONArray(JConstants.setAppPrivacyTwo);
447+
// uiConfigBuilder.setAppPrivacyTwo(jsonArraySetAppPrivacyTwo.getString(0), jsonArraySetAppPrivacyTwo.getString(1));
448+
// }
449+
450+
if (jsonObject.containsKey(JConstants.setPrivacyNameAndUrlBeanList)) {// since 273
451+
JSONArray jsonArray = jsonObject.getJSONArray(JConstants.setPrivacyNameAndUrlBeanList);
452+
if(jsonArray!=null&&jsonArray.size()!=0){
453+
List<PrivacyBean> beanArrayList = new ArrayList<>();
454+
455+
for (int i=0;i<jsonArray.size();i++){
456+
JSONObject jsonObject1 = jsonArray.getJSONObject(i);
457+
String name = jsonObject1.getString("name");
458+
String url = jsonObject1.getString("url");
459+
String beforeName = jsonObject1.getString("beforeName");
460+
String afterName = jsonObject1.getString("afterName");
461+
JLogger.d("setPrivacyNameAndUrlBeanList:"+beforeName+name+afterName+":"+url);
462+
beanArrayList.add(new PrivacyBean(name!=null?name:"",url!=null?url:"",beforeName!=null?beforeName:"",afterName!=null?afterName:""));
463+
464+
}
465+
uiConfigBuilder.setPrivacyNameAndUrlBeanList(beanArrayList);
466+
}
444467
}
445468
if (jsonObject.containsKey(JConstants.setAppPrivacyColor)) {
446469
JSONArray jsonArraySetAppPrivacyColor = jsonObject.getJSONArray(JConstants.setAppPrivacyColor);
@@ -466,7 +489,7 @@ private void setUiConfig(JVerifyUIConfig.Builder uiConfigBuilder, JSONObject jso
466489
}
467490
if (jsonObject.containsKey(JConstants.setPrivacyText)) {
468491
JSONArray jsonArray = jsonObject.getJSONArray(JConstants.setPrivacyText);
469-
uiConfigBuilder.setPrivacyText(jsonArray.getString(0), jsonArray.getString(1), jsonArray.getString(2), jsonArray.getString(3));
492+
uiConfigBuilder.setPrivacyText(jsonArray.getString(0), jsonArray.getString(1));
470493
}
471494
if (jsonObject.containsKey(JConstants.setPrivacyTextSize)) {
472495
uiConfigBuilder.setPrivacyTextSize(jsonObject.getIntValue(JConstants.setPrivacyTextSize));
@@ -667,7 +690,7 @@ private String getRealPath(String pathName) {
667690
Context context = mWXSDKInstance.getContext();
668691
String assetPicPath = getAssetPicPath(pathName);
669692
String realPath = context.getCacheDir().getPath() + File.separator + pathName;
670-
File file = new File(realPath);
693+
// File file = new File(realPath);
671694
JLogger.d(" full name : " + assetPicPath + " size " + assetPicPath.length());
672695
CopyUtils.copyFile(context, assetPicPath, realPath);
673696
JLogger.d(" full name : " + realPath + " size " + realPath.length());

UniPlugin-JVerification-Android/uniplugin_jverification/src/main/java/cn/jiguang/uniplugin_jverification/common/JConstants.java

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public class JConstants {
9090
public static final String setPrivacyOffsetX = "setPrivacyOffsetX";
9191
public static final String setPrivacyTextCenterGravity = "setPrivacyTextCenterGravity";
9292
public static final String setPrivacyText = "setPrivacyText";
93+
public static final String setPrivacyNameAndUrlBeanList = "setPrivacyNameAndUrlBeanList";
9394
public static final String setPrivacyTextSize = "setPrivacyTextSize";
9495
public static final String setPrivacyTopOffsetY = "setPrivacyTopOffsetY";
9596
public static final String setPrivacyCheckboxHidden = "setPrivacyCheckboxHidden";

0 commit comments

Comments
 (0)