diff --git a/pages/rwa_package/account/success.vue b/pages/rwa_package/account/success.vue index fb77c1a..71c3db1 100644 --- a/pages/rwa_package/account/success.vue +++ b/pages/rwa_package/account/success.vue @@ -1,10 +1,10 @@ diff --git a/pages/rwa_package/account/withdraw.vue b/pages/rwa_package/account/withdraw.vue index b15f72f..90d0a79 100644 --- a/pages/rwa_package/account/withdraw.vue +++ b/pages/rwa_package/account/withdraw.vue @@ -465,6 +465,28 @@ export default { } else { console.log('开始提现', res, this.curSelect) + // #ifdef APP-PLUS + requestMerchantTransfer({ + // uni.requestMerchantTransfer({ + "mchId": "1725999656", + "appId": "wx7a5902cd556d9396", + "package": res.data.wxResponse.packageInfo, + success: (res) => { + this.qing(); + uni.navigateTo({ + url: '/pages/rwa_package/account/success?money=' + params.amount + }) + + }, + fail: (res) => { + _this.$refs.uToastRef.show({ + type: 'error', + message: '提现失败', + }); + }, + + }) + // #endif // #ifdef MP-WEIXIN wx.requestMerchantTransfer({ "mchId": "1725999656", diff --git a/uni_modules/uni-registerRequestPermissionTips/changelog.md b/uni_modules/uni-registerRequestPermissionTips/changelog.md new file mode 100644 index 0000000..67b6d9a --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/changelog.md @@ -0,0 +1,8 @@ +## 1.0.3（2024-10-18） +修复4.25版引起的插件回调只触发一次的问题。 +## 1.0.2（2024-09-05） +修复uni.chooseImage或者其他部分情况下弹窗不显示的bug。 +## 1.0.1（2024-05-30） +修复云打包可能报错的bug +## 1.0.0（2024-03-09） +支持全局监听权限申请。当申请权限时，会在页面顶部显示申请权限的目的。 diff --git a/uni_modules/uni-registerRequestPermissionTips/package.json b/uni_modules/uni-registerRequestPermissionTips/package.json new file mode 100644 index 0000000..e730aa1 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/package.json @@ -0,0 +1,115 @@ +{ + "id": "uni-registerRequestPermissionTips", + "displayName": "uni-registerRequestPermissionTips", + "version": "1.0.3", + "description": "支持android平台全局监听权限的申请。当申请权限时，会在页面顶部显示申请权限的目的。主要解决上架华为应用市场审核要求：APP在调用终端权限时，应同步告知用户申请该权限的目的。", + "keywords": [ + "权限", + "权限申请", + "上架", + "华为" + ], + "repository": "", + "engines": { + "HBuilderX": "^4.0" + }, + "dcloudext": { + "type": "uts", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [ + ], + "uni-ext-api": { + "uni": { + "registerRequestPermissionTipsListener": { + "name": "registerRequestPermissionTipsListener", + "app": { + "js": false, + "kotlin": true, + "swift": false + } + }, + "unregisterRequestPermissionTipsListener": { + "name": "unregisterRequestPermissionTipsListener", + "app": { + "js": false, + "kotlin": true, + "swift": false + } + }, + "setRequestPermissionTips": { + "name": "setRequestPermissionTips", + "app": { + "js": false, + "kotlin": true, + "swift": false + } + } + } + }, + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-android": "y", + "app-ios": "n", + "app-harmony": "u" + }, + "H5-mobile": { + "Safari": "n", + "Android Browser": "n", + "微信浏览器(Android)": "n", + "QQ浏览器(Android)": "n" + }, + "H5-pc": { + "Chrome": "n", + "IE": "n", + "Edge": "n", + "Firefox": "n", + "Safari": "n" + }, + "小程序": { + "微信": "n", + "阿里": "n", + "百度": "n", + "字节跳动": "n", + "QQ": "n", + "钉钉": "n", + "快手": "n", + "飞书": "n", + "京东": "n" + }, + "快应用": { + "华为": "n", + "联盟": "n" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/readme.md b/uni_modules/uni-registerRequestPermissionTips/readme.md new file mode 100644 index 0000000..2673b32 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/readme.md @@ -0,0 +1,95 @@ +## registerRequestPermissionTipsListener(listener?) +注册权限监听事件 +## unregisterRequestPermissionTipsListener(listener?) +取消注册权限监听事件 + +## RequestPermissionTipsListener的属性值 +|名称 |类型 |描述 |必填 | +|:-- |:-- |:-- |:-- | +|onRequest |(permissions:Array)=>void |申请系统权限回调，permissions为触发权限申请的所有权限 |否 | +|onConfirm |(permissions:Array)=>void |弹出系统权限授权框回调，permissions为触发弹出权限授权框的所有权限 |否 | +|onComplete |(permissions:UTSJSONObject)=>void |权限申请完成回调，permissions包括权限及权限的状态。`grant`为权限已获取，`denied`为权限已拒绝 |否 | + +## setRequestPermissionTips(UTSJSONObject) +设置权限监听的说明。支持针对权限设置具体的说明。 + +参考：`{"android.permission.CAMERA":"

相机权限申请说明

"}` + +安卓权限列表可参考[谷歌官方文档](https://developer.android.com/reference/android/Manifest.permission)。 + +权限申请说明基于原生TextView实现，可以实现加载html内容，支持的标签及属性可参考： +``` + 或 ：加粗文本。 + 或 ：斜体文本。 +：下划线文本。 +：上标文本。 +：下标文本。 +：等宽字体文本。 +：放大字体。 +：缩小字体。 + 或 或 ：带有删除线的文本。 +

：段落。 +

：块级容器。 +

，

，

，

，

，
：区域标题元素。 +
    ,
      ,
    1. ：无序列表和有序列表。 +
      ：换行。 + 和 ：设置文本颜色和大小。 +``` + +## 示例 + +``` + +``` \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/AndroidManifest.xml new file mode 100644 index 0000000..1fb0490 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/config.json b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/config.json new file mode 100644 index 0000000..7bb39c1 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/config.json @@ -0,0 +1,3 @@ +{ + "minSdkVersion": "21" +} \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/index.uts b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/index.uts new file mode 100644 index 0000000..8bb315e --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/index.uts @@ -0,0 +1,148 @@ +import { UnregisterRequestPermissionTipsListener, RegisterRequestPermissionTipsListener, RequestPermissionTipsListener, SetRequestPermissionTips } from "../interface"; +import RelativeLayout from 'android.widget.RelativeLayout'; +import LinearLayout from 'android.widget.LinearLayout'; +import Color from 'android.graphics.Color'; +import TextView from 'android.widget.TextView'; +import ViewGroup from 'android.view.ViewGroup'; +import Activity from 'android.app.Activity'; +import HashMap from 'java.util.HashMap'; +import AnimationUtils from 'android.view.animation.AnimationUtils'; +import R from 'io.dcloud.uts.permissionrequest.R' +import Html from 'android.text.Html'; +import View from 'android.view.View'; +import Runnable from "java.lang.Runnable" + +let PermissionTipsView : View | null = null +let permissionTips : HashMap = new HashMap() +var permissionListener : RequestPermissionListener | null = null +var listener : RequestPermissionTipsListener | null = null + +@UTSJS.keepAlive +export function unregisterRequestPermissionTipsListener(e : RequestPermissionTipsListener | null) { + listener = null; + if (permissionListener != null) { + permissionListener!.stop() + permissionListener = null + } + if (PermissionTipsView != null) { + if (PermissionTipsView!.getParent() != null) { + PermissionTipsView!.setAnimation(null); + ((PermissionTipsView!.getParent()) as ViewGroup).removeView(PermissionTipsView) + } + PermissionTipsView = null + } +} + +@UTSJS.keepAlive +export function registerRequestPermissionTipsListener(l : RequestPermissionTipsListener | null) { + listener = l + if (permissionListener == null) { + permissionListener = uni.createRequestPermissionListener() + permissionListener!.onRequest((permissions : Array) => { + if (listener != null) + listener!.onRequest?.invoke(permissions) + }) + permissionListener!.onConfirm((permissions : Array) => { + UTSAndroid.getUniActivity()!.runOnUiThread(new ConfirmRunnable(permissions)) + }) + permissionListener!.onComplete((permissions : Array) => { + UTSAndroid.getUniActivity()!.runOnUiThread(new CompleteRunnable(permissions)) + }) + } +} + +class ConfirmRunnable implements Runnable { + permissions : Array + constructor(permissions : Array) { + this.permissions = permissions + } + override run() { + let activity = UTSAndroid.getUniActivity()! + if (PermissionTipsView != null && PermissionTipsView!.getParent() != null) { + PermissionTipsView!.setAnimation(null); + ((PermissionTipsView!.getParent()) as ViewGroup).removeView(PermissionTipsView) + } + if (this.permissions.length > 0) { + try { + PermissionTipsView = createPermissionWindow(activity, this.permissions); + if (PermissionTipsView != null) { + (activity.findViewById(android.R.id.content) as ViewGroup).addView(PermissionTipsView!) + } + } catch (e) { + console.log(e) + } + } + if (listener != null) + listener!.onConfirm?.invoke(this.permissions) + } +} + +class CompleteRunnable implements Runnable { + permissions : Array + constructor(permissions : Array) { + this.permissions = permissions + } + override run() { + let activity = UTSAndroid.getUniActivity()! + if (PermissionTipsView != null) { + PermissionTipsView!.setAnimation(AnimationUtils.loadAnimation(activity, R.anim.popupwindow_exit)); + ((PermissionTipsView!.getParent()) as ViewGroup).removeView(PermissionTipsView!) + PermissionTipsView = null + } + if (listener != null) { + var permissionStatus = {} + for (var p in this.permissions) { + permissionStatus[p] = UTSAndroid.checkSystemPermissionGranted(UTSAndroid.getUniActivity()!, [p]) ? "grant" : "denied" + } + listener!.onComplete?.invoke(permissionStatus) + } + } +} + +export const setRequestPermissionTips : SetRequestPermissionTips = (tips : UTSJSONObject) => { + permissionTips.clear() + for (var k in tips) { + permissionTips.put(k, tips[k] != null ? tips[k].toString() : "") + } +} + +function createPermissionWindow(activity : Activity, permissions : Array) : ViewGroup | null { + let rootView = new RelativeLayout(activity); + rootView.setBackgroundColor(Color.TRANSPARENT); + let backgroundView = new LinearLayout(activity); + backgroundView.setPadding(30, 0, 30, 30); + backgroundView.setOrientation(1) + backgroundView.setBackgroundResource(R.drawable.dcloud_permission_background); + let permissionTipsList : Array = new Array() + for (var p in permissions) { + if (permissionTips.containsKey(p) && permissionTipsList.indexOf(permissionTips.get(p)) == -1) { + permissionTipsList.push(permissionTips.get(p)!) + } + } + for (var p in permissionTipsList) { + let text = new TextView(activity); + text.setText(Html.fromHtml(p, Html.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING)) + text.setPadding(0, 30, 0, 0) + text.setTextSize((5 * getScale()).toFloat()) + text.setTextColor(Color.BLACK) + backgroundView.addView(text) + } + if (backgroundView.getChildCount() == 0) { + return null; + } + let rll = new RelativeLayout.LayoutParams(-1, -2) + rll.topMargin = (UTSAndroid.getStatusBarHeight() * getScale()).toInt(); + rll.leftMargin = 30; + rll.rightMargin = 30; + rll.bottomMargin = 30; + rootView.addView(backgroundView, rll) + rootView.setAnimation(AnimationUtils.loadAnimation(activity, R.anim.popupwindow_enter)); + return rootView; +} + +function getScale() : Float { + if (UTSAndroid.getUniActivity() != null) { + return UTSAndroid.getUniActivity()!.resources.displayMetrics.scaledDensity + } + return (0 as number).toFloat(); +} \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_enter.xml b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_enter.xml new file mode 100644 index 0000000..a4fe5da --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_enter.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_exit.xml b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_exit.xml new file mode 100644 index 0000000..e5ddc69 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/anim/popupwindow_exit.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/drawable/dcloud_permission_background.xml b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/drawable/dcloud_permission_background.xml new file mode 100644 index 0000000..de0205a --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/app-android/res/drawable/dcloud_permission_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/uni_modules/uni-registerRequestPermissionTips/utssdk/interface.uts b/uni_modules/uni-registerRequestPermissionTips/utssdk/interface.uts new file mode 100644 index 0000000..7183053 --- /dev/null +++ b/uni_modules/uni-registerRequestPermissionTips/utssdk/interface.uts @@ -0,0 +1,19 @@ +export type RequestPermissionTipsListener = { + onRequest ?: ((permissions : Array) => void) | null, + onConfirm ?: ((permission : Array) => void) | null, + onComplete ?: ((permissions : UTSJSONObject) => void) | null +} + + +export type RegisterRequestPermissionTipsListener = (listener : RequestPermissionTipsListener | null) => void +export type UnregisterRequestPermissionTipsListener = (listener : RequestPermissionTipsListener | null) => void +export type SetRequestPermissionTips = (tips : UTSJSONObject) => void + +export interface Uni { + + registerRequestPermissionTipsListener : RegisterRequestPermissionTipsListener, + + unregisterRequestPermissionTipsListener : UnregisterRequestPermissionTipsListener + + setRequestPermissionTips : SetRequestPermissionTips +} \ No newline at end of file