diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..1a3af920b098c1460143e5f5ef5174933e03cb54
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
index 4ad7b3d6dc1866b2cfbf34371fce162b9461ca41..f2126b3be1e90e9ea4198685c9f1c01c9f6afd61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,15 @@
/unpackage
/.hbuilderx
/.vite
-.DS_Store
\ No newline at end of file
+.DS_Store
+<<<<<<< HEAD
+
+=======
+>>>>>>> dev
+env.js
+jest.config.js
+autotest.reporter.js
+autotest.utils.js
+pages/autotest/
+node_modules/
+vite.config.js
\ No newline at end of file
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index ad7c2a6be83a79900b8cac13428e51381e113455..cc4f2a1a439679c447b2f3bbe509db8e8c8870c5 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -14,8 +14,9 @@
},
{
"bundleId" : "io.dcloud.test123456",
- "certificateFile" : "/Users/lizhongyi/Desktop/文件/证书/dev_123.p12",
- "certificateProfileFile" : "/Users/lizhongyi/Desktop/文件/证书/io_dcloud_test123456.mobileprovision",
+ "certificateFile" : "/Users/lizhongyi/Desktop/newProfiles/dev_123.p12",
+ "certificateProfileFile" : "/Users/lizhongyi/Desktop/newProfiles/wildcard.mobileprovision",
+ "runSignStatus" : 1,
"type" : "uni-app:app-ios"
}
]
diff --git a/App.uvue b/App.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..a1ead0e7dbceb3636d82303392c1df1e6b9f7a24
--- /dev/null
+++ b/App.uvue
@@ -0,0 +1,44 @@
+
+
+
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
deleted file mode 100644
index a54d98aa885205fac0907af57739237f3a96af78..0000000000000000000000000000000000000000
--- a/jest.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- testTimeout: 10000,
- reporters: [
- 'default'
- ],
- watchPathIgnorePatterns: ['/node_modules/', '/dist/', '/.git/'],
- moduleFileExtensions: ['js', 'json'],
- rootDir: __dirname,
- testMatch: ["/pages/**/*test.[jt]s?(x)"],
- testPathIgnorePatterns: ['/node_modules/']
-}
diff --git a/main.uts b/main.uts
new file mode 100644
index 0000000000000000000000000000000000000000..89d8f152127b8105c47b6ef81680535f4dbbb40c
--- /dev/null
+++ b/main.uts
@@ -0,0 +1,9 @@
+import App from './App'
+
+import { createSSRApp } from 'vue'
+export function createApp() {
+ const app = createSSRApp(App)
+ return {
+ app
+ }
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 1932231622c1913f146f5403b48c72a749a88f09..00c791648f04722c7fa535d0b412975bc39c8f52 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,72 +1,56 @@
{
- "name": "uni-api",
- "appid": "__UNI__ED9218B",
- "description": "",
- "versionName": "1.0.0",
- "versionCode": "100",
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": true,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- /* 模块配置 */
- "modules": {},
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ]
- },
- /* ios打包配置 */
- "ios": {},
- /* SDK配置 */
- "sdkConfigs": {}
- }
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "",
- "setting": {
- "urlCheck": false
- },
- "usingComponents": true
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "vueVersion": "2"
+ "name": "uni-api",
+ "appid": "__UNI__8BF79AC",
+ "description": "uts插件示例",
+ "versionName": "1.0.0",
+ "versionCode": "100",
+ "transformPx": false,
+ /* uni-app x 特有相关 */
+ // "uni-app-x": {},
+ /* uni-app特有相关 */
+ "app-plus": {
+ "usingComponents": true,
+ "nvueStyleCompiler": "uni-app",
+ "compilerVersion": 3,
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ /* 模块配置 */
+ "modules": {},
+ /* 应用发布信息 */
+ "distribute": {
+ /* android打包配置 */
+ "android": {},
+ /* ios打包配置 */
+ "ios": {},
+ /* SDK配置 */
+ "sdkConfigs": {}
+ }
+ },
+ /* 快应用特有相关 */
+ "quickapp": {},
+ /* 小程序特有相关 */
+ "mp-weixin": {
+ "appid": "",
+ "setting": {
+ "urlCheck": false
+ },
+ "usingComponents": true
+ },
+ "mp-alipay": {
+ "usingComponents": true
+ },
+ "mp-baidu": {
+ "usingComponents": true
+ },
+ "mp-toutiao": {
+ "usingComponents": true
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "vueVersion": "3"
}
diff --git a/pages.json b/pages.json
index 24f82b827fe2c372169caf32fe7b9b2b28fa4037..6b058a78a8022bffc1842eddf82e1e2a39244841 100644
--- a/pages.json
+++ b/pages.json
@@ -1,17 +1,24 @@
-{
- "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "uni-app"
- }
- }
- ],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
- },
- "uniIdRouter": {}
+{
+ "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "uni-api"
+ }
+ },
+ {
+ "path": "pages/test/test",
+ "style": {
+ "navigationBarTitleText": "测试示例",
+ "enablePullDownRefresh": false
+ }
+ }
+ ],
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "uni-app",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8"
+ },
+ "uniIdRouter": {}
}
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
new file mode 100644
index 0000000000000000000000000000000000000000..9e69fe2576991e0e8484e8d591331c09a53ea43d
--- /dev/null
+++ b/pages/index/index.nvue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.uvue b/pages/index/index.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..9e69fe2576991e0e8484e8d591331c09a53ea43d
--- /dev/null
+++ b/pages/index/index.uvue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/test/test.uvue b/pages/test/test.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..cdec1a4d60473152a178a6c9ec075b05a4bb8a4b
--- /dev/null
+++ b/pages/test/test.uvue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/test/test.vue
similarity index 51%
rename from pages/index/index.vue
rename to pages/test/test.vue
index f64e148578503d6c5cbc4b004ab9acff01ac86a3..1c4825d882b6dc4df8065e2378108f03c3d7924d 100644
--- a/pages/index/index.vue
+++ b/pages/test/test.vue
@@ -1,277 +1,388 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/static/test.apk b/static/test.apk
new file mode 100644
index 0000000000000000000000000000000000000000..19c5e6c121de52104c6349f81a05f7c8c5fd4f91
Binary files /dev/null and b/static/test.apk differ
diff --git a/uni_modules/uni-exit/changelog.md b/uni_modules/uni-exit/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-exit/package.json b/uni_modules/uni-exit/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..88b270db3eeaea1b18e311d5e3f34f83da23dff4
--- /dev/null
+++ b/uni_modules/uni-exit/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-exit",
+ "displayName": "uni-exit",
+ "version": "1.0.0",
+ "description": "uni-exit",
+ "keywords": [
+ "uni-exit"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "exit": {
+ "name": "exit",
+ "app": {
+ "js": true,
+ "kotlin": true,
+ "swift": true
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-android": "y",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-exit/readme.md b/uni_modules/uni-exit/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..5f87433aa739aad67b3ae079031ca79c7961d1a3
--- /dev/null
+++ b/uni_modules/uni-exit/readme.md
@@ -0,0 +1,6 @@
+# uni-quit
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-exit/utssdk/app-android/index.uts b/uni_modules/uni-exit/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..6019d642b2fb52c69992da92e1543813eb898702
--- /dev/null
+++ b/uni_modules/uni-exit/utssdk/app-android/index.uts
@@ -0,0 +1,15 @@
+import { ExitOptions, ExitSuccess, Exit } from "../interface.uts"
+
+
+/**
+ * 实现uni.exit
+ */
+export const exit : Exit = function (options: ExitOptions | null) {
+ let ret : ExitSuccess ={
+ errMsg: "exit:ok"
+ }
+ options?.success?.(ret)
+ options?.complete?.(ret)
+ UTSAndroid.exit()
+}
+
diff --git a/uni_modules/uni-exit/utssdk/app-ios/index.uts b/uni_modules/uni-exit/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5be055badece05c639c6499763ec0b26db86fd07
--- /dev/null
+++ b/uni_modules/uni-exit/utssdk/app-ios/index.uts
@@ -0,0 +1,13 @@
+import { ExitOptions, Exit} from "../interface.uts"
+import { ExitFailImpl } from "../unierror.uts"
+
+
+/**
+ * 实现uni.exit
+ * iOS平台不支持，触发错误回调
+ */
+export const exit : Exit = function (options: ExitOptions | null) {
+ let err = new ExitFailImpl(12001);
+ options?.fail?.(err)
+ options?.complete?.(err)
+}
diff --git a/uni_modules/uni-exit/utssdk/interface.uts b/uni_modules/uni-exit/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..923b4ff3c45108b089c29ab768e1ac288f3e2226
--- /dev/null
+++ b/uni_modules/uni-exit/utssdk/interface.uts
@@ -0,0 +1,78 @@
+/**
+ * uni.exit成功回调参数
+ */
+export type ExitSuccess = {
+ errMsg: string
+}
+
+/**
+ * 错误码
+ * - 12001: 系统不支持
+ * - 12002: 未知错误
+ */
+export type ExitErrorCode = 12001 | 12002
+
+/**
+ * uni.exit失败回调参数
+ */
+export interface IExitError extends IUniError {
+ errCode: ExitErrorCode
+}
+export type ExitFail = IExitError
+
+/**
+ * uni.exit成功回调函数定义
+ */
+export type ExitSuccessCallback = (res: ExitSuccess) => void
+/**
+ * uni.exit失败回调函数定义
+ */
+export type ExitFailCallback = (res: ExitFail) => void
+/**
+ * uni.exit完成回调函数定义
+ */
+export type ExitCompleteCallback = (res: any) => void
+
+/**
+ * uni.exit参数定义
+ */
+export type ExitOptions = {
+ /**
+ * 接口调用成功的回调函数
+ */
+ success?: ExitSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail?: ExitFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete?: ExitCompleteCallback | null
+}
+
+
+export interface Uni {
+
+ /**
+ * 退出当前应用
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.8.15",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3 //支持的vue版本
+ */
+ exit(options?: ExitOptions | null):void;
+}
+
+export type Exit = (options?: ExitOptions | null) => void;
diff --git a/uni_modules/uni-exit/utssdk/unierror.uts b/uni_modules/uni-exit/utssdk/unierror.uts
new file mode 100644
index 0000000000000000000000000000000000000000..9b74feb0dce8a92485b9279bfd5c1e542d18d218
--- /dev/null
+++ b/uni_modules/uni-exit/utssdk/unierror.uts
@@ -0,0 +1,37 @@
+import { ExitErrorCode, IExitError } from "./interface.uts"
+
+/**
+ * 错误主题
+ */
+export const UniErrorSubject = 'uni-exit';
+
+
+/**
+ * 错误码
+ * @UniError
+ */
+export const UniErrors:Map = new Map([
+ /**
+ * 系统不支持
+ */
+ [12001, 'system not support'],
+ /**
+ * 未知错误
+ */
+ [12002, 'unknown error']
+]);
+
+/**
+ * ExitFail的实现
+ */
+export class ExitFailImpl extends UniError implements IExitError {
+ override errCode: ExitErrorCode
+ constructor (
+ errCode: ExitErrorCode
+ ) {
+ super()
+ this.errSubject = UniErrorSubject
+ this.errCode = errCode
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
diff --git a/uni_modules/uni-getAppAuthorizeSetting/changelog.md b/uni_modules/uni-getAppAuthorizeSetting/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getAppAuthorizeSetting/package.json b/uni_modules/uni-getAppAuthorizeSetting/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..885069ae07ecd80230675ebb3d3c951d22642af1
--- /dev/null
+++ b/uni_modules/uni-getAppAuthorizeSetting/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getAppAuthorizeSetting",
+ "displayName": "uni-getAppAuthorizeSetting",
+ "version": "1.0.0",
+ "description": "uni-getAppAuthorizeSetting",
+ "keywords": [
+ "uni-getAppAuthorizeSetting"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getAppAuthorizeSetting": {
+ "name": "getAppAuthorizeSetting",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppAuthorizeSetting/readme.md b/uni_modules/uni-getAppAuthorizeSetting/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..90371d3a944c654d73c5534c40ff04656d5b90b2
--- /dev/null
+++ b/uni_modules/uni-getAppAuthorizeSetting/readme.md
@@ -0,0 +1,6 @@
+# uni-getAppAuthorizeSetting
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-getAppAuthorizeSetting/utssdk/app-android/index.uts b/uni_modules/uni-getAppAuthorizeSetting/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..0d246090d4548d1de33fd3452b4a586aeddd8e38
--- /dev/null
+++ b/uni_modules/uni-getAppAuthorizeSetting/utssdk/app-android/index.uts
@@ -0,0 +1,76 @@
+import { GetAppAuthorizeSetting, GetAppAuthorizeSettingResult } from "../interface.uts";
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import PackageManager from 'android.content.pm.PackageManager';
+import Manifest from 'android.Manifest';
+import NotificationManagerCompat from 'androidx.core.app.NotificationManagerCompat';
+
+export const getAppAuthorizeSetting : GetAppAuthorizeSetting = function () : GetAppAuthorizeSettingResult {
+ const context = UTSAndroid.getUniActivity()!!;
+
+ const cameraPermission = [Manifest.permission.CAMERA];
+ const cameraGranted = UTSAndroid.checkSystemPermissionGranted(context, cameraPermission);
+ let cameraResult = cameraGranted ? "authorized" : "denied";
+ if (!cameraGranted && !hasDefinedInManifest(Manifest.permission.CAMERA)) {
+ cameraResult = "config error";
+ }
+
+ const locationPermission = [Manifest.permission.ACCESS_COARSE_LOCATION];
+ const coarseLocationGranted = UTSAndroid.checkSystemPermissionGranted(context, locationPermission);
+ let coarseLocationResult = coarseLocationGranted ? "authorized" : "denied";
+ if (!coarseLocationGranted && !hasDefinedInManifest(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+ coarseLocationResult = "config error";
+ }
+
+ const fineLocationPermission = [Manifest.permission.ACCESS_FINE_LOCATION];
+ const fineLocationGranted = UTSAndroid.checkSystemPermissionGranted(context, fineLocationPermission);
+ let accuracy = coarseLocationGranted ? "reduced" : "unsupported";
+ if (coarseLocationGranted && fineLocationGranted) {
+ accuracy = "full";
+ }
+
+ const recordAudioPermission = [Manifest.permission.RECORD_AUDIO];
+
+ const recordAudioGranted = UTSAndroid.checkSystemPermissionGranted(context, recordAudioPermission);
+ let recordAudioResult = recordAudioGranted ? "authorized" : "denied";
+ if (!recordAudioGranted && !hasDefinedInManifest(Manifest.permission.RECORD_AUDIO)) {
+ recordAudioResult = "config error";
+ }
+
+ const compat = NotificationManagerCompat.from(context);
+ const notificationResult = compat.areNotificationsEnabled() ? "authorized": "denied"
+
+ let result : GetAppAuthorizeSettingResult = {
+ cameraAuthorized: cameraResult,
+ locationAuthorized: coarseLocationResult,
+ locationAccuracy: accuracy,
+ microphoneAuthorized: recordAudioResult,
+ notificationAuthorized: notificationResult,
+ albumAuthorized: null,
+ bluetoothAuthorized: null,
+ locationReducedAccuracy: null,
+ notificationAlertAuthorized: null,
+ notificationBadgeAuthorized: null,
+ notificationSoundAuthorized: null,
+ phoneCalendarAuthorized: null
+ }
+
+ return result
+};
+
+const hasDefinedInManifest = function (permission : string) : boolean {
+ try {
+ const context = UTSAndroid.getAppContext()!!;
+ const packageInfo = context.getPackageManager().getPackageInfo(context.getApplicationInfo().packageName, PackageManager.GET_PERMISSIONS);
+ if (packageInfo != null) {
+ for (const requestPermission in packageInfo.requestedPermissions) {
+ if (permission == requestPermission) {
+ return true;
+ }
+ }
+ }
+ } catch (e : Exception) {
+ return false
+ }
+
+ return false;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppAuthorizeSetting/utssdk/app-ios/index.uts b/uni_modules/uni-getAppAuthorizeSetting/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts b/uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..58d5a42d3b0c1c8f4cfa2ea3b40eb1eb4f96e24c
--- /dev/null
+++ b/uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts
@@ -0,0 +1,233 @@
+export interface Uni {
+ /**
+ * getAppAuthorizeSetting()
+ * @description
+ * 获取 APP 授权设置。
+ * @param {void}
+ * @return {GetAppAuthorizeSettingResult}
+ * @tutorial http://uniapp.dcloud.io/api/system/getappauthorizesetting
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getAppAuthorizeSetting()
+ ```
+ */
+ getAppAuthorizeSetting(): GetAppAuthorizeSettingResult;
+}
+
+
+export type GetAppAuthorizeSetting = () => GetAppAuthorizeSettingResult;
+export type GetAppAuthorizeSettingResult = {
+ /**
+ * 允许 App 使用相册的开关（仅 iOS 支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * @type 'authorized' | 'denied' | 'not determined'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ albumAuthorized: string | null,
+ /**
+ * 允许 App 使用蓝牙的开关（仅 iOS 支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: Android平台没有该值；iOS平台：表示没有在 `manifest.json -> App模块配置` 中配置 `BlueTooth(低功耗蓝牙)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ bluetoothAuthorized: string | null,
+ /**
+ * 允许 App 使用摄像头的开关
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: Android平台：表示没有授予 `android.permission.CAMERA` 权限；iOS平台没有该值
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ */
+ cameraAuthorized: string,
+ /**
+ * 允许 App 使用定位的开关
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: Android平台：表示没有授予 `android.permission.ACCESS_COARSE_LOCATION` 权限；iOS平台：表示没有在 `manifest.json -> App模块配置` 中配置 `Geolocation(定位)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ */
+ locationAuthorized: string,
+ /**
+ * 定位准确度。true 表示模糊定位，false 表示精确定位
+ * - reduced: 模糊定位
+ * - full: 精准定位
+ * - unsupported: 不支持（包括用户拒绝定位权限和没有在 `manifest.json -> App模块配置` 中配置 `Geolocation(定位)` 模块）
+ * @type 'reduced' | 'full' | 'unsupported'
+ */
+ locationAccuracy: string | null,
+ /**
+ * 定位准确度（推荐使用 locationAccuracy 属性）。true 表示模糊定位，false 表示精确定位（仅 iOS 支持）
+ * @type boolean
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ locationReducedAccuracy: boolean | null,
+ /**
+ * 允许 App 使用麦克风的开关
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: Android平台：表示没有授予 `android.permission.RECORD_AUDIO` 权限；iOS平台没有该值
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ */
+ microphoneAuthorized: string,
+ /**
+ * 允许 App 通知的开关
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: Android平台没有该值；iOS平台：表示没有在 `manifest.json -> App模块配置` 中配置 `Push(推送)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ */
+ notificationAuthorized: string,
+ /**
+ * 允许 App 通知带有提醒的开关（仅 iOS 10.0+ 支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: 没有在 `manifest.json -> App模块配置` 中配置 `Push(推送)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "10.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ notificationAlertAuthorized: string | null,
+ /**
+ * 允许 App 通知带有标记的开关（仅 iOS 10.0+ 支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: 没有在 `manifest.json -> App模块配置` 中配置 `Push(推送)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "10.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ notificationBadgeAuthorized: string | null,
+ /**
+ * 允许 App 通知带有声音的开关（仅 iOS 10.0+ 支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * - config error: 没有在 `manifest.json -> App模块配置` 中配置 `Push(推送)` 模块
+ * @type 'authorized' | 'denied' | 'not determined' | 'config error'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "10.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ notificationSoundAuthorized: string | null,
+ /**
+ * 允许读写日历的开关（仅微信小程序支持）
+ * - authorized: 已经获得授权，无需再次请求授权
+ * - denied: 请求授权被拒绝，无法再次请求授权；（此情况需要引导用户打开系统设置，在设置页中打开权限）
+ * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
+ * @type 'authorized' | 'denied' | 'not determined'
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ phoneCalendarAuthorized: string | null
+};
diff --git a/uni_modules/uni-getAppBaseInfo/changelog.md b/uni_modules/uni-getAppBaseInfo/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getAppBaseInfo/package.json b/uni_modules/uni-getAppBaseInfo/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..1785b04eabefc808d2705657649c48079d6fe76d
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getAppBaseInfo",
+ "displayName": "uni-getAppBaseInfo",
+ "version": "1.0.0",
+ "description": "uni-getAppBaseInfo",
+ "keywords": [
+ "uni-getAppBaseInfo"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getAppBaseInfo": {
+ "name": "getAppBaseInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/readme.md b/uni_modules/uni-getAppBaseInfo/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..131fa3d3957712b26e5e6b94eadb21e47b954caf
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/readme.md
@@ -0,0 +1,5 @@
+# uni-getAppBaseInfo
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts/-/tree/dev)
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/utssdk/app-android/device/AppBaseInfoDeviceUtil.uts b/uni_modules/uni-getAppBaseInfo/utssdk/app-android/device/AppBaseInfoDeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..3e54c93d53e0d895195aab1aa3ed9473a8040945
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/utssdk/app-android/device/AppBaseInfoDeviceUtil.uts
@@ -0,0 +1,76 @@
+
+import { UTSAndroid as Device} from "io.dcloud.uts";
+import PackageManager from 'android.content.pm.PackageManager';
+import Context from 'android.content.Context';
+import PackageInfo from 'android.content.pm.PackageInfo';
+import UiModeManager from 'android.app.UiModeManager';
+import Activity from 'android.app.Activity';
+export class AppBaseInfoDeviceUtil{
+
+ public static getAppID(): string {
+ return Device.getAppId();
+ }
+
+ public static getAppName(context: Context): string {
+ let packageManager = context.getPackageManager();
+ return packageManager.getApplicationLabel(context.getApplicationInfo()).toString()
+ }
+
+ public static getPackageName(context: Context): string {
+ return context.getPackageName();
+ }
+
+ public static getAppVersionName(): string {
+ return Device.getAppVersion()["name"].toString();
+ }
+
+ public static getAppVersionCode(): string {
+ return Device.getAppVersion()["code"].toString();
+ }
+
+ public static getHostVersion(context: Context): string {
+ let packageManager = context.getPackageManager();
+ let applicationInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+ return applicationInfo.versionName;
+ }
+
+ public static getHostCode(context: Context): string {
+ let packageManager = context.getPackageManager();
+ let applicationInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+ return applicationInfo.versionCode+"";
+ }
+
+ public static isSystemNightMode(activity: Activity): boolean {
+ let uiModeManager = activity.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager;
+ return uiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES;
+ }
+
+ public static getOsLanguage(context: Context): string {
+ return Device.getLanguageInfo(context)["osLanguage"].toString();
+ }
+
+ public static getOsLanguageNormal(context: Context): string {
+ const LOCALE_ZH_HANS = 'zh-Hans'
+ const LOCALE_ZH_HANT = 'zh-Hant'
+ let locale = Device.getLanguageInfo(context)["appLanguage"].toString();
+ if (locale.indexOf('zh') === 0) {
+ if (locale.indexOf('-hans') > -1) {
+ return LOCALE_ZH_HANS;
+ }
+ if (locale.indexOf('-hant') > -1) {
+ return LOCALE_ZH_HANT;
+ }
+ if (locale.includes("-tw") || locale.includes("-hk") || locale.includes("-mo") || locale.includes("-cht")) {
+ return LOCALE_ZH_HANT;
+ }
+
+ return LOCALE_ZH_HANS;
+ } else {
+ return locale;
+ }
+ }
+
+ public static getAppInnerVersion(): string {
+ return Device.getInnerVersion();
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts b/uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..ba6ea2cdeb4ecf4e2f40ed3e89ed1c9e27b343a1
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts
@@ -0,0 +1,152 @@
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import { AppBaseInfoDeviceUtil } from './device/AppBaseInfoDeviceUtil.uts';
+
+import {
+ GetAppBaseInfoOptions,
+ GetAppBaseInfo,
+ GetAppBaseInfoResult
+} from '../interface.uts'
+
+
+
+export const getAppBaseInfo : GetAppBaseInfo = (config : GetAppBaseInfoOptions | null) : GetAppBaseInfoResult => {
+ let filter : Array = [];
+ if (config != null && config.filter != null) {
+ filter = config.filter;
+ }
+
+ if (config == null || filter.length == 0) {
+ const defaultFilter = [
+ "appId",
+ "appName",
+ "appVersion",
+ "appVersionCode",
+ "appLanguage",
+ "language",
+ "version",
+ "appWgtVersion",
+ "hostLanguage",
+ "hostVersion",
+ "hostName",
+ "hostPackageName",
+ "hostSDKVersion",
+ "hostTheme",
+ "isUniAppX",
+ "uniCompileVersion",
+ "uniPlatform",
+ "uniRuntimeVersion",
+ "uniCompileVersionCode",
+ "uniRuntimeVersionCode"
+ ];
+ filter = defaultFilter;
+ }
+ return getBaseInfo(filter);
+}
+
+function getBaseInfo(filterArray : Array) : GetAppBaseInfoResult {
+ const activity = UTSAndroid.getUniActivity()!;
+ let result : GetAppBaseInfoResult = {};
+ if (filterArray.indexOf("appId") != -1) {
+ result.appId = AppBaseInfoDeviceUtil.getAppID();
+ }
+ if (filterArray.indexOf("appName") != -1) {
+ result.appName = UTSAndroid.getAppName();
+ }
+ if (UTSAndroid.isUniMp()) {
+ if (filterArray.indexOf("hostPackageName") != -1) {
+ result.hostPackageName = AppBaseInfoDeviceUtil.getPackageName(activity);
+ }
+ if (filterArray.indexOf("hostVersion") != -1) {
+ result.hostVersion = AppBaseInfoDeviceUtil.getHostVersion(activity);
+ }
+ if (filterArray.indexOf("hostName") != -1) {
+ result.hostName = AppBaseInfoDeviceUtil.getAppName(activity);
+ }
+ if (filterArray.indexOf("hostTheme") != -1) {
+ result.hostTheme = AppBaseInfoDeviceUtil.isSystemNightMode(activity) ? "dark" : "light";
+ }
+ if (filterArray.indexOf("hostLanguage") != -1) {
+ result.hostLanguage = AppBaseInfoDeviceUtil.getOsLanguage(activity);
+ }
+ if (filterArray.indexOf("appVersion") != -1) {
+ result.appVersion = AppBaseInfoDeviceUtil.getAppVersionName();
+ }
+ if (filterArray.indexOf("appVersionCode") != -1) {
+ result.appVersionCode = AppBaseInfoDeviceUtil.getAppVersionCode();
+ }
+ } else {
+ if (filterArray.indexOf("appVersion") != -1) {
+ result.appVersion = UTSAndroid.getAppVersion()["name"].toString();
+ }
+ if (filterArray.indexOf("appVersionCode") != -1) {
+ result.appVersionCode = UTSAndroid.getAppVersion()["code"].toString();
+ }
+ }
+ if (filterArray.indexOf("appLanguage") != -1) {
+ result.appLanguage = AppBaseInfoDeviceUtil.getOsLanguageNormal(activity);
+ }
+ if (filterArray.indexOf("language") != -1) {
+ result.language = AppBaseInfoDeviceUtil.getOsLanguage(activity);
+ }
+ if (filterArray.indexOf("version") != -1) {
+ result.version = AppBaseInfoDeviceUtil.getAppInnerVersion();
+ }
+ if (filterArray.indexOf("appWgtVersion") != -1) {
+ result.appWgtVersion = AppBaseInfoDeviceUtil.getAppVersionName();
+ }
+ if (filterArray.indexOf("isUniAppX") != -1) {
+ result.isUniAppX = UTSAndroid.isUniAppX();
+ }
+
+ if (filterArray.indexOf("uniCompileVersion") != -1) {
+ result.uniCompileVersion = UTSAndroid.getUniCompileVersion();
+ }
+
+ if (filterArray.indexOf("uniPlatform") != -1) {
+ result.uniPlatform = "app";
+ }
+
+ if (filterArray.indexOf("uniRuntimeVersion") != -1) {
+ result.uniRuntimeVersion = UTSAndroid.getUniRuntimeVersion();
+ }
+
+ if (filterArray.indexOf("uniCompileVersionCode") != -1) {
+ result.uniCompileVersionCode = convertVersionCode(UTSAndroid.getUniCompileVersion());
+ }
+
+ if (filterArray.indexOf("uniRuntimeVersionCode") != -1) {
+ result.uniRuntimeVersionCode = convertVersionCode(UTSAndroid.getUniRuntimeVersion());
+ }
+
+ return result;
+}
+
+const convertVersionCode = function(version: string): number {
+ let str = "";
+ let radixLength = 2;
+ let findDot = false;
+ const dotChar = ".".get(0);
+ for (let i = 0; i < version.length; i++) {
+ const char = version.get(i);
+ if(findDot){
+ if(char.isDigit()){
+ str += char;
+ }
+ radixLength --;
+ if(radixLength == 0){
+ break;
+ }
+ }else{
+ if(char.isDigit()){
+ str += char;
+ }else{
+ if(char == dotChar){
+ findDot = true;
+ str += char;
+ }
+ }
+ }
+ }
+
+ return parseFloat(str);
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/device/AppBaseInfoDeviceUtil.uts b/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/device/AppBaseInfoDeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..2ac9ffd4a5b51a5a00c6d9ef1f98f980a3dbd627
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/device/AppBaseInfoDeviceUtil.uts
@@ -0,0 +1,74 @@
+import { UTSiOS } from "DCloudUTSFoundation";
+
+export class AppBaseInfoDeviceUtil {
+
+ public static getAppID() : string {
+ return UTSiOS.getAppId();
+ }
+
+ public static getAppName() : string {
+ return UTSiOS.getAppName();
+ }
+
+ public static getHostName() : string {
+ return UTSiOS.getHostName();
+ }
+
+ public static getHostTheme() : string {
+ return UTSiOS.getHostTheme();
+ }
+
+ public static getHostLanguage() : string {
+ return UTSiOS.getHostLanguage();
+ }
+
+ public static getHostVersion() : string {
+ return UTSiOS.getHostVersion();
+ }
+
+ public static getHostPackageName() : string {
+ return UTSiOS.getHostPackageName();
+ }
+
+ public static getAppVersion() : string {
+ return UTSiOS.getAppVersion();
+ }
+
+ public static getAppVersionCode() : string {
+ return UTSiOS.getAppVersionCode();
+ }
+
+ public static getAppWgtVersion() : string {
+ return UTSiOS.getAppWgtVersion();
+ }
+
+ public static getOsLanguage() : string {
+ return UTSiOS.getOsLanguage();
+ }
+
+ public static getOsLanguageNormal() : string {
+ const LOCALE_ZH_HANS = 'zh-Hans'
+ const LOCALE_ZH_HANT = 'zh-Hant'
+ let locale = UTSiOS.getOsLanguage();
+ if (locale.indexOf('zh') == 0) {
+ if (locale.indexOf('-hans') > -1) {
+ return LOCALE_ZH_HANS;
+ }
+ if (locale.indexOf('-hant') > -1) {
+ return LOCALE_ZH_HANT;
+ }
+ if (locale.includes("-tw") || locale.includes("-hk") || locale.includes("-mo") || locale.includes("-cht")) {
+ return LOCALE_ZH_HANT;
+ }
+
+ return LOCALE_ZH_HANS;
+ } else {
+ return locale;
+ }
+ }
+
+ public static getAppInnerVersion() : string {
+ return UTSiOS.getInnerVersion();
+ }
+
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts b/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5f65682785e7c494d05cdb6446983eefa3b60fa6
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts
@@ -0,0 +1,84 @@
+import { AppBaseInfoDeviceUtil } from './device/AppBaseInfoDeviceUtil.uts';
+import { UTSiOS } from "DCloudUTSFoundation";
+import {
+ GetAppBaseInfoOptions,
+ GetAppBaseInfo,
+ GetAppBaseInfoResult
+} from '../interface.uts'
+
+export const getAppBaseInfo : GetAppBaseInfo = (config : GetAppBaseInfoOptions | null) : GetAppBaseInfoResult => {
+ let filter : Array = [];
+ if (config != null && config!.filter != null) {
+ filter = config!.filter;
+ }
+
+ if (config == null || filter.length == 0) {
+ const defaultFilter = [
+ "appId",
+ "appName",
+ "appVersion",
+ "appVersionCode",
+ "appLanguage",
+ "language",
+ "version",
+ "appWgtVersion",
+ "hostLanguage",
+ "hostVersion",
+ "hostName",
+ "hostPackageName",
+ "hostSDKVersion",
+ "hostTheme",
+ ];
+ filter = defaultFilter;
+ }
+ return getBaseInfo(filter);
+}
+
+function getBaseInfo(filterArray : Array) : GetAppBaseInfoResult {
+ let result : GetAppBaseInfoResult = {};
+ if (filterArray.indexOf("appId") != -1) {
+ result.appId = AppBaseInfoDeviceUtil.getAppID();
+ }
+ if (filterArray.indexOf("appName") != -1) {
+ result.appName = AppBaseInfoDeviceUtil.getAppName();
+ }
+ if (UTSiOS.isUniMp()) {
+ if (filterArray.indexOf("hostPackageName") != -1) {
+ result.hostPackageName = AppBaseInfoDeviceUtil.getHostPackageName();
+ }
+ if (filterArray.indexOf("hostVersion") != -1) {
+ result.hostVersion = AppBaseInfoDeviceUtil.getHostVersion();
+ }
+ if (filterArray.indexOf("hostName") != -1) {
+ result.hostName = AppBaseInfoDeviceUtil.getHostName();
+ }
+ if (filterArray.indexOf("hostTheme") != -1) {
+ result.hostTheme = AppBaseInfoDeviceUtil.getHostTheme();
+ }
+ if (filterArray.indexOf("hostLanguage") != -1) {
+ result.hostLanguage = AppBaseInfoDeviceUtil.getHostLanguage();
+ }
+ }
+
+ if (filterArray.indexOf("appVersion") != -1) {
+ result.appVersion = AppBaseInfoDeviceUtil.getAppVersion();
+ }
+ if (filterArray.indexOf("appVersionCode") != -1) {
+ result.appVersionCode = AppBaseInfoDeviceUtil.getAppVersionCode();
+ }
+
+ if (filterArray.indexOf("appLanguage") != -1) {
+ result.appLanguage = AppBaseInfoDeviceUtil.getOsLanguageNormal();
+ }
+ if (filterArray.indexOf("language") != -1) {
+ result.language = AppBaseInfoDeviceUtil.getOsLanguage();
+ }
+ if (filterArray.indexOf("version") != -1) {
+ result.version = AppBaseInfoDeviceUtil.getAppInnerVersion();
+ }
+ if (filterArray.indexOf("appWgtVersion") != -1) {
+ result.appWgtVersion = AppBaseInfoDeviceUtil.getAppWgtVersion();
+ }
+
+ return result;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getAppBaseInfo/utssdk/interface.uts b/uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..f7408b505a8b786a435d142b1640f53619cb7f58
--- /dev/null
+++ b/uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
@@ -0,0 +1,233 @@
+export type GetAppBaseInfoOptions = {
+ /**
+ * @description 过滤字段的字符串数组，假如要获取指定字段，传入此数组。
+ */
+ filter: Array
+};
+
+export type GetAppBaseInfoResult = {
+ /**
+ * manifest.json 中应用appid，即DCloud appid。
+ */
+ appId?: string,
+ /**
+ * `manifest.json` 中应用名称。
+ */
+ appName?: string,
+ /**
+ * `manifest.json` 中应用版本名称。
+ */
+ appVersion?: string,
+ /**
+ * `manifest.json` 中应用版本名号。
+ */
+ appVersionCode?: string,
+ /**
+ * 应用设置的语言en、zh-Hans、zh-Hant、fr、es
+ */
+ appLanguage?: string,
+ /**
+ * 应用设置的语言
+ */
+ language?: string,
+ /**
+ * 引擎版本号。已废弃，仅为了向下兼容保留
+ * @deprecated 已废弃，仅为了向下兼容保留
+ */
+ version?: string,
+ /**
+ * 应用资源（wgt）的版本名称。
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ appWgtVersion?: string,
+ /**
+ * 小程序宿主语言
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostLanguage?: string,
+ /**
+ * App、小程序宿主版本。
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostVersion?: string,
+ /**
+ * 小程序宿主名称
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostName?: string,
+ /**
+ * 小程序宿主包名
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostPackageName?: string,
+ /**
+ * uni小程序SDK版本、小程序客户端基础库版本
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostSDKVersion?: string,
+ /**
+ * 系统当前主题，取值为light或dark。微信小程序全局配置"darkmode":true时才能获取，否则为 undefined （不支持小游戏）
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ hostTheme?: string,
+ /**
+ * 是否uni-app x
+ */
+ isUniAppX ?: boolean,
+ /**
+ * uni 编译器版本
+ */
+ uniCompileVersion ?: string,
+ /**
+ * uni-app 运行平台。如：`app`、`mp-weixin`、`web`
+ */
+ uniPlatform ?: string,
+ /**
+ * uni 运行时版本
+ */
+ uniRuntimeVersion ?: string,
+ /**
+ * uni 编译器版本号
+ */
+ uniCompileVersionCode?: number,
+ /**
+ * uni 运行时版本号
+ */
+ uniRuntimeVersionCode?: number,
+}
+
+/**
+ * @param{GetAppBaseInfoOptions} [options=包含所有字段的过滤对象] 过滤的字段对象, 不传参数默认为获取全部字段。
+ */
+export type GetAppBaseInfo = (options?: GetAppBaseInfoOptions | null) => GetAppBaseInfoResult;
+
+
+export interface Uni {
+ /**
+ * GetAppBaseInfo(Object object)
+ * @description
+ * 获取app基本信息
+ * @param {GetAppBaseInfoOptions} options [options=包含所有字段的过滤对象] 过滤的字段对象, 不传参数默认为获取全部字段。
+ * @return {object}
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/getAppBaseInfo.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getAppBaseInfo({
+ filter:[]
+ })
+ ```
+ */
+ getAppBaseInfo(options?: GetAppBaseInfoOptions | null): GetAppBaseInfoResult;
+}
diff --git a/uni_modules/uni-getDeviceInfo/changelog.md b/uni_modules/uni-getDeviceInfo/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getDeviceInfo/package.json b/uni_modules/uni-getDeviceInfo/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..829829c4bf57034c620371d08147b8479dd6922d
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getDeviceInfo",
+ "displayName": "uni-getDeviceInfo",
+ "version": "1.0.0",
+ "description": "uni-getDeviceInfo",
+ "keywords": [
+ "uni-getDeviceInfo"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getDeviceInfo": {
+ "name": "getDeviceInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getDeviceInfo/readme.md b/uni_modules/uni-getDeviceInfo/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..3e334985e6adf19dc6d31c1586f09e8e18b807bf
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/readme.md
@@ -0,0 +1,5 @@
+# uni-getDeviceInfo
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts/-/tree/dev)
\ No newline at end of file
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts b/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..47bf8b49fa207eba8fbb63506fa294467b317b43
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts
@@ -0,0 +1,382 @@
+import Activity from 'android.app.Activity';
+import Configuration from 'android.content.res.Configuration';
+import Context from 'android.content.Context';
+import UiModeManager from 'android.app.UiModeManager';
+import WindowManager from 'android.view.WindowManager';
+import DisplayMetrics from 'android.util.DisplayMetrics';
+import Build from 'android.os.Build';
+import File from 'java.io.File';
+
+import { EmulatorCheckUtil } from './EmulatorCheckUtil.uts'
+import TextUtils from 'android.text.TextUtils';
+
+import { UTSAndroid as Device } from "io.dcloud.uts";
+import BufferedReader from 'java.io.BufferedReader';
+import InputStreamReader from 'java.io.InputStreamReader';
+import Exception from 'java.lang.Exception';
+import KotlinArray from 'kotlin.Array'
+
+
+export class DeviceUtil {
+
+ private static customOS: string | null = null
+ private static customOSVersion: string | null = null
+
+ private static readonly rootRelatedDirs = [
+ "/su", "/su/bin/su", "/sbin/su",
+ "/data/local/xbin/su", "/data/local/bin/su", "/data/local/su",
+ "/system/xbin/su",
+ "/system/bin/su", "/system/sd/xbin/su", "/system/bin/failsafe/su",
+ "/system/bin/cufsdosck", "/system/xbin/cufsdosck", "/system/bin/cufsmgr",
+ "/system/xbin/cufsmgr", "/system/bin/cufaevdd", "/system/xbin/cufaevdd",
+ "/system/bin/conbb", "/system/xbin/conbb"];
+
+
+ /**
+ * HarmonyOS 系统输出的
+ * 格式：2.0.0
+ */
+ private static KEY_HARMONYOS_VERSION_NAME = "hw_sc.build.platform.version";
+
+ /**
+ * EMUI系统输出的
+ * 格式：EmotionUI_8.0.0
+ */
+ private static KEY_EMUI_VERSION_NAME = "ro.build.version.emui";
+
+ /**
+ * MagicUI系统输出的
+ * 格式：3.1.0
+ */
+ private static KEY_MAGICUI_VERSION = "ro.build.version.magic";
+
+ /**
+ * MIUI系统输出的
+ * 格式：V12
+ */
+ private static KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
+
+ /**
+ * OPPO手机ColorOS系统输出的
+ * 格式：9
+ */
+ private static KEY_COLOROS_VERSION_NAME = "ro.build.version.opporom";
+
+ /**
+ * VIVO手机系统输出的
+ * name格式：funtouch
+ * version格式： 9
+ */
+ private static KEY_VIVO_VERSION_NAME = "ro.vivo.os.name";
+ private static KEY_VIVO_VERSION = "ro.vivo.os.version";
+
+ /**
+ * OonPlus手机系统输出的
+ * 格式：Hydrogen OS 11.0.7.10.KB05
+ */
+ private static KEY_ONEPLUS_VERSION_NAME = "ro.rom.version";
+
+ /**
+ * 魅族手机系统输出的
+ */
+ private static KEY_FLYME_VERSION_NAME = "ro.build.display.id";
+
+ /**
+ * nubia手机系统输出的
+ */
+ private static KEY_NUBIA_VERSION_NAME = "ro.build.nubia.rom.name";
+ private static KEY_NUBIA_VERSION_CODE = "ro.build.nubia.rom.code";
+
+
+
+ public static getOrientation(activity: Activity): string {
+ const activityOrientation = activity.getResources().getConfiguration().orientation;
+ let outOrientation = "portrait";
+ if (activityOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+ outOrientation = "landscape";
+ }
+ return outOrientation;
+ }
+
+ /**
+ * 获取屏幕像素比
+ */
+ public static getScaledDensity(activity: Activity): number {
+ const windowManager = activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager;
+ const displayMetrics = new DisplayMetrics();
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ windowManager.getDefaultDisplay().getRealMetrics(displayMetrics);
+ } else {
+ windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+ }
+ return displayMetrics.scaledDensity;
+ }
+
+ public static getSystemUIModeType(activity: Activity): string {
+
+ let uiModeManager = activity.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager;
+ let modeType = "unknown";
+
+ switch (uiModeManager.getCurrentModeType()) {
+ case Configuration.UI_MODE_TYPE_TELEVISION:
+ modeType = "tv";
+ break;
+ case Configuration.UI_MODE_TYPE_WATCH:
+ modeType = "watch";
+ break;
+ case Configuration.UI_MODE_TYPE_NORMAL:
+ if (DeviceUtil.isTablet(activity)) {
+ modeType = "pad";
+ } else {
+ modeType = "phone";
+ }
+ break;
+ case Configuration.UI_MODE_TYPE_DESK:
+ modeType = "pc";
+ break;
+ case Configuration.UI_MODE_TYPE_UNDEFINED:
+ modeType = "undefined";
+ break;
+ case Configuration.UI_MODE_TYPE_CAR:
+ modeType = "car";
+ break;
+ case Configuration.UI_MODE_TYPE_VR_HEADSET:
+ modeType = "vr";
+ break;
+ case Configuration.UI_MODE_TYPE_APPLIANCE:
+ modeType = "appliance";
+ break;
+ }
+
+ return modeType;
+ }
+
+
+ /**
+ * 是否root
+ */
+ public static hasRootPrivilege(): boolean {
+ let hasRootDir = false;
+ let rootDirs = DeviceUtil.rootRelatedDirs;
+ let dirCount = rootDirs.length;
+ let i = 0;
+ while (i < dirCount) {
+ let dir = rootDirs[i];
+ if ((new File(dir)).exists()) {
+ hasRootDir = true;
+ break;
+ }
+ i++;
+ }
+
+
+ return Build.TAGS != null && Build.TAGS.includes("test-keys") || hasRootDir;
+ }
+
+ public static isSimulator(context: Context): boolean {
+ return EmulatorCheckUtil.getSingleInstance().emulatorCheck(context);
+ }
+
+
+ public static getDeviceID(context: Context): string {
+ return Device.getDeviceID(context);
+ }
+
+
+ public static getOsLanguage(context: Context): string {
+ return Device.getLanguageInfo(context)["osLanguage"].toString();
+ }
+
+ public static getOsLanguageNormal(context: Context): string {
+ const LOCALE_ZH_HANS = 'zh-Hans'
+ const LOCALE_ZH_HANT = 'zh-Hant'
+ let locale = Device.getLanguageInfo(context)["appLanguage"].toString();
+ if (locale.indexOf('zh') === 0) {
+ if (locale.indexOf('-hans') > -1) {
+ return LOCALE_ZH_HANS;
+ }
+ if (locale.indexOf('-hant') > -1) {
+ return LOCALE_ZH_HANT;
+ }
+ if (locale.includes("-tw") || locale.includes("-hk") || locale.includes("-mo") || locale.includes("-cht")) {
+ return LOCALE_ZH_HANT;
+ }
+
+ return LOCALE_ZH_HANS;
+ } else {
+ return locale;
+ }
+ }
+
+ public static getAppInnerVersion(): string {
+ return Device.getInnerVersion();
+ }
+
+ public static getOaid(): string {
+ return Device.getOAID();
+ }
+
+
+ /**
+ * 是否为平板 不是太准确
+ */
+ public static isTablet(activity: Activity): boolean {
+ return (activity.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+ }
+
+
+
+ private static setCustomInfo(phoneBrand: string) {
+ try {
+ switch (DeviceUtil.deleteSpaceAndToUpperCase(phoneBrand)) {
+ case "HUAWEI":
+ if (DeviceUtil.isHarmonyOS()) {
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME);
+ DeviceUtil.customOS = "HarmonyOS";
+ } else {
+ DeviceUtil.customOS = "EMUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_EMUI_VERSION_NAME);;
+ }
+ break;
+ case "HONOR":
+ if (DeviceUtil.isHarmonyOS()) {
+ DeviceUtil.customOS = "HarmonyOS";
+ if (!TextUtils.isEmpty(DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME))) {
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME);;
+ } else {
+ DeviceUtil.customOSVersion = "";
+ }
+ } else if (!TextUtils.isEmpty(DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MAGICUI_VERSION))) {
+ DeviceUtil.customOS = "MagicUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MAGICUI_VERSION);
+ } else {
+ //格式：EmotionUI_8.0.0
+ DeviceUtil.customOS = "EMUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_EMUI_VERSION_NAME);
+ }
+ break;
+ case "XIAOMI":
+ case "REDMI":
+ //格式：MIUIV12
+ DeviceUtil.customOS = "MIUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MIUI_VERSION_NAME);
+ break;
+ case "REALME":
+ case "OPPO":
+ //格式：ColorOSV2.1
+ DeviceUtil.customOS = "ColorOS";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_COLOROS_VERSION_NAME);
+ break;
+ case "VIVO":
+ //格式：Funtouch9
+ DeviceUtil.customOS = "Funtouch";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_VIVO_VERSION);
+ break;
+ case "ONEPLUS":
+ //格式：Hydrogen OS 11.0.7.10.KB05
+ DeviceUtil.customOS = "HydrogenOS";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_ONEPLUS_VERSION_NAME);
+ break;
+ case "MEIZU":
+ //格式:Flyme 6.3.5.1G
+ DeviceUtil.customOS = "Flyme";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_FLYME_VERSION_NAME);
+ break;
+ case "NUBIA":
+ //格式:nubiaUIV3.0
+ DeviceUtil.customOS = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_NUBIA_VERSION_NAME);
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_NUBIA_VERSION_CODE);
+ break;
+ default:
+ DeviceUtil.customOS = "Android";
+ DeviceUtil.customOSVersion = Build.VERSION.RELEASE;
+ break;
+ }
+ } catch (e: Exception) {
+ }
+ }
+
+
+
+ /**
+ * 判断是否是华为鸿蒙系统，能否识别荣耀鸿蒙未知
+ *
+ * @return
+ */
+ private static isHarmonyOS(): boolean {
+ try {
+ let classType = Class.forName("com.huawei.system.BuildEx");
+ let getMethod = classType.getMethod("getOsBrand");
+ let value = getMethod.invoke(classType) as string;
+ return !TextUtils.isEmpty(value);
+ } catch (e: Exception) {
+ return false;
+ }
+ }
+
+
+
+
+
+
+ /**
+ * 删除字符串中的空格并全部转成大写
+ * @param str
+ * @return
+ */
+ public static deleteSpaceAndToUpperCase(str: string | null): string {
+ if (TextUtils.isEmpty(str)) {
+ return "";
+ }
+ return str!.replace(" ", "").toUpperCase();
+ }
+
+ private static getSystemPropertyValue(propName: string): string | null {
+ let value: string | null = null;
+ let roSecureObj: any | null;
+ try {
+ // Class.forName("java.lang.String")
+ const method = Class.forName("android.os.SystemProperties").getMethod("get", Class.forName("java.lang.String"));
+ roSecureObj = method.invoke(null, propName);
+ if (roSecureObj != null) {
+ value = roSecureObj as string;
+ }
+ } catch (e: Exception) {
+ }
+ return value;
+ }
+
+ public static listeningForADB(): boolean {
+ let cmd : KotlinArray = arrayOf("/bin/sh", "-c", "getprop | grep init.svc.adbd");
+ try{
+ Runtime.getRuntime().exec(cmd);
+ }catch(e:Exception){
+ cmd = arrayOf("/system/bin/sh", "-c", "getprop | grep init.svc.adbd");
+ try{
+ Runtime.getRuntime().exec(cmd);
+ }catch(e:Exception){
+ return false
+ }
+ }
+ let exec = Runtime.getRuntime().exec(cmd);
+ let bufferedReader = new BufferedReader(new InputStreamReader(exec.getInputStream(), "utf-8"));
+ let tmp = new CharArray(1024);
+
+ let result = false;
+
+ do {
+ let len = bufferedReader.read(tmp);
+ if (len == -1) {
+ break;
+ }
+ let res = new String(tmp, 0, len);
+ result = res.includes("running");
+ } while (true)
+
+ exec.getInputStream().close();
+ bufferedReader.close();
+ return result;
+ }
+}
+
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/EmulatorCheckUtil.uts b/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/EmulatorCheckUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..537a19b2aa4b1f8d359263ba554afb7faacaea5a
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/app-android/device/EmulatorCheckUtil.uts
@@ -0,0 +1,393 @@
+import Context from "android.content.Context";
+import Locale from "java.util.Locale";
+import File from "java.io.File";
+import SensorManager from "android.hardware.SensorManager";
+import Sensor from "android.hardware.Sensor";
+import PackageManager from 'android.content.pm.PackageManager';
+class CheckResult {
+ public result: Int;
+ public value: string | null;
+
+ constructor(result: Int, value: string | null) {
+ this.result = result;
+ this.value = value;
+ }
+}
+
+export class EmulatorCheckUtil {
+ private static INSTANCE: EmulatorCheckUtil | null = null;
+
+ public static readonly RESULT_MAYBE_EMULATOR:Int = 0; //可能是模拟器
+ public static readonly RESULT_EMULATOR:Int = 1; //模拟器
+ public static readonly RESULT_UNKNOWN:Int = 2; //可能是真机
+
+ private static known_pkgNames =[
+ "sdcard/Android/data/com.bluestacks.home", //蓝叠
+ "sdcard/Android/data/com.bluestacks.settings", //蓝叠
+ "sdcard/Android/data/com.microvirt.guide", //逍遥
+ "sdcard/Android/data/com.microvirt.launcher2" //逍遥
+ ];
+
+ public static getSingleInstance(): EmulatorCheckUtil {
+ if (EmulatorCheckUtil.INSTANCE == null) {
+ EmulatorCheckUtil.INSTANCE = new EmulatorCheckUtil();
+ }
+ return EmulatorCheckUtil.INSTANCE!;
+ }
+
+ public emulatorCheck(context: Context): boolean {
+ if (context == null) {
+ throw new IllegalArgumentException("context must not be null");
+ }
+
+ let suspectCount = 0;
+
+ //检测硬件名称
+ let hardwareResult = this.checkFeaturesByHardware();
+ switch (hardwareResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //通过pkgName检测
+ let blueStacksResult = this.checkPkgNameForEmulator();
+ switch (blueStacksResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测渠道
+ let flavorResult = this.checkFeaturesByFlavor();
+ switch (flavorResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测设备型号
+ let modelResult = this.checkFeaturesByModel();
+ switch (modelResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测硬件制造商
+ let manufacturerResult = this.checkFeaturesByManufacturer();
+ switch (manufacturerResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测主板名称
+ let boardResult = this.checkFeaturesByBoard();
+ switch (boardResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测主板平台
+ let platformResult = this.checkFeaturesByPlatform();
+ switch (platformResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ ++suspectCount;
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测基带信息
+ let baseBandResult = this.checkFeaturesByBaseBand();
+ switch (baseBandResult.result) {
+ case EmulatorCheckUtil.RESULT_MAYBE_EMULATOR:
+ suspectCount += 2; //模拟器基带信息为null的情况概率相当大
+ break;
+ case EmulatorCheckUtil.RESULT_EMULATOR:
+ return true;
+ }
+
+ //检测传感器数量
+ let sensorNumber = this.getSensorNumber(context);
+ if (sensorNumber <= 7) ++suspectCount;
+
+ //检测已安装第三方应用数量
+ /*int userAppNumber = getUserAppNumber();
+ if (userAppNumber <= 5) ++suspectCount;*/
+
+ //检测是否支持闪光灯
+ let supportCameraFlash = this.supportCameraFlash(context);
+ if (!supportCameraFlash) ++suspectCount;
+
+ //检测是否支持蓝牙
+ let supportBluetooth = this.supportBluetooth(context);
+ if (!supportBluetooth) ++suspectCount;
+
+ //检测光线传感器
+ let hasLightSensor = this.hasLightSensor(context);
+ if (!hasLightSensor) ++suspectCount;
+
+ //检测进程组信息
+ /*CheckResult cgroupResult = checkFeaturesByCgroup();
+ if (cgroupResult.result == RESULT_MAYBE_EMULATOR) ++suspectCount;*/
+
+ //嫌疑值大于3，认为是模拟器
+ return suspectCount > 3;
+ }
+
+ private getProperty(propName: string): string | null {
+ let value: string | null = null;
+ let roSecureObj: any | null = null;
+ try {
+ const method = Class.forName("android.os.SystemProperties").getMethod(
+ "get",
+ Class.forName("java.lang.String")
+ );
+ roSecureObj = method.invoke(null, propName);
+ if (roSecureObj != null) {
+ value = roSecureObj as string;
+ }
+ } catch (e: Exception) {
+ }
+ return value;
+ }
+
+ /**
+ * 特征参数-硬件名称
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByHardware(): CheckResult {
+ let hardware = this.getProperty("ro.hardware");
+ if (null == hardware) {
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ }
+ let result: Int | null;
+ let tempValue = hardware.toLowerCase(Locale.ENGLISH);
+ switch (tempValue) {
+ case "ttvm": //天天模拟器
+ case "nox": //夜神模拟器
+ case "cancro": //网易MUMU模拟器
+ case "intel": //逍遥模拟器
+ case "vbox":
+ case "vbox86": //腾讯手游助手
+ case "android_x86": //雷电模拟器
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ break;
+ default:
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ break;
+ }
+ return new CheckResult(result, hardware);
+ }
+
+ /**
+ * 特征参数-渠道
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByFlavor(): CheckResult {
+ let flavor = this.getProperty("ro.build.flavor");
+ if (null == flavor) {
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ }
+ let result: Int | null;
+ let tempValue = flavor.toLowerCase(Locale.ENGLISH);
+ if (tempValue.includes("vbox")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else if (tempValue.includes("sdk_gphone")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, flavor);
+ }
+
+ private checkPkgNameForEmulator(): CheckResult {
+ let result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ let accordSize = 0;
+ for (let i = 0; i < EmulatorCheckUtil.known_pkgNames.length; i++) {
+ let file_name = EmulatorCheckUtil.known_pkgNames[i];
+ let qemu_file = new File(file_name);
+ if (qemu_file.exists()) {
+ accordSize++;
+ } else {
+ result = EmulatorCheckUtil.RESULT_MAYBE_EMULATOR;
+ }
+ if (accordSize > 2) {
+ break;
+ }
+ }
+ switch (accordSize) {
+ case 1: {
+ result = EmulatorCheckUtil.RESULT_MAYBE_EMULATOR;
+ break;
+ }
+ case 2: {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ break;
+ }
+ }
+ return new CheckResult(result, "PkgName");
+ }
+
+ /**
+ * 特征参数-设备型号
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByModel(): CheckResult {
+ let model = this.getProperty("ro.product.model");
+ if (null == model) {
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ }
+ let result: Int | null;
+ let tempValue = model.toLowerCase(Locale.ENGLISH);
+ if (tempValue.includes("google_sdk")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else if (tempValue.includes("emulator")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else if (tempValue.includes("android sdk built for x86")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, model);
+ }
+
+ /**
+ * 特征参数-硬件制造商
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByManufacturer(): CheckResult {
+ let manufacturer = this.getProperty("ro.product.manufacturer");
+ if (null == manufacturer)
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ let result: Int | null;
+ let tempValue = manufacturer.toLowerCase(Locale.ENGLISH);
+ if (tempValue.includes("genymotion")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else if (tempValue.includes("netease")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR; //网易MUMU模拟器
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, manufacturer);
+ }
+
+ /**
+ * 特征参数-主板名称
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByBoard(): CheckResult {
+ let board = this.getProperty("ro.product.board");
+ if (null == board) {
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ }
+ let result: Int | null;
+ let tempValue = board.toLowerCase(Locale.ENGLISH);
+ if (tempValue.includes("android")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else if (tempValue.includes("goldfish")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, board);
+ }
+
+ /**
+ * 特征参数-主板平台
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByPlatform(): CheckResult {
+ let platform = this.getProperty("ro.board.platform");
+ if (null == platform)
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ let result: Int | null;
+ let tempValue = platform.toLowerCase(Locale.ENGLISH);
+ if (tempValue.includes("android")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, platform);
+ }
+
+ /**
+ * 特征参数-基带信息
+ *
+ * @return 0表示可能是模拟器，1表示模拟器，2表示可能是真机
+ */
+ private checkFeaturesByBaseBand(): CheckResult {
+ let baseBandVersion = this.getProperty("gsm.version.baseband");
+ if (null == baseBandVersion) {
+ return new CheckResult(EmulatorCheckUtil.RESULT_MAYBE_EMULATOR, null);
+ }
+ let result: Int | null;
+ if (baseBandVersion.includes("1.0.0.0")) {
+ result = EmulatorCheckUtil.RESULT_EMULATOR;
+ } else {
+ result = EmulatorCheckUtil.RESULT_UNKNOWN;
+ }
+ return new CheckResult(result, baseBandVersion);
+ }
+
+ /**
+ * 获取传感器数量
+ */
+ private getSensorNumber(context: Context): Int {
+ let sm = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager;
+ return sm.getSensorList(Sensor.TYPE_ALL).size;
+ }
+
+ /**
+ * 是否支持闪光灯
+ */
+ private supportCameraFlash(context: Context): boolean {
+ return context
+ .getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
+ }
+
+ /**
+ * 是否支持蓝牙
+ */
+ private supportBluetooth(context: Context): boolean {
+ return context
+ .getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
+ }
+
+ /**
+ * 判断是否存在光传感器来判断是否为模拟器
+ * 部分真机也不存在温度和压力传感器。其余传感器模拟器也存在。
+ *
+ * @return false为模拟器
+ */
+ private hasLightSensor(context: Context): boolean {
+ let sensorManager = context.getSystemService(
+ Context.SENSOR_SERVICE
+ ) as SensorManager;
+ let sensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT); //光线传感器
+ return null != sensor;
+ }
+}
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/app-android/index.uts b/uni_modules/uni-getDeviceInfo/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..89659c9915f27ff23a00e93c1d9be5d27b314bd0
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/app-android/index.uts
@@ -0,0 +1,82 @@
+import Build from 'android.os.Build';
+import { UTSAndroid } from "io.dcloud.uts";
+import { DeviceUtil } from './device/DeviceUtil.uts';
+
+import { GetDeviceInfo, GetDeviceInfoOptions, GetDeviceInfoResult } from '../interface.uts'
+
+
+export const getDeviceInfo : GetDeviceInfo = (config : GetDeviceInfoOptions | null) : GetDeviceInfoResult => {
+ let filter : Array = [];
+ if (config != null && config.filter != null) {
+ filter = config.filter;
+ }
+
+ if (config == null || filter.length == 0) {
+ const defaultFilter = [
+ "brand",
+ "deviceBrand",
+ "deviceId",
+ "model",
+ "deviceModel",
+ "deviceType",
+ "deviceOrientation",
+ "devicePixelRatio",
+ "system",
+ "platform",
+ "oaid",
+ "isRoot",
+ "isSimulator",
+ "isUSBDebugging"
+ ];
+ filter = defaultFilter;
+ }
+ return getBaseInfo(filter);
+}
+
+function getBaseInfo(filterArray : Array) : GetDeviceInfoResult {
+ const activity = UTSAndroid.getUniActivity()!;
+ let result : GetDeviceInfoResult = {};
+ if (filterArray.indexOf("brand") != -1) {
+ result.brand = Build.MANUFACTURER;
+ }
+ if (filterArray.indexOf("deviceBrand") != -1) {
+ result.deviceBrand = Build.MANUFACTURER;
+ }
+ if (filterArray.indexOf("model") != -1) {
+ result.model = Build.MODEL;
+ }
+ if (filterArray.indexOf("deviceModel") != -1) {
+ result.deviceModel = Build.MODEL;
+ }
+ if (filterArray.indexOf("deviceType") != -1) {
+ result.deviceType = DeviceUtil.getSystemUIModeType(activity);
+ }
+ if (filterArray.indexOf("deviceOrientation") != -1) {
+ result.deviceOrientation = DeviceUtil.getOrientation(activity);
+ }
+ if (filterArray.indexOf("deviceId") != -1) {
+ result.deviceId = DeviceUtil.getDeviceID(activity);
+ }
+ if (filterArray.indexOf("devicePixelRatio") != -1) {
+ result.devicePixelRatio = DeviceUtil.getScaledDensity(activity) + "";
+ }
+ if (filterArray.indexOf("system") != -1) {
+ result.system = "Android " + Build.VERSION.RELEASE;
+ }
+ if (filterArray.indexOf("platform") != -1) {
+ result.platform = "android";
+ }
+ if (filterArray.indexOf("oaid") != -1) {
+ result.oaid = DeviceUtil.getOaid();
+ }
+ if (filterArray.indexOf("isRoot") != -1) {
+ result.isRoot = DeviceUtil.hasRootPrivilege();
+ }
+ if (filterArray.indexOf("isSimulator") != -1) {
+ result.isSimulator = DeviceUtil.isSimulator(activity);
+ }
+ if (filterArray.indexOf("isUSBDebugging") != -1) {
+ result.isUSBDebugging = DeviceUtil.listeningForADB();
+ }
+ return result;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/app-ios/device/DeviceUtil.uts b/uni_modules/uni-getDeviceInfo/utssdk/app-ios/device/DeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..2d39d8c9ad70e9ada324e09450df6edd353e1790
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/app-ios/device/DeviceUtil.uts
@@ -0,0 +1,82 @@
+import { UIDevice, UIApplication, UIInterfaceOrientation, UIScreen } from 'UIKit';
+import { NSLocale, URL, FileManager } from 'Foundation';
+import { ATTrackingManager } from 'AppTrackingTransparency';
+import { ASIdentifierManager } from 'AdSupport';
+import { DispatchSemaphore, DispatchQueue } from 'Dispatch';
+
+
+
+export class DeviceUtil {
+
+ public static isPad(): boolean {
+ return UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad
+ }
+
+ public static getOSVersion(): string {
+ return UIDevice.current.systemVersion;
+ }
+
+ public static getLan(): string {
+ let currentLanguage = NSLocale.preferredLanguages[0];
+ return currentLanguage == null ? "" : currentLanguage
+ }
+
+ public static getOrientation(): string {
+ let orientation = "portrait";
+ DispatchQueue.main.sync(execute = () => {
+ const orient = UIApplication.shared.statusBarOrientation;
+ if (orient == UIInterfaceOrientation.landscapeLeft || orient == UIInterfaceOrientation.landscapeRight) {
+ orientation = "landscape";
+ }
+ })
+ return orientation;
+ }
+
+ public static getScreenScale(): string {
+ return UIScreen.main.scale.description;
+ }
+
+
+ public static getIdfa(): string {
+ if (UTSiOS.available("iOS 14, *")) {
+ if (ATTrackingManager.trackingAuthorizationStatus == ATTrackingManager.AuthorizationStatus.notDetermined) {
+ ATTrackingManager.requestTrackingAuthorization(completionHandler = (status) => { });
+ } else if (ATTrackingManager.trackingAuthorizationStatus == ATTrackingManager.AuthorizationStatus.authorized) {
+ return ASIdentifierManager.shared().advertisingIdentifier.uuidString;
+ }
+ return "";
+ }
+
+ return ASIdentifierManager.shared().advertisingIdentifier.uuidString;
+ }
+
+ public static hasRootPrivilege(): boolean {
+ let url = new URL(string = "cydia://");
+ let canOpenUrl = false;
+ DispatchQueue.main.sync(execute = () => {
+ canOpenUrl = UIApplication.shared.canOpenURL(url!)
+ })
+ if (canOpenUrl) {
+ return true;
+ }
+
+ let jailbreakToolPaths = [
+ "/Applications/Cydia.app",
+ "/Library/MobileSubstrate/MobileSubstrate.dylib",
+ "/bin/bash",
+ "/usr/sbin/sshd",
+ "/etc/apt"
+ ];
+
+ let i = 0;
+ while (i < jailbreakToolPaths.length) {
+ if (FileManager.default.fileExists(atPath = jailbreakToolPaths[i])) {
+ return true;
+ }
+ i++;
+ }
+
+
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/app-ios/index.uts b/uni_modules/uni-getDeviceInfo/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..bf6d6b31c2fb90b09ed968f2a814cbc4899e54ed
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/app-ios/index.uts
@@ -0,0 +1,80 @@
+
+import { UTSiOS } from "DCloudUTSFoundation";
+import { DeviceUtil } from './device/DeviceUtil.uts';
+
+import { GetDeviceInfo, GetDeviceInfoOptions, GetDeviceInfoResult } from '../interface.uts'
+
+export const getDeviceInfo : GetDeviceInfo = (config : GetDeviceInfoOptions | null) : GetDeviceInfoResult => {
+ let filter : Array = [];
+ if (config != null && config?.filter != null) {
+ let temp = config?.filter;
+ filter = temp!;
+ }
+
+ if (config == null || filter.length == 0) {
+ const defaultFilter = [
+ "brand",
+ "deviceBrand",
+ "deviceId",
+ "model",
+ "deviceModel",
+ "deviceType",
+ "deviceOrientation",
+ "devicePixelRatio",
+ "system",
+ "platform",
+ "idfa",
+ "isRoot",
+ "isSimulator"
+ ];
+ filter = defaultFilter;
+ }
+ return getBaseInfo(filter);
+}
+
+
+function getBaseInfo(filterArray : Array) : GetDeviceInfoResult {
+ const osVersion = DeviceUtil.getOSVersion();
+ let result : GetDeviceInfoResult = {};
+ if (filterArray.indexOf("brand") != -1) {
+ result.brand = "apple";
+ }
+ if (filterArray.indexOf("deviceBrand") != -1) {
+ result.deviceBrand = "apple";
+ }
+ if (filterArray.indexOf("deviceId") != -1) {
+ result.deviceId = UTSiOS.getDeviceId();
+ }
+ if (filterArray.indexOf("model") != -1) {
+ result.model = UTSiOS.getModel();
+ }
+ if (filterArray.indexOf("deviceModel") != -1) {
+ result.deviceModel = UTSiOS.getModel();
+ }
+ if (filterArray.indexOf("deviceType") != -1) {
+ result.deviceType = DeviceUtil.isPad() ? "pad" : "phone";
+ }
+ if (filterArray.indexOf("deviceOrientation") != -1) {
+ result.deviceOrientation = DeviceUtil.getOrientation();
+ }
+ if (filterArray.indexOf("devicePixelRatio") != -1) {
+ result.devicePixelRatio = DeviceUtil.getScreenScale();
+ }
+ if (filterArray.indexOf("system") != -1) {
+ result.system = String(format = "iOS %@", osVersion);
+ }
+ if (filterArray.indexOf("platform") != -1) {
+ result.platform = "ios";
+ }
+ if (filterArray.indexOf("idfa") != -1) {
+ result.idfa = DeviceUtil.getIdfa();
+ }
+ if (filterArray.indexOf("isRoot") != -1) {
+ result.isRoot = DeviceUtil.hasRootPrivilege();
+ }
+ if (filterArray.indexOf("isSimulator") != -1) {
+ result.isSimulator = UTSiOS.isSimulator();
+ }
+
+ return result;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getDeviceInfo/utssdk/interface.uts b/uni_modules/uni-getDeviceInfo/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..cb6f7e2178d68121f30ea05c89934494b099b946
--- /dev/null
+++ b/uni_modules/uni-getDeviceInfo/utssdk/interface.uts
@@ -0,0 +1,156 @@
+export type GetDeviceInfoOptions = {
+ /**
+ * @description 过滤字段的字符串数组，假如要获取指定字段，传入此数组。
+ */
+ filter: Array
+}
+
+export type GetDeviceInfoResult = {
+ /**
+ * 设备品牌
+ */
+ brand?: string
+ /**
+ * 设备品牌
+ */
+ deviceBrand?: string,
+ /**
+ * 设备 id 。由 uni-app 框架生成并存储，清空 Storage 会导致改变
+ */
+ deviceId?: string,
+ /**
+ * 设备型号
+ */
+ model?: string,
+ /**
+ * 设备型号
+ */
+ deviceModel?: string,
+ /**
+ * 设备类型phone、pad、pc
+ */
+ deviceType?: string,
+ /**
+ * 设备方向 竖屏 portrait、横屏 landscape
+ */
+ deviceOrientation?: string,
+ /**
+ * 设备像素比
+ */
+ devicePixelRatio?: string,
+ /**
+ * 操作系统及版本
+ */
+ system?: string,
+ /**
+ * 客户端平台
+ */
+ platform?: string,
+ /**
+ * oaid标识 Android专有
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "√"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ oaid?: string,
+ /**
+ * 是否root
+ */
+ isRoot?: boolean,
+ /**
+ * 是否是模拟器
+ */
+ isSimulator?: boolean,
+ /**
+ * adb是否开启
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "√",
+ * "unixVer": "√"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ isUSBDebugging?: boolean,
+ /**
+ * idfa标识 iOS专有
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "5.0",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ idfa?: string,
+ /**
+ * 应用平台
+ */
+}
+
+
+/**
+ * @param [options=包含所有字段的过滤对象] 过滤的字段对象, 不传参数默认为获取全部字段。
+ */
+export type GetDeviceInfo = (options?: GetDeviceInfoOptions | null) => GetDeviceInfoResult;
+
+
+export interface Uni {
+ /**
+ * GetDeviceInfo(Object object)
+ * @description
+ * 获取设备信息
+ * @param {GetDeviceInfoOptions} options [options=包含所有字段的过滤对象] 过滤的字段对象, 不传参数默认为获取全部字段。
+ * @return {object}
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/getDeviceInfo.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getDeviceInfo({
+ filter:[]
+ })
+ ```
+ */
+ getDeviceInfo(options?: GetDeviceInfoOptions | null): GetDeviceInfoResult;
+}
diff --git a/uni_modules/uni-getLocation-system/changelog.md b/uni_modules/uni-getLocation-system/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getLocation-system/package.json b/uni_modules/uni-getLocation-system/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b7713c6e759bc2339f950fb9a056ab8ca497714
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getLocation-system",
+ "displayName": "uni-getLocation-system",
+ "version": "1.0.0",
+ "description": "uni-getLocation-system",
+ "keywords": [
+ "uni-getLocation-system"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "dcloudext": {
+ "type": "uts",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "",
+ "data": "",
+ "permissions": ""
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "uni-ext-api": {
+ "uni": {
+ "getLocation": {
+ "name": "getLocation",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getLocation-system/readme.md b/uni_modules/uni-getLocation-system/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..f2f72b39e0102c7ba3c7cb146ec929b3a17f1cf2
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/readme.md
@@ -0,0 +1,6 @@
+# uts-location
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-getLocation-system/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-getLocation-system/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..711a0ff6c233299d920a3fcd4c54495425e41d88
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-getLocation-system/utssdk/app-android/config.json b/uni_modules/uni-getLocation-system/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..0c9878ed683c1b44d5dbd83b520e1bc2feb81903
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/utssdk/app-android/config.json
@@ -0,0 +1,3 @@
+{
+ "minSdkVersion": 19
+}
diff --git a/uni_modules/uni-getLocation-system/utssdk/app-android/index.uts b/uni_modules/uni-getLocation-system/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..dde095a904545dfe086da146536be8f92662e04b
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/utssdk/app-android/index.uts
@@ -0,0 +1,174 @@
+import { GetLocation, GetLocationOptions, GetLocationSuccess,GetLocationFail } from "../interface.uts"
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import Context from 'android.content.Context';
+import LocationManager from 'android.location.LocationManager';
+import Criteria from 'android.location.Criteria';
+import Location from 'android.location.Location';
+import LocationListener from 'android.location.LocationListener';
+
+
+
+/**
+ * 对外的函数接口
+ */
+export const getLocation : GetLocation = function (options : GetLocationOptions) {
+
+ /**
+ * 准备权限
+ */
+ let permissionNeed : string[] = utsArrayOf("android.permission.ACCESS_FINE_LOCATION");
+ UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, permissionNeed, function (allRight:boolean,_grantedList:string[]) {
+ if (allRight) {
+ // 交给目前的location 引擎，真实执行
+ getLocationImpl(options)
+ }
+ }, function (_doNotAskAgain:boolean,_grantedList:string[]) {
+ console.log("用户拒绝了部分权限:")
+ let err = new UniError("uni-getLocation-system",-10,"permission missed.");
+ options.fail?.(err)
+ options.complete?.(err)
+ })
+
+}
+
+/****************************************内部功能实现****************************************************/
+/**
+ * 全局信息处理
+ */
+class Global {
+ /**
+ * 默认实现
+ */
+ static lastLocation : Location | null = null;
+}
+
+
+/**
+ * 封装系统监听回调
+ */
+class CustomSystemLocationListener extends LocationListener {
+ override onLocationChanged(location : Location) : void {
+ Global.lastLocation = location
+ }
+}
+
+
+/**
+ * 真实的执行位置定位
+ */
+function getLocationImpl(options : GetLocationOptions) {
+
+ /**
+ * add since 2023-09-14 增加默认值兼容逻辑
+ */
+ if(options.type == null){
+ options.type = 'wgs84'
+ }
+ if(options.highAccuracyExpireTime == null){
+ options.highAccuracyExpireTime = 3000
+ }
+
+
+ if(options.type != 'wgs84'){
+ // 系统定位只支持wgs84，如果不是则报错
+ let err = new UniError("uni-getLocation-system",-1,"system location support wgs84 only.");
+ options.fail?.(err)
+ options.complete?.(err)
+ return
+ }
+
+ if(options.geocode != null && options.geocode == true){
+ // 系统定位不支持逆地理编码
+ let err = new UniError("uni-getLocation-system",-2,"system location not support geocode.");
+ options.fail?.(err)
+ options.complete?.(err)
+ return
+ }
+
+
+
+ let locationManager = UTSAndroid.getAppContext()!.getSystemService(Context.LOCATION_SERVICE) as LocationManager;
+ let criteria = new Criteria()
+
+ // 用户明确开启了高度
+ if (options.altitude != null && options.altitude == true) {
+ criteria.setAltitudeRequired(true)
+ }
+ // 设置精度
+ if (options.isHighAccuracy != null && options.isHighAccuracy == true) {
+ criteria.setAccuracy(Criteria.ACCURACY_FINE)
+ } else{
+ criteria.setAccuracy(Criteria.ACCURACY_COARSE)
+ }
+
+ criteria.setPowerRequirement(Criteria.POWER_LOW)
+ criteria.setSpeedRequired(true)
+
+ /**
+ * 如果存在gps，那么优先gps，这样才有高度信息
+ */
+ let providerName:string|null = "gps"
+ if(!locationManager.getProviders(criteria, true).contains("gps")){
+ providerName = locationManager.getBestProvider(criteria, true)
+ }
+
+ if (providerName == null) {
+ // 没有找到合法的系统定位能力提供者，错误的逻辑 todo
+ let err = new UniError("uni-getLocation-system",-3,"Provider is not find,Please ensure that the device location function is turned on");
+ options.fail?.(err)
+ options.complete?.(err)
+ return;
+ }
+ // 兜底的逻辑是上次定位的信息
+ Global.lastLocation = locationManager.getLastKnownLocation(providerName)
+ let systemListener = new CustomSystemLocationListener()
+ locationManager.requestLocationUpdates(providerName, 2000, 0.0.toFloat(), systemListener)
+
+
+ // 默认超时6000ms
+ let timeoutMill:number = 6000;
+ /**
+ * 只有设置超出3000ms 才会认为有效
+ * https://uniapp.dcloud.net.cn/api/location/location.html#getlocation
+ */
+ if(options.highAccuracyExpireTime != null && options.highAccuracyExpireTime! >= 3000){
+ timeoutMill = options.highAccuracyExpireTime!
+ }
+
+ let taskId = 0
+ let startTimeMill = (new Date()).getTime()
+ // 不管返回结果如何，延迟2s 返回数据
+ taskId = setInterval(function () {
+ if (Global.lastLocation == null) {
+ // 没有得到想要的位置,统计错误计数+1
+
+ let currentTimeMill = (new Date()).getTime()
+ let diffTimeNum = currentTimeMill - startTimeMill
+
+ if (diffTimeNum > timeoutMill) {
+ locationManager.removeUpdates(systemListener)
+ // 超过6s了，返回错误
+ clearInterval(taskId)
+ let err = new UniError("uni-getLocation-system",-4,"location fail: timeout");
+ options.fail?.(err)
+ options.complete?.(err)
+ }
+ } else {
+ locationManager.removeUpdates(systemListener)
+ clearInterval(taskId)
+ let ret : GetLocationSuccess = {
+ latitude: Global.lastLocation!.getLatitude(),
+ longitude: Global.lastLocation!.getLongitude(),
+ speed: Global.lastLocation!.getSpeed(),
+ accuracy: Global.lastLocation!.getAccuracy(),
+ altitude: Global.lastLocation!.getAltitude(),
+ verticalAccuracy: 0,
+ horizontalAccuracy: Global.lastLocation!.getAccuracy(),
+ address: null
+ }
+ options.success?.(ret)
+ Global.lastLocation = null
+ }
+
+ }, 2000);
+}
diff --git a/uni_modules/uni-getLocation-system/utssdk/app-ios/index.uts b/uni_modules/uni-getLocation-system/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getLocation-system/utssdk/interface.uts b/uni_modules/uni-getLocation-system/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e9b70825dde2f506dd504fa3c35f3404d0ee1b5c
--- /dev/null
+++ b/uni_modules/uni-getLocation-system/utssdk/interface.uts
@@ -0,0 +1,125 @@
+export interface Uni {
+
+ /**
+ * @description 获取当前的地理位置、速度
+ * @param {GetLocation} option
+ * @example
+ * ```typescript
+ * uni.getLocation({
+ * type: 'wgs84',
+ * success: function (res) {
+ * console.log('当前位置的经度：' + res.longitude);
+ * console.log('当前位置的纬度：' + res.latitude);
+ * }
+ * });
+ * ```
+ * @tutorial [](http://uniapp.dcloud.io/api/location/location?id=getlocation)
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ getLocation(options: GetLocationOptions):void;
+
+}
+
+
+
+export type GetLocation = (options: GetLocationOptions) => void;
+export type GetLocationSuccess = {
+ /**
+ * 纬度，浮点数，范围为-90~90，负数表示南纬
+ * @defaultValue 0
+ */
+ latitude: number,
+ /**
+ * 经度，范围为-180~180，负数表示西经
+ * @defaultValue 0
+ */
+ longitude: number,
+ /**
+ * 速度，浮点数，单位m/s
+ * @defaultValue 0
+ */
+ speed: number,
+ /**
+ * 位置的精确度
+ */
+ accuracy: number,
+ /**
+ * 高度，单位 m
+ * @defaultValue 0
+ */
+ altitude: number,
+ /**
+ * 垂直精度，单位 m（Android 无法获取，返回 0）
+ * @defaultValue 0
+ */
+ verticalAccuracy: number,
+ /**
+ * 水平精度，单位 m
+ * @defaultValue 0
+ */
+ horizontalAccuracy: number,
+ /**
+ * 地址信息
+ * @defaultValue null
+ */
+ address: any | null
+};
+type GetLocationSuccessCallback = (result: GetLocationSuccess) => void;
+type GetLocationFailCallback = (result: UniError) => void;
+type GetLocationComplete = any;
+type GetLocationCompleteCallback = (result: GetLocationComplete) => void;
+export type GetLocationOptions = {
+ /**
+ * 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于uni.openLocation的坐标
+ * @defaultValue wgs84
+ */
+ type?: string | null,
+ /**
+ * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
+ * @type boolean
+ * @defaultValue false
+ */
+ altitude?: boolean | null,
+ /**
+ * 传入 true 会解析地址
+ * @type boolean
+ * @defaultValue false
+ */
+ geocode?: boolean | null,
+ /**
+ * 高精度定位超时时间(ms)，指定时间内返回最高精度，该值3000ms以上高精度定位才有效果
+ * @defaultValue 3000
+ */
+ highAccuracyExpireTime?: number | null,
+ /**
+ * 开启高精度定位
+ * @type boolean
+ * @defaultValue false
+ */
+ isHighAccuracy?: boolean | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success?: GetLocationSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail?: GetLocationFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete?: GetLocationCompleteCallback | null
+};
diff --git a/uni_modules/uni-getLocation-tencent/changelog.md b/uni_modules/uni-getLocation-tencent/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e016b093be5a8e8848f780c89f2c6c99017078fd
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/changelog.md
@@ -0,0 +1,4 @@
+## 1.0.1（2023-10-23）
+更新android自定义基座操作步骤
+## 1.0.0（2023-09-11）
+基于腾讯定位服务，实现uni.getLocation 获取定位功能
diff --git a/uni_modules/uni-getLocation-tencent/package.json b/uni_modules/uni-getLocation-tencent/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a9c44bdc549338bebc17d7ee13a2259ecc0e6ed
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/package.json
@@ -0,0 +1,90 @@
+{
+ "id": "uni-getLocation-tencent",
+ "displayName": "uni-getLocation-tencent",
+ "version": "1.0.1",
+ "description": "基于腾讯定位服务，实现uni.getLocation 获取定位功能",
+ "keywords": [
+ "uni-getLocation-tencent"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.8.12"
+ },
+ "dcloudext": {
+ "type": "uts",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "插件使用的 腾讯定位SDK会采集数据，详情可参考：https://lbs.qq.com/",
+ "permissions": "\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "uni-ext-api": {
+ "uni": [
+ "getLocation"
+ ]
+ },
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-android": {
+ "minVersion": "19"
+ },
+ "app-ios": {
+ "minVersion": "9"
+ }
+ },
+ "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-getLocation-tencent/readme.md b/uni_modules/uni-getLocation-tencent/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..87169df0fed3ff45650ae2487e6cac8c75c972bc
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/readme.md
@@ -0,0 +1,44 @@
+# uts-tencentgeolocation腾讯定位插件使用文档
+
+## Android 平台
+
+1. 申请腾讯地图key
+
+[申请网址](https://lbs.qq.com/mobile/androidMapSDK/developerGuide/getKey)
+
+2. 配置key到插件中
+
+修改项目根目录下 AndroidManifest.xml
+``
+
+3. 制作自定义基座运行后生效
+
+## iOS 平台
+
+1.申请腾讯地图key
+
+[申请网址](https://lbs.qq.com/mobile/androidMapSDK/developerGuide/getKey)
+
+2.配置key到插件中
+
+将申请的key配置到插件目录下 app-ios -> info.plist 中 TencentLBSAPIKey 对应的值
+
+```xml
+TencentLBSAPIKey
+您申请的Key
+```
+
+3.配置访问位置权限描述信息
+
+选中工程中的 manifest.json -> App权限配置 -> iOS隐私信息访问的许可描述，分别配置下列权限描述信息
+
+- NSLocationAlwaysUsageDescription
+- NSLocationWhenInUseUsageDescription
+- NSLocationAlwaysAndWhenInUseUsageDescription
+
+4.制作自定义基座运行后生效
+
+## 相关开发文档
+
+- [UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+- [UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
diff --git a/uni_modules/uni-getLocation-tencent/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-getLocation-tencent/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b88fd195d6d32bb34cbe06be73a475659c9f327
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-getLocation-tencent/utssdk/app-android/config.json b/uni_modules/uni-getLocation-tencent/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7f9ab61cde5d32e0947692c782bf94458af5ea1
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/utssdk/app-android/config.json
@@ -0,0 +1,7 @@
+{
+ "dependencies": [
+ "com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.3.0"
+ ],
+ "minSdkVersion": "19"
+}
+
diff --git a/uni_modules/uni-getLocation-tencent/utssdk/app-android/index.uts b/uni_modules/uni-getLocation-tencent/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..df2647730f5f3fdfb152b0acf647f7c73182dba0
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/utssdk/app-android/index.uts
@@ -0,0 +1,204 @@
+import {
+ UTSAndroid
+} from "io.dcloud.uts";
+
+import ActivityCompat from "androidx.core.app.ActivityCompat";
+import Manifest from "android.Manifest";
+import Looper from "android.os.Looper";
+import TencentLocationManager from "com.tencent.map.geolocation.TencentLocationManager";
+import TencentLocationListener from "com.tencent.map.geolocation.TencentLocationListener";
+import TencentLocation from "com.tencent.map.geolocation.TencentLocation";
+import TencentLocationRequest from "com.tencent.map.geolocation.TencentLocationRequest";
+import PackageManager from "android.content.pm.PackageManager";
+import Class from 'java.lang.Class';
+import Exception from 'java.lang.Exception';
+
+import { GetLocation, GetLocationOptions, GetLocationSuccess,GetLocationFail } from "../interface.uts"
+
+
+
+export const getLocation : GetLocation = function (options : GetLocationOptions) {
+
+ if(!checkHasIntegration()){
+ // 当前没有集成腾讯sdk，提示需要打包
+ let ret = new UniError("uni-getLocation-tencent",-10,"需要打自定义基座");
+
+ options.fail?.(ret)
+ options.complete?.(ret)
+ return;
+ }
+ if (!checkLocationConfig()) {
+ let ret = new UniError("uni-getLocation-tencent",-20,"未通过配置预校验，通常是app key 配置错误");
+ options.fail?.(ret)
+ options.complete?.(ret)
+ return;
+ }
+
+ /**
+ * 准备权限
+ */
+ let permissionNeed = ["android.permission.ACCESS_FINE_LOCATION"];
+ UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, permissionNeed, function (allRight:boolean,_grantedList:string[]) {
+ if (allRight) {
+ // 交给目前的location 引擎，真实执行
+ getLocationImpl(options)
+ }
+ }, function (_doNotAskAgain:boolean,_grantedList:string[]) {
+ console.log("用户拒绝了部分权限:")
+ let ret = new UniError("uni-getLocation-tencent",-30,"permission missed.");
+ options.fail?.(ret)
+ options.complete?.(ret)
+ })
+
+
+}
+
+
+/****************************************内部功能实现****************************************************/
+
+
+/**
+ * 定位监听结果包装类
+ */
+class LocationOptionsWapper {
+
+ hostOption : GetLocationOptions;
+
+ constructor(option : GetLocationOptions) {
+ this.hostOption = option
+ }
+
+ onLocationChanged(location : TencentLocation, _error : Int,
+ _reason : string) {
+
+ let ret : GetLocationSuccess = {
+ latitude: location.latitude,
+ longitude: location.longitude,
+ speed: 0,
+ accuracy: location.accuracy,
+ altitude: location.altitude,
+ verticalAccuracy: 0,
+ horizontalAccuracy: location.accuracy,
+ address: location.address
+ }
+
+ this.hostOption.success?.(ret)
+ // 包装数据结构返回
+ }
+
+
+ onStatusUpdate(_name : string, _status : Int, _desc : string) {
+ // 定位状态发生变化
+ }
+};
+
+
+/**
+ * Tencent 定位监听实现类
+ */
+class SingleLocationListener extends TencentLocationListener {
+
+
+ hostOptionWraper : LocationOptionsWapper;
+
+ constructor(option : LocationOptionsWapper) {
+ super();
+ this.hostOptionWraper = option
+ }
+
+ override onLocationChanged(location : TencentLocation, error : Int,
+ reason : string) : void {
+ this.hostOptionWraper.onLocationChanged(location, error, reason);
+ }
+
+ override onStatusUpdate(name : string, status : Int, desc : string) : void {
+ this.hostOptionWraper.onStatusUpdate(name, status, desc);
+ }
+
+}
+/**
+ * 判断当前的基座是否已经集成了sdk, 即是否是自定义基座
+ */
+function checkHasIntegration() : boolean {
+
+ let hasIntegration = true
+ try {
+ let xClass = Class.forName("com.tencent.map.geolocation.TencentLocationListener")
+ } catch (e : Exception) {
+ hasIntegration = false;
+ }
+
+ if (!hasIntegration) {
+ return false;
+ }
+
+ return true
+}
+/**
+ * 检查定位的相关配置是否正确
+ */
+function checkLocationConfig() : boolean {
+
+ let packageName = UTSAndroid.getAppContext()!.getPackageName();
+ let appInfo = UTSAndroid.getAppContext()!.getPackageManager()!.getApplicationInfo(packageName, PackageManager.GET_META_DATA)
+
+ let metaData = appInfo.metaData
+ if (metaData == null) {
+ return false;
+ }
+ let adId = metaData.getString("TencentMapSDK")
+ if (adId == null) {
+ return false;
+ }
+ let splitArray = adId!.split("-")
+ let keyCharNum = splitArray.size
+
+ if (keyCharNum > 5) {
+ // 存在超过5个-，说明是符合规则的appkey
+ return true;
+ }
+ // 不符合校验规则，打回
+ return false;
+}
+
+
+/**
+ * 腾讯地图获取定位信息
+ * 参考文档:https://lbs.qq.com/mobile/androidLocationSDK/androidGeoGuide/androidGeoAdapt
+ */
+function getLocationImpl(locationOptions : GetLocationOptions) {
+
+ if(locationOptions.type != null && locationOptions.type!.toUpperCase() != 'GCJ-02' && locationOptions.type!.toUpperCase() != 'GCJ02'){
+ // 腾讯定位只支持GCJ-02，如果不是则报错
+ let ret = new UniError("uni-getLocation-tencent",-1,"GCJ-02 support only.");
+ locationOptions.fail?.(ret)
+ locationOptions.complete?.(ret)
+ return
+ }
+
+ let mLocationManager = TencentLocationManager.getInstance(UTSAndroid.getAppContext());
+ // 定位监听器封装
+ let locationOptionWrapper = new LocationOptionsWapper(locationOptions);
+ let mLocationListener = new SingleLocationListener(locationOptionWrapper);
+ // 发起单次请求
+ let locationRequest = TencentLocationRequest.create()
+ // 是否需要逆地理编码
+ if (locationOptions.geocode != null && locationOptions.geocode == true) {
+ locationRequest.setRequestLevel(TencentLocationRequest.REQUEST_LEVEL_NAME);
+ } else {
+ locationRequest.setRequestLevel(TencentLocationRequest.REQUEST_LEVEL_GEO);
+ }
+ // 是否开启了高精度
+ if (locationOptions.isHighAccuracy != null && locationOptions.isHighAccuracy == true) {
+ locationRequest.setAllowGPS(true)
+ }
+ /**
+ * 高度信息，腾讯没有明确的api设置
+ */
+ if (locationOptions.altitude != null && locationOptions.altitude == true) {
+ locationRequest.setAllowGPS(true)
+ }
+
+ mLocationManager.requestSingleFreshLocation(locationRequest, mLocationListener, Looper.getMainLooper());
+
+}
diff --git a/uni_modules/uni-getLocation-tencent/utssdk/app-ios/config.json b/uni_modules/uni-getLocation-tencent/utssdk/app-ios/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..721b81e0240705a87ec0761aa9eb6f4e188769cb
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/utssdk/app-ios/config.json
@@ -0,0 +1,3 @@
+{
+ "deploymentTarget": "9"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getLocation-tencent/utssdk/interface.uts b/uni_modules/uni-getLocation-tencent/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..ca1ce9300640c8510da574018aaaa6bf42feb2e8
--- /dev/null
+++ b/uni_modules/uni-getLocation-tencent/utssdk/interface.uts
@@ -0,0 +1,85 @@
+export interface Uni {
+ /**
+ * 获取当前的地理位置、速度
+ *
+ * @tutorial http://uniapp.dcloud.io/api/location/location?id=getlocation
+ */
+ getLocation(options: GetLocationOptions) : void;
+}
+
+export type GetLocation = (options: GetLocationOptions) => void;
+export type GetLocationSuccess = {
+ /**
+ * 纬度，浮点数，范围为-90~90，负数表示南纬
+ */
+ latitude: number,
+ /**
+ * 经度，范围为-180~180，负数表示西经
+ */
+ longitude: number,
+ /**
+ * 速度，浮点数，单位m/s
+ */
+ speed: number,
+ /**
+ * 位置的精确度
+ */
+ accuracy: number,
+ /**
+ * 高度，单位 m
+ */
+ altitude: number,
+ /**
+ * 垂直精度，单位 m（Android 无法获取，返回 0）
+ */
+ verticalAccuracy: number,
+ /**
+ * 水平精度，单位 m
+ */
+ horizontalAccuracy: number,
+ /**
+ * 地址信息
+ */
+ address: any | null
+};
+type GetLocationSuccessCallback = (result: GetLocationSuccess) => void;
+type GetLocationFailCallback = (result: UniError) => void;
+type GetLocationComplete = any;
+type GetLocationCompleteCallback = (result: GetLocationComplete) => void;
+export type GetLocationOptions = {
+ /**
+ * 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于uni.openLocation的坐标
+ */
+ type?: string | null,
+ /**
+ * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
+ * @type boolean
+ */
+ altitude?: boolean | null,
+ /**
+ * 传入 true 会解析地址
+ * @type boolean
+ */
+ geocode?: boolean | null,
+ /**
+ * 高精度定位超时时间(ms)，指定时间内返回最高精度，该值3000ms以上高精度定位才有效果
+ */
+ highAccuracyExpireTime?: number | null,
+ /**
+ * 开启高精度定位
+ * @type boolean
+ */
+ isHighAccuracy?: boolean | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success?: GetLocationSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail?: GetLocationFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete?: GetLocationCompleteCallback | null
+};
diff --git a/uni_modules/uni-getNetworkType/changelog.md b/uni_modules/uni-getNetworkType/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getNetworkType/package.json b/uni_modules/uni-getNetworkType/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..23fe862dee6b9c5e16e5d1843d9c9b5353f17e96
--- /dev/null
+++ b/uni_modules/uni-getNetworkType/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getNetworkType",
+ "displayName": "uni-getNetworkType",
+ "version": "1.0.0",
+ "description": "uni-getNetworkType",
+ "keywords": [
+ "uni-getNetworkType"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getNetworkType": {
+ "name": "getNetworkType",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getNetworkType/readme.md b/uni_modules/uni-getNetworkType/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..b34eae0a5fc6456d3b3250a550fb36454ae321f5
--- /dev/null
+++ b/uni_modules/uni-getNetworkType/readme.md
@@ -0,0 +1,6 @@
+# uni-getNetworkType
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-getNetworkType/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-getNetworkType/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51cd01312ae93069b05bb505eb8564b092f251c3
--- /dev/null
+++ b/uni_modules/uni-getNetworkType/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/uni_modules/uni-getNetworkType/utssdk/app-android/index.uts b/uni_modules/uni-getNetworkType/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5ecde35baad42a8ee9cf5f497f2c5c176d8db32f
--- /dev/null
+++ b/uni_modules/uni-getNetworkType/utssdk/app-android/index.uts
@@ -0,0 +1,102 @@
+import { GetNetworkTypeOptions, GetNetworkType, GetNetworkTypeSuccess } from "../interface.uts";
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import Context from 'android.content.Context';
+import ConnectivityManager from 'android.net.ConnectivityManager';
+import TelephonyManager from 'android.telephony.TelephonyManager';
+import Build from 'android.os.Build';
+
+
+export const getNetworkType : GetNetworkType = function (options : GetNetworkTypeOptions) {
+ const context = UTSAndroid.getUniActivity()!!;
+ const connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager;
+
+ if (connectivityManager != null) {
+ if (Build.VERSION.SDK_INT >= 23) {
+ const permissions = ["android.permission.ACCESS_NETWORK_STATE"];
+ if (!UTSAndroid.checkSystemPermissionGranted(context, permissions)) {
+ const result : GetNetworkTypeSuccess = {
+ networkType: "none"
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ return
+ }
+ }
+ const activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+
+ if (activeNetworkInfo != null) {
+ if (activeNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+ const result : GetNetworkTypeSuccess = {
+ networkType: "wifi"
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ } else if (activeNetworkInfo.getType() == ConnectivityManager.TYPE_MOBILE) {
+ let type = "unknown";
+ const subtype = activeNetworkInfo.getSubtype();
+ switch (subtype) {
+ case TelephonyManager.NETWORK_TYPE_CDMA:
+ case TelephonyManager.NETWORK_TYPE_EDGE:
+ case TelephonyManager.NETWORK_TYPE_GPRS:
+ case 7://电信2g 努比亚
+ type = "2g";
+ break;
+ case TelephonyManager.NETWORK_TYPE_EVDO_0:
+ case TelephonyManager.NETWORK_TYPE_EVDO_A:
+ case 12://level9以上支持 TelephonyManager.NETWORK_TYPE_EVDO_B = 12
+ case 14://电信 努比亚
+ //3G 电信
+ type = "3g";
+ break;
+ case TelephonyManager.NETWORK_TYPE_HSDPA:
+ case TelephonyManager.NETWORK_TYPE_UMTS:
+ //3G 联通
+ type = "3g";
+ break;
+ case 17:
+ case 18:
+ //3G 移动(目前华为系统切换到3g时候为此值)
+ type = "3g";
+ break;
+ case 13: //level11 以上支持TelephonyManager.NETWORK_TYPE_LTE = 13
+ case 11: //level8以上支持TelephonyManager.NETWORK_TYPE_IDEN=11
+ case TelephonyManager.NETWORK_TYPE_HSUPA:
+ case TelephonyManager.NETWORK_TYPE_HSPA:
+ case 15://stype == TelephonyManager.NETWORK_TYPE_HSPAP
+ type = "4g";
+ break;
+ case TelephonyManager.NETWORK_TYPE_NR: {
+ type = "5g";
+ break;
+ }
+ default://对于case之外的反馈到js，js层收集之后回馈5+进行填补完善
+ type = "" + subtype;
+ break;
+ }
+ const result : GetNetworkTypeSuccess = {
+ networkType: type
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ } else {
+ const result : GetNetworkTypeSuccess = {
+ networkType: "unknown"
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ }
+ }else{
+ const result : GetNetworkTypeSuccess = {
+ networkType: "none"
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ }
+ } else {
+ const result : GetNetworkTypeSuccess = {
+ networkType: "none"
+ }
+ options?.success?.(result);
+ options?.complete?.(result);
+ }
+};
\ No newline at end of file
diff --git a/uni_modules/uni-getNetworkType/utssdk/app-ios/index.uts b/uni_modules/uni-getNetworkType/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getNetworkType/utssdk/interface.uts b/uni_modules/uni-getNetworkType/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5b3fbe1db0ad2e138719433cc34b9df5bd1ce9d0
--- /dev/null
+++ b/uni_modules/uni-getNetworkType/utssdk/interface.uts
@@ -0,0 +1,63 @@
+export interface Uni {
+ /**
+ * getNetworkType()
+ * @description
+ * 获取网络类型
+ * @param {GetNetworkTypeOptions} options
+ * @return {void}
+ * @tutorial http://uniapp.dcloud.io/api/system/network?id=getnetworktype
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getNetworkType({
+ success(res){
+ console.log(res);
+ }
+ });
+ ```
+ */
+ getNetworkType(options: GetNetworkTypeOptions): void;
+}
+
+export type GetNetworkType = (options: GetNetworkTypeOptions) => void;
+export type GetNetworkTypeSuccess = {
+ /**
+ * 网络类型
+ */
+ networkType: string
+};
+export type GetNetworkTypeSuccessCallback = (result: GetNetworkTypeSuccess) => void;
+export type GetNetworkTypeFail = UniError;
+export type GetNetworkTypeFailCallback = (result: GetNetworkTypeFail) => void;
+export type GetNetworkTypeComplete = any;
+export type GetNetworkTypeCompleteCallback = (result: GetNetworkTypeComplete) => void;
+export type GetNetworkTypeOptions = {
+ /**
+ * 接口调用成功的回调函数
+ * @defaultValue null
+ */
+ success?: GetNetworkTypeSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ * @defaultValue null
+ */
+ fail?: GetNetworkTypeFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete?: GetNetworkTypeCompleteCallback | null
+};
diff --git a/uni_modules/uni-getSystemInfo/changelog.md b/uni_modules/uni-getSystemInfo/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getSystemInfo/package.json b/uni_modules/uni-getSystemInfo/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a56778c2aead29c1730806451efbbd0db080878
--- /dev/null
+++ b/uni_modules/uni-getSystemInfo/package.json
@@ -0,0 +1,109 @@
+{
+ "id": "uni-getSystemInfo",
+ "displayName": "uni-getSystemInfo",
+ "version": "1.0.0",
+ "description": "uni-getSystemInfo",
+ "keywords": [
+ "uni-getSystemInfo"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getSystemInfo": {
+ "name": "getSystemInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "getSystemInfoSync":{
+ "name": "getSystemInfoSync",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "getWindowInfo":{
+ "name": "getWindowInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemInfo/readme.md b/uni_modules/uni-getSystemInfo/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..0c4f58dc70b8f0e8a1cf670fd7b3554dab89b6b4
--- /dev/null
+++ b/uni_modules/uni-getSystemInfo/readme.md
@@ -0,0 +1,6 @@
+# uni-getSystemInfo
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemInfo/utssdk/app-android/device/SystemInfoDeviceUtil.uts b/uni_modules/uni-getSystemInfo/utssdk/app-android/device/SystemInfoDeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..6c4bc47645ae95bf5dcf77224719ac8520de67fc
--- /dev/null
+++ b/uni_modules/uni-getSystemInfo/utssdk/app-android/device/SystemInfoDeviceUtil.uts
@@ -0,0 +1,330 @@
+import Activity from 'android.app.Activity';
+import Configuration from 'android.content.res.Configuration';
+import Context from 'android.content.Context';
+import UiModeManager from 'android.app.UiModeManager';
+import WindowManager from 'android.view.WindowManager';
+import DisplayMetrics from 'android.util.DisplayMetrics';
+import Build from 'android.os.Build';
+import File from 'java.io.File';
+
+import TextUtils from 'android.text.TextUtils';
+
+import { UTSAndroid as Device } from "io.dcloud.uts";
+import BufferedReader from 'java.io.BufferedReader';
+import InputStreamReader from 'java.io.InputStreamReader';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+
+
+export class DeviceUtil {
+
+ private static customOS : string | null = null
+ private static customOSVersion : string | null = null
+
+ private static readonly rootRelatedDirs = [
+ "/su", "/su/bin/su", "/sbin/su",
+ "/data/local/xbin/su", "/data/local/bin/su", "/data/local/su",
+ "/system/xbin/su",
+ "/system/bin/su", "/system/sd/xbin/su", "/system/bin/failsafe/su",
+ "/system/bin/cufsdosck", "/system/xbin/cufsdosck", "/system/bin/cufsmgr",
+ "/system/xbin/cufsmgr", "/system/bin/cufaevdd", "/system/xbin/cufaevdd",
+ "/system/bin/conbb", "/system/xbin/conbb"];
+
+
+ /**
+ * HarmonyOS 系统输出的
+ * 格式：2.0.0
+ */
+ private static KEY_HARMONYOS_VERSION_NAME = "hw_sc.build.platform.version";
+
+ /**
+ * EMUI系统输出的
+ * 格式：EmotionUI_8.0.0
+ */
+ private static KEY_EMUI_VERSION_NAME = "ro.build.version.emui";
+
+ /**
+ * MagicUI系统输出的
+ * 格式：3.1.0
+ */
+ private static KEY_MAGICUI_VERSION = "ro.build.version.magic";
+
+ /**
+ * MIUI系统输出的
+ * 格式：V12
+ */
+ private static KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
+
+ /**
+ * OPPO手机ColorOS系统输出的
+ * 格式：9
+ */
+ private static KEY_COLOROS_VERSION_NAME = "ro.build.version.opporom";
+
+ /**
+ * VIVO手机系统输出的
+ * name格式：funtouch
+ * version格式： 9
+ */
+ private static KEY_VIVO_VERSION_NAME = "ro.vivo.os.name";
+ private static KEY_VIVO_VERSION = "ro.vivo.os.version";
+
+ /**
+ * OonPlus手机系统输出的
+ * 格式：Hydrogen OS 11.0.7.10.KB05
+ */
+ private static KEY_ONEPLUS_VERSION_NAME = "ro.rom.version";
+
+ /**
+ * 魅族手机系统输出的
+ */
+ private static KEY_FLYME_VERSION_NAME = "ro.build.display.id";
+
+ /**
+ * nubia手机系统输出的
+ */
+ private static KEY_NUBIA_VERSION_NAME = "ro.build.nubia.rom.name";
+ private static KEY_NUBIA_VERSION_CODE = "ro.build.nubia.rom.code";
+
+
+
+ public static getOrientation(activity : Activity) : string {
+ const activityOrientation = activity.getResources().getConfiguration().orientation;
+ let outOrientation = "portrait";
+ if (activityOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+ outOrientation = "landscape";
+ }
+ return outOrientation;
+ }
+
+ public static getAppVersionCode():number{
+ const activity = UTSAndroid.getUniActivity()!!;
+ const packageInfo = activity.getPackageManager().getPackageInfo(activity.getPackageName(), 0);
+ return packageInfo.versionCode;
+ }
+
+ /**
+ * 获取屏幕像素比
+ */
+ public static getScaledDensity(activity : Activity) : number {
+ const windowManager = activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager;
+ const displayMetrics = new DisplayMetrics();
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ windowManager.getDefaultDisplay().getRealMetrics(displayMetrics);
+ } else {
+ windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+ }
+ return displayMetrics.scaledDensity;
+ }
+
+ public static getScreenWidth() : number {
+ return UTSAndroid.getScreenInfo()["screenWidth"] as Int;
+ }
+
+ public static getScreenHeight() : number {
+ return UTSAndroid.getScreenInfo()["screenHeight"] as Int;
+ }
+
+ public static getStatusBarHeight():number {
+ return UTSAndroid.getStatusBarHeight();
+ }
+
+ public static getRomName():string{
+ DeviceUtil.setCustomInfo(Build.MANUFACTURER);
+ return DeviceUtil.customOS ?? "";
+ }
+ public static getRomVersion():string{
+ DeviceUtil.setCustomInfo(Build.MANUFACTURER);
+ return DeviceUtil.customOSVersion ?? "";
+ }
+
+ public static getSystemUIModeType(activity : Activity) : string {
+
+ let uiModeManager = activity.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager;
+ let modeType = "unknown";
+
+ switch (uiModeManager.getCurrentModeType()) {
+ case Configuration.UI_MODE_TYPE_TELEVISION:
+ modeType = "tv";
+ break;
+ case Configuration.UI_MODE_TYPE_WATCH:
+ modeType = "watch";
+ break;
+ case Configuration.UI_MODE_TYPE_NORMAL:
+ if (DeviceUtil.isTablet(activity)) {
+ modeType = "pad";
+ } else {
+ modeType = "phone";
+ }
+ break;
+ case Configuration.UI_MODE_TYPE_DESK:
+ modeType = "pc";
+ break;
+ case Configuration.UI_MODE_TYPE_UNDEFINED:
+ modeType = "undefined";
+ break;
+ case Configuration.UI_MODE_TYPE_CAR:
+ modeType = "car";
+ break;
+ case Configuration.UI_MODE_TYPE_VR_HEADSET:
+ modeType = "vr";
+ break;
+ case Configuration.UI_MODE_TYPE_APPLIANCE:
+ modeType = "appliance";
+ break;
+ }
+
+ return modeType;
+ }
+
+
+ public static getOsLanguageNormal(context : Context) : string {
+ const LOCALE_ZH_HANS = 'zh-Hans'
+ const LOCALE_ZH_HANT = 'zh-Hant'
+ let locale = Device.getLanguageInfo(context)["appLanguage"].toString();
+ if (locale.indexOf('zh') === 0) {
+ if (locale.indexOf('-hans') > -1) {
+ return LOCALE_ZH_HANS;
+ }
+ if (locale.indexOf('-hant') > -1) {
+ return LOCALE_ZH_HANT;
+ }
+ if (locale.includes("-tw") || locale.includes("-hk") || locale.includes("-mo") || locale.includes("-cht")) {
+ return LOCALE_ZH_HANT;
+ }
+
+ return LOCALE_ZH_HANS;
+ } else {
+ return locale;
+ }
+ }
+
+ /**
+ * 是否为平板 不是太准确
+ */
+ public static isTablet(activity : Activity) : boolean {
+ return (activity.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+ }
+
+
+
+ private static setCustomInfo(phoneBrand : string) {
+ try {
+ switch (DeviceUtil.deleteSpaceAndToUpperCase(phoneBrand)) {
+ case "HUAWEI":
+ if (DeviceUtil.isHarmonyOS()) {
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME);
+ DeviceUtil.customOS = "HarmonyOS";
+ } else {
+ DeviceUtil.customOS = "EMUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_EMUI_VERSION_NAME);;
+ }
+ break;
+ case "HONOR":
+ if (DeviceUtil.isHarmonyOS()) {
+ DeviceUtil.customOS = "HarmonyOS";
+ if (!TextUtils.isEmpty(DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME))) {
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_HARMONYOS_VERSION_NAME);;
+ } else {
+ DeviceUtil.customOSVersion = "";
+ }
+ } else if (!TextUtils.isEmpty(DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MAGICUI_VERSION))) {
+ DeviceUtil.customOS = "MagicUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MAGICUI_VERSION);
+ } else {
+ //格式：EmotionUI_8.0.0
+ DeviceUtil.customOS = "EMUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_EMUI_VERSION_NAME);
+ }
+ break;
+ case "XIAOMI":
+ case "REDMI":
+ //格式：MIUIV12
+ DeviceUtil.customOS = "MIUI";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_MIUI_VERSION_NAME);
+ break;
+ case "REALME":
+ case "OPPO":
+ //格式：ColorOSV2.1
+ DeviceUtil.customOS = "ColorOS";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_COLOROS_VERSION_NAME);
+ break;
+ case "VIVO":
+ //格式：Funtouch9
+ DeviceUtil.customOS = "Funtouch";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_VIVO_VERSION);
+ break;
+ case "ONEPLUS":
+ //格式：Hydrogen OS 11.0.7.10.KB05
+ DeviceUtil.customOS = "HydrogenOS";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_ONEPLUS_VERSION_NAME);
+ break;
+ case "MEIZU":
+ //格式:Flyme 6.3.5.1G
+ DeviceUtil.customOS = "Flyme";
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_FLYME_VERSION_NAME);
+ break;
+ case "NUBIA":
+ //格式:nubiaUIV3.0
+ DeviceUtil.customOS = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_NUBIA_VERSION_NAME);
+ DeviceUtil.customOSVersion = DeviceUtil.getSystemPropertyValue(DeviceUtil.KEY_NUBIA_VERSION_CODE);
+ break;
+ default:
+ DeviceUtil.customOS = "Android";
+ DeviceUtil.customOSVersion = Build.VERSION.RELEASE;
+ break;
+ }
+ } catch (e : Exception) {
+ }
+ }
+
+
+
+ /**
+ * 判断是否是华为鸿蒙系统，能否识别荣耀鸿蒙未知
+ *
+ * @return
+ */
+ private static isHarmonyOS() : boolean {
+ try {
+ let classType = Class.forName("com.huawei.system.BuildEx");
+ let getMethod = classType.getMethod("getOsBrand");
+ let value = getMethod.invoke(classType) as string;
+ return !TextUtils.isEmpty(value);
+ } catch (e : Exception) {
+ return false;
+ }
+ }
+
+
+
+
+
+
+ /**
+ * 删除字符串中的空格并全部转成大写
+ * @param str
+ * @return
+ */
+ public static deleteSpaceAndToUpperCase(str : string | null) : string {
+ if (TextUtils.isEmpty(str)) {
+ return "";
+ }
+ return str!.replace(" ", "").toUpperCase();
+ }
+
+ private static getSystemPropertyValue(propName : string) : string | null {
+ let value : string | null = null;
+ let roSecureObj : any | null;
+ try {
+ // Class.forName("java.lang.String")
+ const method = Class.forName("android.os.SystemProperties").getMethod("get", Class.forName("java.lang.String"));
+ roSecureObj = method.invoke(null, propName);
+ if (roSecureObj != null) {
+ value = roSecureObj as string;
+ }
+ } catch (e : Exception) {
+ }
+ return value;
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts b/uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..9ad2c57bc39f06d40bafa8968b3d5796b6a26760
--- /dev/null
+++ b/uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts
@@ -0,0 +1,249 @@
+import { GetSystemInfoOptions, GetSystemInfo, GetSystemInfoResult, SafeArea, SafeAreaInsets, GetSystemInfoSync, GetWindowInfo, GetWindowInfoResult } from "../interface.uts";
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import PackageManager from 'android.content.pm.PackageManager';
+import Build from 'android.os.Build';
+import { DeviceUtil } from './device/SystemInfoDeviceUtil.uts'
+import CountDownLatch from 'java.util.concurrent.CountDownLatch';
+import Looper from 'android.os.Looper';
+import Handler from 'android.os.Handler';
+
+export const getSystemInfo : GetSystemInfo = function (options : GetSystemInfoOptions) {
+ const result = getSystemInfoSync();
+ const success = options.success;
+ const complete = options.complete;
+ success?.(result);
+ complete?.(result);
+}
+
+
+export const getSystemInfoSync : GetSystemInfoSync = function () : GetSystemInfoResult {
+ const runnable = function(): GetSystemInfoResult | null{
+ try {
+ const activity = UTSAndroid.getUniActivity()!!;
+
+ const appId = UTSAndroid.getAppId();
+ const appLanguage = DeviceUtil.getOsLanguageNormal(activity);
+ const appName = UTSAndroid.getAppName();
+ const appVersion = UTSAndroid.getAppVersion()["name"].toString();
+ const appVersionCode = UTSAndroid.getAppVersion()["code"].toString();
+ const appWgtVersion = !UTSAndroid.isUniAppX()? UTSAndroid.getAppVersion()["name"].toString() : null;
+ const brand = Build.MANUFACTURER.toLowerCase();
+ const browserName = UTSAndroid.getWebViewInfo(activity)["kernel"].toString();
+ const browserVersion = UTSAndroid.getWebViewInfo(activity)["version"].toString();
+ const deviceId = UTSAndroid.getDeviceID(activity);
+ const deviceModel = Build.MODEL;
+ const deviceType = DeviceUtil.getSystemUIModeType(activity);
+ const devicePixelRatio = DeviceUtil.getScaledDensity(activity);
+ const deviceOrientation = DeviceUtil.getOrientation(activity);
+ const language = UTSAndroid.getLanguageInfo(activity)["osLanguage"].toString();
+ const osName = "android";
+ const osVersion = Build.VERSION.RELEASE;
+ const osLanguage = UTSAndroid.getLanguageInfo(activity)["osLanguage"].toString();
+ const osTheme = UTSAndroid.getOsTheme();
+ const pixelRatio = DeviceUtil.getScaledDensity(activity)
+ const screenWidth = DeviceUtil.getScreenWidth();
+ const screenHeight = DeviceUtil.getScreenHeight();
+ const statusBarHeight = DeviceUtil.getStatusBarHeight();
+ const system = "Android " + Build.VERSION.RELEASE;
+ const ua = UTSAndroid.getWebViewInfo(activity)["ua"].toString();
+ const uniCompileVersion = UTSAndroid.getUniCompileVersion();
+ const uniPlatform = "app";
+ const uniRuntimeVersion = UTSAndroid.getUniRuntimeVersion();
+ const uniCompileVersionCode = convertVersionCode(uniCompileVersion);
+ const uniRuntimeVersionCode = convertVersionCode(uniRuntimeVersion);
+ const version = UTSAndroid.getInnerVersion();
+ const romName = DeviceUtil.getRomName();
+ const romVersion = DeviceUtil.getRomVersion();
+ const windowWidth = screenWidth;
+ const windowHeight = UTSAndroid.getWindowHeight();
+ const windowTop = 0;
+ const windowBottom = 0;
+ const safeAreaInsetsTop = UTSAndroid.getSafeAreaInsets()["top"].toString().toInt();
+ const safeAreaInsets : SafeAreaInsets = {
+ left: 0,
+ top: safeAreaInsetsTop,
+ right: 0,
+ bottom: 0
+ }
+
+ const safeArea : SafeArea = {
+ left: safeAreaInsets.left,
+ right: windowWidth - safeAreaInsets.right,
+ top: safeAreaInsets.top,
+ bottom: windowHeight - safeAreaInsets.bottom,
+ width: windowWidth - safeAreaInsets.left - safeAreaInsets.right,
+ height: windowHeight - safeAreaInsets.top - safeAreaInsets.bottom
+ }
+ const osAndroidAPILevel = Build.VERSION.SDK_INT;
+ const oaid = UTSAndroid.getOAID();
+
+ const result = {
+ SDKVersion: "",
+ appId: appId,
+ appLanguage: appLanguage,
+ appName: appName,
+ appVersion: appVersion,
+ appVersionCode: appVersionCode,
+ appWgtVersion: appWgtVersion,
+ brand: brand,
+ browserName: browserName,
+ browserVersion: browserVersion,
+ deviceId: deviceId,
+ deviceBrand: brand,
+ deviceModel: deviceModel,
+ deviceType: deviceType,
+ devicePixelRatio: devicePixelRatio,
+ deviceOrientation: deviceOrientation,
+ language: language,
+ model: deviceModel,
+ osName: osName,
+ osVersion: osVersion,
+ osLanguage: osLanguage,
+ osTheme: osTheme,
+ pixelRatio: pixelRatio,
+ platform: osName,
+ screenWidth: screenWidth,
+ screenHeight: screenHeight,
+ statusBarHeight: statusBarHeight,
+ system: system,
+ ua: ua,
+ uniCompileVersion: uniCompileVersion,
+ uniPlatform: uniPlatform,
+ uniRuntimeVersion: uniRuntimeVersion,
+ uniCompileVersionCode: uniCompileVersionCode,
+ uniRuntimeVersionCode: uniRuntimeVersionCode,
+ version: version,
+ romName: romName,
+ romVersion: romVersion,
+ windowWidth: windowWidth,
+ windowHeight: windowHeight,
+ windowTop: windowTop,
+ windowBottom: windowBottom,
+ safeAreaInsets: safeAreaInsets,
+ safeArea: safeArea,
+ oaid: oaid,
+ osAndroidAPILevel: osAndroidAPILevel,
+ } as GetSystemInfoResult;
+ return result;
+ } catch (e : Exception) {
+ return null;
+ }
+ }
+
+ let result : GetSystemInfoResult | null = null;
+ if(Looper.myLooper() == Looper.getMainLooper()){
+ result = runnable();
+ }else{
+ const latch = new CountDownLatch(1);
+ new RunnableTask(Looper.getMainLooper(), () => {
+ result = runnable();
+ latch.countDown();
+ }).execute();
+ latch.await();
+ }
+
+ return result!!;
+};
+
+
+export const getWindowInfo: GetWindowInfo = function(): GetWindowInfoResult {
+ const activity = UTSAndroid.getUniActivity()!!;
+ const pixelRatio = DeviceUtil.getScaledDensity(activity)
+ const screenWidth = DeviceUtil.getScreenWidth();
+ const screenHeight = DeviceUtil.getScreenHeight();
+ const statusBarHeight = DeviceUtil.getStatusBarHeight();
+ const windowWidth = screenWidth;
+ const windowHeight = UTSAndroid.getWindowHeight();
+ const windowTop = 0;
+ const windowBottom = 0;
+ const safeAreaInsetsTop = UTSAndroid.getSafeAreaInsets()["top"] as Int;
+ const safeAreaInsets : SafeAreaInsets = {
+ left: 0,
+ top: safeAreaInsetsTop,
+ right: 0,
+ bottom: 0
+ }
+ const safeArea : SafeArea = {
+ left: safeAreaInsets.left,
+ right: windowWidth - safeAreaInsets.right,
+ top: safeAreaInsets.top,
+ bottom: windowHeight - safeAreaInsets.bottom,
+ width: windowWidth - safeAreaInsets.left - safeAreaInsets.right,
+ height: windowHeight - safeAreaInsets.top - safeAreaInsets.bottom
+ }
+ const screenTop = windowTop;
+
+ let result = {
+ pixelRatio: pixelRatio,
+ screenWidth: screenWidth,
+ screenHeight: screenHeight,
+ windowWidth: windowWidth,
+ windowHeight: windowHeight,
+ statusBarHeight: statusBarHeight,
+ windowTop: windowTop,
+ windowBottom: windowBottom,
+ safeArea: safeArea,
+ safeAreaInsets: safeAreaInsets,
+ screenTop: screenTop
+ } as GetWindowInfoResult;
+ return result;
+};
+
+const convertVersionCode = function(version: string): number {
+ let str = "";
+ let radixLength = 2;
+ let findDot = false;
+ const dotChar = ".".get(0);
+ for (let i = 0; i < version.length; i++) {
+ const char = version.get(i);
+ if(findDot){
+ if(char.isDigit()){
+ str += char;
+ }
+ radixLength --;
+ if(radixLength == 0){
+ break;
+ }
+ }else{
+ if(char.isDigit()){
+ str += char;
+ }else{
+ if(char == dotChar){
+ findDot = true;
+ str += char;
+ }
+ }
+ }
+ }
+
+ return parseFloat(str);
+}
+
+const getHostVersion = function () : string {
+ const context = UTSAndroid.getAppContext()!!;
+ let packageManager = context.getPackageManager();
+ let applicationInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+ return applicationInfo.versionName;
+}
+
+class RunnableTask extends Runnable {
+ private callback : () => void | null;
+ private looper : Looper | null = null;
+ constructor(looper : Looper | null, callback : () => void) {
+ super();
+ this.looper = looper;
+ this.callback = callback
+ }
+
+ override run() {
+ this.callback?.()
+ }
+
+ public execute() {
+ if (this.looper == null) {
+ this.run();
+ } else {
+ new Handler(this.looper!!).post(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemInfo/utssdk/app-ios/index.uts b/uni_modules/uni-getSystemInfo/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getSystemInfo/utssdk/interface.uts b/uni_modules/uni-getSystemInfo/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..2ec4dba25098ad8699e96e46d03a767f2bdb1395
--- /dev/null
+++ b/uni_modules/uni-getSystemInfo/utssdk/interface.uts
@@ -0,0 +1,455 @@
+export interface Uni {
+ /**
+ * getSystemInfo()
+ * @description
+ * 异步获取系统信息
+ * @param {GetSystemInfoOptions} options
+ * @return {void}
+ * @tutorial http://uniapp.dcloud.io/api/system/info?id=getsysteminfo
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getSystemInfo({
+ success(e) {
+ console.log("success :",e);
+ },
+ complete(e) {
+ console.log("complete :",e);
+ }
+ })
+ ```
+ */
+ getSystemInfo(options: GetSystemInfoOptions): void;
+
+ /**
+ * getSystemInfoSync()
+ * @description
+ * 同步获取系统信息
+ * @param {void}
+ * @return {GetSystemInfoResult}
+ * @tutorial http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getSystemInfoSync()
+ ```
+ */
+ getSystemInfoSync(): GetSystemInfoResult;
+
+ /**
+ * getWindowInfo()
+ * @description
+ * 同步获取窗口信息
+ * @param {void}
+ * @return {GetWindowInfoResult} result
+ * @tutorial http://uniapp.dcloud.io/api/system/getWindowInfo.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getWindowInfo()
+ ```
+ */
+ getWindowInfo(): GetWindowInfoResult;
+}
+
+export type GetSystemInfo = (options: GetSystemInfoOptions) => void;
+export type GetSystemInfoSync = () => GetSystemInfoResult;
+export type GetWindowInfo = () => GetWindowInfoResult;
+export type SafeArea = {
+ /**
+ * 安全区域左上角横坐标
+ */
+ left: number,
+ /**
+ * 安全区域右下角横坐标
+ */
+ right: number,
+ /**
+ * 安全区域左上角纵坐标
+ */
+ top: number,
+ /**
+ * 安全区域右下角纵坐标
+ */
+ bottom: number,
+ /**
+ * 安全区域的宽度，单位逻辑像素
+ */
+ width: number,
+ /**
+ * 安全区域的高度，单位逻辑像素
+ */
+ height: number
+};
+export type SafeAreaInsets = {
+ /**
+ * 安全区域左侧插入位置
+ */
+ left: number,
+ /**
+ * 安全区域右侧插入位置
+ */
+ right: number,
+ /**
+ * 安全区顶部插入位置
+ */
+ top: number,
+ /**
+ * 安全区域底部插入位置
+ */
+ bottom: number
+};
+export type GetSystemInfoResult = {
+ /**
+ * 客户端基础库版本
+ */
+ SDKVersion: string,
+ /**
+ * `manifest.json` 中应用appid。
+ */
+ appId: string,
+ /**
+ * 应用设置的语言。
+ */
+ appLanguage: string,
+ /**
+ * `manifest.json` 中应用名称。
+ */
+ appName: string,
+ /**
+ * `manifest.json` 中应用版本名称。
+ */
+ appVersion: string,
+ /**
+ * `manifest.json` 中应用版本名号。
+ */
+ appVersionCode: string,
+ /**
+ * 应用资源（wgt）的版本名称。
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ appWgtVersion: string | null,
+ /**
+ * 手机品牌。
+ */
+ brand: string,
+ /**
+ * 浏览器名称。`App` 端是系统 webview 的名字，比如 wkwebview、chrome。小程序端为空
+ */
+ browserName: string,
+ /**
+ * 浏览器版本、webview 版本。
+ */
+ browserVersion: string,
+ /**
+ * 设备 ID
+ */
+ deviceId: string,
+ /**
+ * 设备品牌。如：`apple`、`huawei`。
+ */
+ deviceBrand: string,
+ /**
+ * 设备型号
+ */
+ deviceModel: string,
+ /**
+ * 设备类型。`phone`、`pad`、`pc`
+ */
+ deviceType: string,
+ /**
+ * 设备像素比
+ */
+ devicePixelRatio: number,
+ /**
+ * 设备方向。如：`竖屏 portrait`、`横屏 landscape`
+ * - portrait: 竖屏
+ * - landscape: 横屏
+ * @type 'portrait' | 'landscape'
+ */
+ deviceOrientation: string,
+ /**
+ * 程序设置的语言
+ */
+ language: string,
+ /**
+ * 手机型号
+ */
+ model: string,
+ /**
+ * ios、android、windows、mac、linux
+ */
+ osName: string,
+ /**
+ * 操作系统版本。如 ios 版本，andriod 版本
+ */
+ osVersion: string,
+ /**
+ * 操作系统语言
+ */
+ osLanguage: string,
+ /**
+ * 操作系统主题 light、dark。
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ osTheme: string | null,
+ /**
+ * 设备像素比
+ */
+ pixelRatio: number,
+ /**
+ * 客户端平台
+ */
+ platform: string,
+ /**
+ * 屏幕宽度
+ */
+ screenWidth: number,
+ /**
+ * 屏幕高度
+ */
+ screenHeight: number,
+ /**
+ * 状态栏的高度
+ */
+ statusBarHeight: number,
+ /**
+ * 操作系统版本
+ */
+ system: string,
+ /**
+ * 在竖屏正方向下的安全区域
+ */
+ safeArea: SafeArea,
+ /**
+ * 在竖屏正方向下的安全区域插入位置
+ */
+ safeAreaInsets: SafeAreaInsets,
+ /**
+ * 用户标识。小程序端为空
+ */
+ ua: string,
+ /**
+ * uni 编译器版本
+ */
+ uniCompileVersion: string,
+ /**
+ * uni-app 运行平台。如：`app`、`mp-weixin`、`web`
+ */
+ uniPlatform: string,
+ /**
+ * uni 运行时版本
+ */
+ uniRuntimeVersion: string,
+ /**
+ * uni 编译器版本号
+ */
+ uniCompileVersionCode: number,
+ /**
+ * uni 运行时版本号
+ */
+ uniRuntimeVersionCode: number,
+ /**
+ * 引擎版本号。已废弃，仅为了向下兼容保留
+ * @deprecated 已废弃，仅为了向下兼容保留
+ */
+ version: string,
+ /**
+ * rom 名称。Android 部分机型获取不到值。iOS 恒为 `ios`
+ */
+ romName: string,
+ /**
+ * rom 版本号。Android 部分机型获取不到值。iOS 恒为 `ios 版本号`
+ */
+ romVersion: string,
+ /**
+ * 可使用窗口宽度
+ */
+ windowWidth: number,
+ /**
+ * 可使用窗口高度
+ */
+ windowHeight: number,
+ /**
+ * 可使用窗口的顶部位置
+ */
+ windowTop: number,
+ /**
+ * 可使用窗口的底部位置
+ */
+ windowBottom: number,
+ /**
+ * oaid
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "√"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ oaid: string | null
+ /**
+ * Android 系统API库的版本。
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "√"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ osAndroidAPILevel: number | null
+};
+export type GetSystemInfoSuccessCallback = (result: GetSystemInfoResult) => void;
+type GetSystemInfoFail = UniError;
+type GetSystemInfoFailCallback = (result: GetSystemInfoFail) => void;
+export type GetSystemInfoComplete = any;
+export type GetSystemInfoCompleteCallback = (result: GetSystemInfoComplete) => void;
+export type GetSystemInfoOptions = {
+ /**
+ * 接口调用成功的回调函数
+ * @defaultValue null
+ */
+ success?: GetSystemInfoSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ * @defaultValue null
+ */
+ fail?: GetSystemInfoFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete?: GetSystemInfoCompleteCallback | null
+};
+
+export type GetWindowInfoResult = {
+ /**
+ * 设备像素比
+ */
+ pixelRatio: number,
+ /**
+ * 屏幕宽度
+ */
+ screenWidth: number,
+ /**
+ * 屏幕高度
+ */
+ screenHeight: number,
+ /**
+ * 可使用窗口宽度
+ */
+ windowWidth: number,
+ /**
+ * 可使用窗口高度
+ */
+ windowHeight: number,
+ /**
+ * 状态栏的高度
+ */
+ statusBarHeight: number,
+ /**
+ * 可使用窗口的顶部位置
+ */
+ windowTop: number,
+ /**
+ * 可使用窗口的底部位置
+ */
+ windowBottom: number,
+ /**
+ * 在竖屏正方向下的安全区域
+ */
+ safeArea: SafeArea,
+ /**
+ * 在竖屏正方向下的安全区域插入位置
+ */
+ safeAreaInsets: SafeAreaInsets,
+ /**
+ * 窗口上边缘的 y 值
+ */
+ screenTop: number
+};
diff --git a/uni_modules/uni-getSystemSetting/changelog.md b/uni_modules/uni-getSystemSetting/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-getSystemSetting/package.json b/uni_modules/uni-getSystemSetting/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..855c47a9c4a161c09acac5626b0899e9f28c422c
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-getSystemSetting",
+ "displayName": "uni-getSystemSetting",
+ "version": "1.0.0",
+ "description": "uni-getSystemSetting",
+ "keywords": [
+ "uni-getSystemSetting"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "getSystemSetting": {
+ "name": "getSystemSetting",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemSetting/readme.md b/uni_modules/uni-getSystemSetting/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..19608ef97259bb800e47c2a1b2c1157e4279cc55
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/readme.md
@@ -0,0 +1,5 @@
+# uni-getSystemSetting
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts/-/tree/dev)
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemSetting/utssdk/app-android/device/DeviceUtil.uts b/uni_modules/uni-getSystemSetting/utssdk/app-android/device/DeviceUtil.uts
new file mode 100644
index 0000000000000000000000000000000000000000..eea7ee8bb3fcc6af87106c32c3070e3856a63bc3
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/utssdk/app-android/device/DeviceUtil.uts
@@ -0,0 +1,60 @@
+import WifiManager from 'android.net.wifi.WifiManager';
+import Configuration from 'android.content.res.Configuration';
+import Context from 'android.content.Context';
+import LocationManager from 'android.location.LocationManager';
+import BluetoothManager from 'android.bluetooth.BluetoothManager';
+import PackageManager from 'android.content.pm.PackageManager';
+import Manifest from 'android.Manifest';
+import Build from 'android.os.Build';
+import Settings from 'android.provider.Settings';
+export class DeviceUtil{
+ /**
+ * 设备蓝牙是否开启
+ * @param context .
+ * @return .
+ * @throws Exception 如果没开启蓝牙权限就有异常
+ */
+ public static blueToothEnable(context: Context): boolean {
+ if (Build.VERSION.SDK_INT >= 23 && context.checkSelfPermission(Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_DENIED) {
+ throw new Exception();
+ }
+ let bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager;
+ let defaultAdapter = bluetoothManager.getAdapter();
+ return defaultAdapter.isEnabled();
+ }
+
+
+
+ public static locationEnable(context: Context): boolean {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P){
+ let locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager;
+ if (locationManager == null) {
+ return false;
+ }
+ return locationManager.isLocationEnabled();
+ }else{
+ const mode = Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE,
+ Settings.Secure.LOCATION_MODE_OFF);
+ return (mode != Settings.Secure.LOCATION_MODE_OFF);
+ }
+ }
+
+ public static wifiEnable(context: Context): boolean {
+ let wifiManager = context.getApplicationContext().getSystemService(Context.WIFI_SERVICE) as WifiManager;
+ let wifiState = wifiManager.getWifiState();
+ return wifiState == WifiManager.WIFI_STATE_ENABLED;
+ }
+
+
+ public static deviceOrientation(context: Context): string {
+ let configuration = context.getResources().getConfiguration();
+ let orientation = configuration.orientation;
+
+ if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+ return "portrait";
+ } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+ return "landscape";
+ }
+ return "";
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemSetting/utssdk/app-android/index.uts b/uni_modules/uni-getSystemSetting/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..d5f51de28df435bafdb07121b32dc7f0043c529f
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/utssdk/app-android/index.uts
@@ -0,0 +1,26 @@
+import { UTSAndroid } from "io.dcloud.uts";
+import { DeviceUtil } from './device/DeviceUtil.uts';
+
+import { GetSystemSetting, GetSystemSettingResult } from '../interface.uts'
+import Exception from 'java.lang.Exception';
+
+export const getSystemSetting : GetSystemSetting = () : GetSystemSettingResult => {
+ let context = UTSAndroid.getAppContext();
+ let result : GetSystemSettingResult = {
+ deviceOrientation : DeviceUtil.deviceOrientation(context!),
+ locationEnabled : DeviceUtil.locationEnable(context!),
+ };
+ try {
+ let blueToothEnable = DeviceUtil.blueToothEnable(context!);
+ result.bluetoothEnabled = blueToothEnable;
+ } catch (e : Exception) {
+ result.bluetoothError = "Missing permissions required by BluetoothAdapter.isEnabled: android.permission.BLUETOOTH";
+ }
+
+ try {
+ result.wifiEnabled = DeviceUtil.wifiEnable(context!);
+ } catch (e : Exception) {
+ result.wifiError = "Missing permissions required by WifiManager.isWifiEnabled: android.permission.ACCESS_WIFI_STATE";
+ }
+ return result;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemSetting/utssdk/app-ios/index.uts b/uni_modules/uni-getSystemSetting/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5e2a49eae275cb08c6e2080732cf2be13691b370
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/utssdk/app-ios/index.uts
@@ -0,0 +1,31 @@
+import { GetSystemSetting, GetSystemSettingResult } from '../interface.uts'
+import { UTSiOS } from "DCloudUTSFoundation";
+
+export const getSystemSetting : GetSystemSetting = () : GetSystemSettingResult => {
+ let setting : Map = UTSiOS.getSystemSetting();
+ let result : GetSystemSettingResult = {
+ deviceOrientation: "portrait",
+ locationEnabled : false
+ };
+ if (setting.has("bluetoothEnabled")) {
+ result.bluetoothEnabled = setting.get("bluetoothEnabled") as boolean;
+ }
+
+ if (setting.has("bluetoothError")) {
+ result.bluetoothError = setting.get("bluetoothError") as string;
+ }
+
+ if (setting.has("locationEnabled")) {
+ result.locationEnabled = setting.get("locationEnabled") as boolean;
+ }
+
+ if (setting.has("wifiEnabled")) {
+ result.wifiEnabled = setting.get("wifiEnabled") as boolean;
+ }
+
+ if (setting.has("deviceOrientation")) {
+ result.deviceOrientation = setting.get("deviceOrientation") as string;
+ }
+
+ return result;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getSystemSetting/utssdk/interface.uts b/uni_modules/uni-getSystemSetting/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..ed1460cb0d44b0a7c08653f212b9541bd98c4c79
--- /dev/null
+++ b/uni_modules/uni-getSystemSetting/utssdk/interface.uts
@@ -0,0 +1,61 @@
+
+
+export type GetSystemSettingResult = {
+ /**
+ * 蓝牙是否开启
+ */
+ bluetoothEnabled?: boolean,
+ /**
+ * 蓝牙的报错信息
+ */
+ bluetoothError?: string,
+ /**
+ * 位置是否开启
+ */
+ locationEnabled : boolean,
+ /**
+ * wifi是否开启
+ */
+ wifiEnabled?: boolean,
+ /**
+ * wifi的报错信息
+ */
+ wifiError?: string,
+ /**
+ * 设备方向
+ */
+ deviceOrientation : string
+}
+
+
+export type GetSystemSetting = () => GetSystemSettingResult
+
+
+export interface Uni {
+ /**
+ * GetSystemSetting()
+ * @description
+ * 获取系统设置
+ * @return {object}
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/getsystemsetting.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.getSystemSetting()
+ ```
+ */
+ getSystemSetting(): GetSystemSettingResult;
+}
diff --git a/uni_modules/uni-getbatteryinfo/changelog.md b/uni_modules/uni-getbatteryinfo/changelog.md
index 1a6be2cec42ff7bfdf36e6e1d11b9579723dc135..03f2110d87b74dec98a92f48f4e18b227cff4fad 100644
--- a/uni_modules/uni-getbatteryinfo/changelog.md
+++ b/uni_modules/uni-getbatteryinfo/changelog.md
@@ -1,5 +1,12 @@
+## 1.3.1（2023-09-15）
+app端适配使用UniError
+
+## 1.3.0（2023-05-30）
+新增 同步获取电量api
+
## 1.2.0（2022-10-17）
实现百度小程序/支付宝小程序/QQ小程序获取电量
+
## 1.1.0（2022-10-17）
实现ios平台获取电量
diff --git a/uni_modules/uni-getbatteryinfo/package.json b/uni_modules/uni-getbatteryinfo/package.json
index 0731fe3a54e5924d05c34a1bf58d5bc2fe6e1642..0fc760c92199662311d098a5213e48fd6c81c37f 100644
--- a/uni_modules/uni-getbatteryinfo/package.json
+++ b/uni_modules/uni-getbatteryinfo/package.json
@@ -1,14 +1,14 @@
{
"id": "uni-getbatteryinfo",
"displayName": "uni-getbatteryinfo",
- "version": "1.2.0",
+ "version": "1.3.1",
"description": "使用uts开发，实现在多个平台获取电池电量功能",
"keywords": [
"battery"
],
"repository": "",
"engines": {
- "HBuilderX": "^3.6.0"
+ "HBuilderX": "^3.9.0"
},
"dcloudext": {
"type": "uts",
@@ -32,7 +32,12 @@
},
"uni_modules": {
"uni-ext-api": {
- "uni": ["getBatteryInfo"]
+ "uni": {
+ "getBatteryInfo": "getBatteryInfo",
+ "getBatteryInfoSync": {
+ "web": false
+ }
+ }
},
"dependencies": [],
"encrypt": [],
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
index 319368c02692c8ac451d996ee2f64a31aa8c0048..5ae056d96e3d41349089f07a07c6bfbb6fd30864 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
@@ -1,10 +1,18 @@
import Context from "android.content.Context";
import BatteryManager from "android.os.BatteryManager";
-import { UTSAndroid } from "io.dcloud.uts";
-import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoFail, GetBatteryInfoOptions } from '../interface.uts'
+import { GetBatteryInfo, GetBatteryInfoOptions, GetBatteryInfoSuccess, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts'
+import IntentFilter from 'android.content.IntentFilter';
+import Intent from 'android.content.Intent';
+
+import { GetBatteryInfoFailImpl } from '../unierror';
+
+/**
+ * 异步获取电量
+ */
+export const getBatteryInfo : GetBatteryInfo = function (options : GetBatteryInfoOptions) {
+
-export const getBatteryInfo : GetBatteryInfo = function (options) {
const context = UTSAndroid.getAppContext();
if (context != null) {
const manager = context.getSystemService(
@@ -12,22 +20,65 @@ export const getBatteryInfo : GetBatteryInfo = function (options) {
) as BatteryManager;
const level = manager.getIntProperty(
BatteryManager.BATTERY_PROPERTY_CAPACITY
- );
+ );
+
+ let ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ let batteryStatus = context.registerReceiver(null, ifilter);
+ let status = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+ let isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL;
+
const res : GetBatteryInfoSuccess = {
errMsg: 'getBatteryInfo:ok',
level,
- isCharging: manager.isCharging()
+ isCharging: isCharging
}
options.success?.(res)
options.complete?.(res)
- } else {
- const res : GetBatteryInfoFail = {
- errSubject: "uni-getBatteryInfo",
- errCode: 1001,
- errMsg: 'getBatteryInfo:fail getAppContext is null',
- cause: null
- }
+ } else {
+ let res = new GetBatteryInfoFailImpl(1001);
options.fail?.(res)
options.complete?.(res)
}
-}
\ No newline at end of file
+}
+
+/**
+ * 同步获取电量示例
+ */
+export const getBatteryInfoSync : GetBatteryInfoSync = function (): GetBatteryInfoResult {
+
+ const context = UTSAndroid.getAppContext();
+ if (context != null) {
+
+
+ const manager = context.getSystemService(
+ Context.BATTERY_SERVICE
+ ) as BatteryManager;
+ const level = manager.getIntProperty(
+ BatteryManager.BATTERY_PROPERTY_CAPACITY
+ );
+
+ let ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ let batteryStatus = context.registerReceiver(null, ifilter);
+ let status = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+ let isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL;
+
+ const res : GetBatteryInfoResult = {
+ level: level,
+ isCharging: isCharging
+ };
+
+ return res;
+ }
+ else {
+ /**
+ * 无有效上下文
+ */
+ const res : GetBatteryInfoResult = {
+ level: -1,
+ isCharging: false
+ };
+ return res;
+ }
+
+
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..721b81e0240705a87ec0761aa9eb6f4e188769cb
--- /dev/null
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json
@@ -0,0 +1,3 @@
+{
+ "deploymentTarget": "9"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts
index 755250ff9d42c91ed820889b8103ef9ce850c881..de45bdc454fef51d0f63de5581140db8c2809c7c 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts
@@ -1,9 +1,7 @@
// 引用 iOS 原生平台 api
import { UIDevice } from "UIKit";
-import { Int } from 'Swift';
-
-import { GetBatteryInfo, GetBatteryInfoSuccess } from '../interface.uts';
+import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoResult, GetBatteryInfoSync } from '../interface.uts';
/**
* 导出 获取电量方法
*/
@@ -15,9 +13,22 @@ export const getBatteryInfo : GetBatteryInfo = function (options) {
// 返回数据
const res : GetBatteryInfoSuccess = {
errMsg: "getBatteryInfo:ok",
- level: new Int(UIDevice.current.batteryLevel * 100),
+ level: Number(UIDevice.current.batteryLevel * 100),
isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,
};
options.success?.(res);
options.complete?.(res);
+}
+
+export const getBatteryInfoSync : GetBatteryInfoSync = function (): GetBatteryInfoResult {
+
+ // 开启电量检测
+ UIDevice.current.isBatteryMonitoringEnabled = true
+
+ // 返回数据
+ const res : GetBatteryInfoResult = {
+ level: Number(UIDevice.current.batteryLevel * 100),
+ isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,
+ };
+ return res;
}
\ No newline at end of file
diff --git a/uni_modules/uni-getbatteryinfo/index.d.ts b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
similarity index 88%
rename from uni_modules/uni-getbatteryinfo/index.d.ts
rename to uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
index 60b511f68f86e4fff522ee27ff04f3d5713a9645..9f0b83c4e53a1a27957eb4b291cf3b1fc032f7d8 100644
--- a/uni_modules/uni-getbatteryinfo/index.d.ts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
@@ -34,4 +34,9 @@ declare interface Uni {
* 文档: [https://uniapp.dcloud.net.cn/api/system/batteryInfo.html](https://uniapp.dcloud.net.cn/api/system/batteryInfo.html)
*/
getBatteryInfo(option?: UniNamespace.GetBatteryInfoOption): void;
+
+ /**
+ * 同步获取电池电量信息
+ */
+ getBatteryInfoSync(): UniNamespace.GetBatteryInfoSuccessCallbackResult;
}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
index 7d3bbf103e608a021aadc8418a44342f7371c316..79130b5dac27150d68fbf533ab06186612d70975 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
@@ -1,61 +1,130 @@
export type GetBatteryInfoSuccess = {
- errMsg : string,
- /**
- * 设备电量，范围1 - 100
- */
- level : number,
- /**
- * 是否正在充电中
- */
- isCharging : boolean
+ errMsg : string,
+ /**
+ * 设备电量，范围1 - 100
+ */
+ level : number,
+ /**
+ * 是否正在充电中
+ */
+ isCharging : boolean
}
-export type GetBatteryInfoFail = {
- /**
- * 错误码
- */
- errCode : number,
- /**
- * 调用API的名称
- */
- errSubject : string,
- /**
- * 错误的详细信息
- */
- errMsg : string,
- /**
- * 错误来源
- */
- cause : any | null
-}
-
-
-
export type GetBatteryInfoOptions = {
- /**
- * 接口调用结束的回调函数（调用成功、失败都会执行）
- */
- success ?: (res : GetBatteryInfoSuccess) => void
- /**
- * 接口调用失败的回调函数
- */
- fail ?: (res : GetBatteryInfoFail) => void
- /**
- * 接口调用成功的回调
- */
- complete ?: (res : any) => void
-}
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ success ?: (res : GetBatteryInfoSuccess) => void
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: (res : UniError) => void
+ /**
+ * 接口调用成功的回调
+ */
+ complete ?: (res : any) => void
+}
+
+export type GetBatteryInfoResult = {
+ /**
+ * 设备电量，范围1 - 100
+ */
+ level : number,
+ /**
+ * 是否正在充电中
+ */
+ isCharging : boolean
+}
+
+/**
+ * 错误码
+ * - 1001 getAppContext is null
+ */
+export type GetBatteryInfoErrorCode = 1001 ;
+/**
+ * GetBatteryInfo 的错误回调参数
+ */
+export interface GetBatteryInfoFail extends IUniError {
+ errCode : GetBatteryInfoErrorCode
+};
/**
* 获取电量信息
* @param {GetBatteryInfoOptions} options
-*
+*
*
* @tutorial https://uniapp.dcloud.net.cn/api/system/batteryInfo.html
* @platforms APP-IOS = ^9.0,APP-ANDROID = ^22
* @since 3.6.11
-*
+*
* @assert () => success({errCode: 0, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:ok", level: 60, isCharging: false })
* @assert () => fail({errCode: 1001, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:fail getAppContext is null" })
*/
-export type GetBatteryInfo = (options : GetBatteryInfoOptions) => void
\ No newline at end of file
+export type GetBatteryInfo = (options : GetBatteryInfoOptions) => void
+
+
+export type GetBatteryInfoSync = () => GetBatteryInfoResult
+
+interface Uni {
+
+ /**
+ * 获取电池电量信息
+ * @description 获取电池电量信息
+ * @param {GetBatteryInfoOptions} options
+ * @example
+ * ```typescript
+ * uni.getBatteryInfo({
+ * success(res) {
+ * console.log(res);
+ * }
+ * })
+ * ```
+ * @remark
+ * - 该接口需要同步调用
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.6.11",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.6.11",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3 //支持的vue版本
+ *
+ */
+ getBatteryInfo (options : GetBatteryInfoOptions) : void,
+ /**
+ * 同步获取电池电量信息
+ * @description 获取电池电量信息
+ * @example
+ * ```typescript
+ * uni.getBatteryInfo()
+ * ```
+ * @remark
+ * - 该接口需要同步调用
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.6.11",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.6.11",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3 //支持的vue版本
+ *
+ */
+ getBatteryInfoSync():GetBatteryInfoResult
+
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
index 4fdced2ee3aa9d80eafdffdc5f06d522c7a1f08a..473f1a07d3f5b227f9bb1caa1099ddfd99d254da 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
@@ -1,3 +1,6 @@
export function getBatteryInfo(options) {
return my.getBatteryInfo(options)
}
+export function getBatteryInfoSync(options) {
+ return my.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
index 5944a774bdc27de75cbe441c1af274dfef4ab8ac..1ee373a514964b33fd47e1bd59170fb22661c0d9 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
@@ -1,3 +1,6 @@
export function getBatteryInfo(options) {
return swan.getBatteryInfo(options)
}
+export function getBatteryInfoSync(options) {
+ return swan.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
index 06287bc468d46e1c12f79e455a934fcbea7c52c5..6eabfcff9737dcd28de56bdb67dbb9c96287dcb8 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
@@ -1,3 +1,6 @@
export function getBatteryInfo(options) {
return qq.getBatteryInfo(options)
}
+export function getBatteryInfoSync(options) {
+ return qq.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
index 5124b3de21a08a351d2d7eb631aaf96a600aa147..3bdfa9184b26d8df7a53aa9eb61c1ef37d66a8a9 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
@@ -1,3 +1,6 @@
export function getBatteryInfo(options) {
return wx.getBatteryInfo(options)
}
+export function getBatteryInfoSync(options) {
+ return wx.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts b/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts
new file mode 100644
index 0000000000000000000000000000000000000000..511c66cc0f6627e4e5e72b478fec1163c56ce92c
--- /dev/null
+++ b/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts
@@ -0,0 +1,34 @@
+import { GetBatteryInfoErrorCode, GetBatteryInfoFail } from "./interface.uts"
+/**
+ * 错误主题
+ */
+export const UniErrorSubject = 'uni-getBatteryInfo';
+
+
+/**
+ * 错误信息
+ * @UniError
+ */
+export const UniErrors : Map = new Map([
+ /**
+ * 错误码及对应的错误信息
+ */
+ [1001, 'getBatteryInfo:fail getAppContext is null'],
+]);
+
+
+/**
+ * 错误对象实现
+ */
+export class GetBatteryInfoFailImpl extends UniError implements GetBatteryInfoFail {
+
+ /**
+ * 错误对象构造函数
+ */
+ constructor(errCode : GetBatteryInfoErrorCode) {
+ super();
+ this.errSubject = UniErrorSubject;
+ this.errCode = errCode;
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-installApk/changelog.md b/uni_modules/uni-installApk/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..d67eb701ef976498949ebb5d5eec4b9531e0834e
--- /dev/null
+++ b/uni_modules/uni-installApk/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.4（2023-12-08）
+兼容asset目录文件的处理
+## 1.0.3（2023-10-27）
+遵循UniError规范
+## 1.0.2（2023-10-27）
+修改文档
+## 1.0.1（2023-10-27）
+支持js层调用
+## 1.0.0（2023-10-26）
+安装apk的插件
diff --git a/uni_modules/uni-installApk/package.json b/uni_modules/uni-installApk/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..2270fe2ab7e79516176a637fa9536ccfc1a60111
--- /dev/null
+++ b/uni_modules/uni-installApk/package.json
@@ -0,0 +1,93 @@
+{
+ "id": "uni-installApk",
+ "displayName": "uni-installApk",
+ "version": "1.0.4",
+ "description": "uni-installApk",
+ "keywords": [
+ "uni-installApk"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.94"
+ },
+ "dcloudext": {
+ "type": "uts",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "android.permission.REQUEST_INSTALL_PACKAGES"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "uni-ext-api": {
+ "uni": {
+ "installApk": {
+ "name": "installApk",
+ "app": {
+ "js": true,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-android": "y",
+ "app-ios": "n"
+ },
+ "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-installApk/readme.md b/uni_modules/uni-installApk/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..898834d79b542157a264adc6401bce2076c7768e
--- /dev/null
+++ b/uni_modules/uni-installApk/readme.md
@@ -0,0 +1,37 @@
+# uni-installApk
+
+## 使用说明
+
+Android平台安装Apk
+
+**注意: 3.95以下需要自定义基座**
+
+### uni.installApk(options : InstallApkOptions):void
+
+安装apk
+
+参数说明
+
+```
+type InstallApkOptions = {
+ /**
+ * apk文件地址
+ */
+ filePath : string,
+ /**
+ * 接口调用成功的回调函数
+ * @defaultValue null
+ */
+ success ?: (res : any) => void,
+ /**
+ * 接口调用失败的回调函数
+ * @defaultValue null
+ */
+ fail ?: (err : any) => void,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete ?: (res : any) => void,
+}
+```
\ No newline at end of file
diff --git a/uni_modules/uni-installApk/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-installApk/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cf3ce22599398429807a3305a5a549277079dc2
--- /dev/null
+++ b/uni_modules/uni-installApk/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-installApk/utssdk/app-android/index.uts b/uni_modules/uni-installApk/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..64e7b6bdc7698fee1d7ddce32329aede1e619ed7
--- /dev/null
+++ b/uni_modules/uni-installApk/utssdk/app-android/index.uts
@@ -0,0 +1,83 @@
+import { InstallApkOptions, InstallApkSuccess } from "../interface.uts"
+import { InstallApkFailImpl } from "../unierror.uts"
+import Intent from 'android.content.Intent';
+import Build from 'android.os.Build';
+import File from 'java.io.File';
+import FileProvider from 'androidx.core.content.FileProvider';
+import Context from 'android.content.Context';
+import Uri from 'android.net.Uri';
+import FileOutputStream from 'java.io.FileOutputStream';
+
+export function installApk(options : InstallApkOptions) : void {
+ const context = UTSAndroid.getAppContext() as Context
+ var filePath = UTSAndroid.convert2AbsFullPath(options.filePath)
+ var apkFile : File | null = null;
+ if (filePath.startsWith("/android_asset/")) {
+ filePath = filePath.replace("/android_asset/", "")
+ apkFile = copyAssetFileToPrivateDir(context, filePath)
+ } else {
+ apkFile = new File(filePath)
+ }
+
+ if (apkFile != null && !apkFile.exists() && !apkFile.isFile()) {
+ let error = new InstallApkFailImpl(1300002);
+ options.fail?.(error)
+ options.complete?.(error)
+ return
+ }
+ const intent = new Intent()
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ intent.setAction(Intent.ACTION_VIEW)
+
+ if (Build.VERSION.SDK_INT >= 24) {
+ const authority = context.getPackageName() + ".dc.fileprovider"
+ const apkUri = FileProvider.getUriForFile(context, authority, apkFile!!)
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
+ } else {
+ intent.setDataAndType(Uri.fromFile(apkFile!!), "application/vnd.android.package-archive");
+ }
+
+ context.startActivity(intent)
+ const success : InstallApkSuccess = {
+ errMsg: "success"
+ }
+ options.success?.(success)
+ options.complete?.(success)
+}
+
+
+function copyAssetFileToPrivateDir(context : Context, fileName : string) : File | null {
+ try {
+ const destPath = context.getCacheDir().getPath() + "/apks/" + fileName
+ const outFile = new File(destPath)
+ const parentFile = outFile.getParentFile()
+ if (parentFile != null) {
+ if (!parentFile.exists()) {
+ parentFile.mkdirs()
+ }
+ }
+ if (!outFile.exists()) {
+ outFile.createNewFile()
+ }
+ const inputStream = context.getAssets().open(fileName)
+ const outputStream = new FileOutputStream(outFile)
+ let buffer = new ByteArray(1024);
+ do {
+ let len = inputStream.read(buffer);
+ if (len == -1) {
+ break;
+ }
+ outputStream.write(buffer, 0, len)
+ } while (true)
+
+ inputStream.close()
+ outputStream.close()
+
+ return outFile
+ } catch (e : Exception) {
+ e.printStackTrace()
+ }
+
+ return null
+}
diff --git a/uni_modules/uni-installApk/utssdk/app-ios/index.uts b/uni_modules/uni-installApk/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-installApk/utssdk/index.d.ts b/uni_modules/uni-installApk/utssdk/index.d.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ad24effbc1e07f4f30aa894e39cb3d388350dabe
--- /dev/null
+++ b/uni_modules/uni-installApk/utssdk/index.d.ts
@@ -0,0 +1,78 @@
+declare namespace UniNamespace {
+
+interface InstallApkSuccess {
+ /**
+ * 安装成功消息
+ */
+ errMsg : string
+}
+
+type InstallApkErrorCode = 1300002
+interface InstallApkFail {
+ errCode : InstallApkErrorCode
+}
+
+type InstallApkComplete = any
+
+type InstallApkSuccessCallback = (res : InstallApkSuccess) => void
+type InstallApkFailCallback = (err : InstallApkFail) => void
+type InstallApkCompleteCallback = (res : InstallApkComplete) => void
+
+interface InstallApkOptions {
+ /**
+ * apk文件地址
+ */
+ filePath : string,
+ /**
+ * 接口调用成功的回调函数
+ * @defaultValue null
+ */
+ success ?: InstallApkSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ * @defaultValue null
+ */
+ fail ?: InstallApkFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete ?: InstallApkCompleteCallback | null
+}
+
+}
+
+
+declare interface Uni {
+ /**
+ * installApk()
+ * @description
+ * 安装apk
+ * @param {InstallApkOptions}
+ * @return {void}
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "3.94+",
+ * "unixVer": "3.94+"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.installApk({
+ filePath: "/xx/xx/xx.apk",
+ complete: (res: any) => {
+ console.log("complete => " + JSON.stringify(res));
+ }
+ });
+ ```
+ */
+ installApk(options : UniNamespace.InstallApkOptions) : void
+}
diff --git a/uni_modules/uni-installApk/utssdk/interface.uts b/uni_modules/uni-installApk/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..35edfcd7eaeddfd4f192803385829389bac78689
--- /dev/null
+++ b/uni_modules/uni-installApk/utssdk/interface.uts
@@ -0,0 +1,76 @@
+export interface Uni {
+ /**
+ * installApk()
+ * @description
+ * 安装apk
+ * @param {InstallApkOptions}
+ * @return {void}
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "3.94+",
+ * "unixVer": "3.94+"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "x",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.installApk({
+ filePath: "/xx/xx/xx.apk",
+ complete: (res: any) => {
+ console.log("complete => " + JSON.stringify(res));
+ }
+ });
+ ```
+ */
+ installApk(options : InstallApkOptions) : void
+}
+export type InstallApkSuccess = {
+ /**
+ * 安装成功消息
+ */
+ errMsg : string
+}
+export type InstallApkComplete = any
+export type InstallApkSuccessCallback = (res : InstallApkSuccess) => void
+/**
+ * 错误码
+ * - 1300002 找不到文件
+ */
+export type InstallApkErrorCode = 1300002
+/**
+ * 网络请求失败的错误回调参数
+ */
+export interface InstallApkFail extends IUniError {
+ errCode : InstallApkErrorCode
+};
+export type InstallApkFailCallback = (err : InstallApkFail) => void
+export type InstallApkCompleteCallback = (res : InstallApkComplete) => void
+
+export type InstallApkOptions = {
+ /**
+ * apk文件地址
+ */
+ filePath : string,
+ /**
+ * 接口调用成功的回调函数
+ * @defaultValue null
+ */
+ success ?: InstallApkSuccessCallback | null,
+ /**
+ * 接口调用失败的回调函数
+ * @defaultValue null
+ */
+ fail ?: InstallApkFailCallback | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete ?: InstallApkCompleteCallback | null
+}
\ No newline at end of file
diff --git a/uni_modules/uni-installApk/utssdk/unierror.uts b/uni_modules/uni-installApk/utssdk/unierror.uts
new file mode 100644
index 0000000000000000000000000000000000000000..a10c730d262388e3a2f945208c69f2cc66bee40c
--- /dev/null
+++ b/uni_modules/uni-installApk/utssdk/unierror.uts
@@ -0,0 +1,25 @@
+import { InstallApkErrorCode, InstallApkFail } from "./interface.uts"
+
+/**
+ * 错误主题
+ */
+export const UniErrorSubject = 'uni-installApk';
+/**
+ * 错误码
+ * @UniError
+ */
+export const UniErrors : Map = new Map([
+ /**
+ * 找不到文件
+ */
+ [1300002, 'No such file'],
+]);
+
+export class InstallApkFailImpl extends UniError implements InstallApkFail {
+ constructor(errCode : InstallApkErrorCode) {
+ super();
+ this.errSubject = UniErrorSubject;
+ this.errCode = errCode;
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/changelog.md b/uni_modules/uni-media/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-media/package.json b/uni_modules/uni-media/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..ffef8e134a2c8dc6022855bba96f8bcb5d449a09
--- /dev/null
+++ b/uni_modules/uni-media/package.json
@@ -0,0 +1,167 @@
+{
+ "id": "uni-media",
+ "displayName": "uni-media",
+ "version": "1.0.0",
+ "description": "uni-media",
+ "keywords": [
+ "uni-media"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "dcloudext": {
+ "type": "uts",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "",
+ "data": "",
+ "permissions": ""
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "uni-ext-api": {
+ "uni": {
+ "chooseImage": {
+ "name": "chooseImage",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "previewImage": {
+ "name": "previewImage",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "closePreviewImage": {
+ "name": "closePreviewImage",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "getImageInfo": {
+ "name": "getImageInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "saveImageToPhotosAlbum": {
+ "name": "saveImageToPhotosAlbum",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "compressImage": {
+ "name": "compressImage",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "chooseVideo": {
+ "name": "chooseVideo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "saveVideoToPhotosAlbum": {
+ "name": "saveVideoToPhotosAlbum",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "getVideoInfo": {
+ "name": "getVideoInfo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "compressVideo": {
+ "name": "compressVideo",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "dependencies": [
+ "uni-prompt"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/readme.md b/uni_modules/uni-media/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..a283ad8b59ff18a42b90480f35121f403ac2d4c4
--- /dev/null
+++ b/uni_modules/uni-media/readme.md
@@ -0,0 +1,6 @@
+# uni-chooseImage
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/ChooseImageUtils.uts b/uni_modules/uni-media/utssdk/ChooseImageUtils.uts
new file mode 100644
index 0000000000000000000000000000000000000000..acd0aa10d2f549b68e8e28d154e9559fee7e4d99
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/ChooseImageUtils.uts
@@ -0,0 +1,73 @@
+import { ChooseImageOptions, ChooseVideoOptions } from "./interface.uts"
+import {
+ UniError_ChooseImage, UniError_ChooseVideo, UniError_SaveImageToPhotosAlbum, UniError_SaveVideoToPhotosAlbum,
+ UniErrors
+} from "./unierror.uts"
+export const CODE_CAMERA_ERROR = 11;
+export const CODE_GALLERY_ERROR = 12;
+export const CODE_GET_IMAGE_INFO_CODE = 13
+
+export function uniChooseImage(options : ChooseImageOptions, onSourceTypeSelect : (count : number, compressed : boolean, index : number) => void) {
+ let count = options.count != null ? (options.count! <= 0 ? 9 : options.count) : 9
+ // 默认为 false
+ let compressed = false;
+ if ((options.sizeType) != null) {
+ compressed = options.sizeType!.indexOf("original") < 0
+ }
+ /* source type 乱传如何处理 */
+ let sourceType : Array = (options.sourceType != null && options.sourceType!.length > 0) ? options.sourceType! : ["album", "camera"];
+ let itemList = ["拍摄", "从相册选择"]
+ if (sourceType.length == 1) {
+ if (sourceType.indexOf("album") >= 0) {
+ onSourceTypeSelect?.(count!, compressed, 1)
+ } else if (sourceType.indexOf("camera") >= 0) {
+ onSourceTypeSelect?.(count!, compressed, 0)
+ }
+ return
+ }
+ if (sourceType.length == 2) {
+ uni.showActionSheet({
+ itemList: itemList,
+ success: (e) => {
+ onSourceTypeSelect?.(count!, compressed, e.tapIndex!)
+ },
+ fail: (e) => {
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101001, "errMsg": UniErrors[1101001]! }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+ })
+ }
+}
+
+export function uniChooseVideo(options : ChooseVideoOptions, onSourceTypeSelect : (count : number, compressed : boolean, index : number) => void) {
+ let count = 1
+ // 默认为 false
+ let compressed = options.compressed != null ? options.compressed! : true;
+
+ /* source type 乱传如何处理 */
+ let sourceType : Array = (options.sourceType != null && options.sourceType!.length > 0) ? options.sourceType! : ["album", "camera"];
+ let itemList = ["拍摄", "从相册选择"]
+ if (sourceType.length == 1) {
+ if (sourceType.indexOf("album") >= 0) {
+ onSourceTypeSelect?.(count!, compressed, 1)
+ } else if (sourceType.indexOf("camera") >= 0) {
+ onSourceTypeSelect?.(count!, compressed, 0)
+ }
+ return
+ }
+
+ if (sourceType.length == 2) {
+ uni.showActionSheet({
+ itemList: itemList,
+ success: (e) => {
+ onSourceTypeSelect?.(count!, compressed, e.tapIndex!)
+ },
+ fail: (e) => {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101001, "errMsg": UniErrors[1101001]! }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-media/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..156a948a1b15c31fef1183788e2d475623a2b4d2
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/config.json b/uni_modules/uni-media/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a9e9238affa90778e875710656c82fd726d7032
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/config.json
@@ -0,0 +1,7 @@
+{
+ "dependencies": [
+ "com.github.bumptech.glide:glide:4.9.0",
+ "androidx.recyclerview:recyclerview:1.0.0",
+ "androidx.appcompat:appcompat:1.0.0"
+ ]
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/index.uts b/uni_modules/uni-media/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..f325d99588f6ef35f8e0493cbeb63d07c70eac92
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/index.uts
@@ -0,0 +1,613 @@
+import { getUniActivity } from "io.dcloud.uts.android";
+import {
+ ChooseImageOptions, ChooseImage, ChooseImageSuccessCallback,
+ PreviewImageOptions, PreviewImage, LongPressActionsOptions, PreviewImageSuccessCallback, LongPressActionsSuccessData,
+ ClosePreviewImage, ClosePreviewImageSuccessCallback, ClosePreviewImageOptions,
+ GetImageInfo, GetImageInfoOptions, GetImageInfoSuccessCallback,
+ SaveImageToPhotosAlbum, SaveImageToPhotosAlbumOptions, SaveImageToPhotosAlbumSuccessCallback,
+ CompressImage, CompressImageSuccessCallback, CompressImageFailCallback, CompressImageOptions,
+ ChooseVideo, ChooseVideoOptions, ChooseVideoFailCallback, ChooseVideoSuccessCallback,
+ GetVideoInfo, GetVideoInfoOptions, GetVideoInfoSuccessCallback,
+ SaveVideoToPhotosAlbum, SaveVideoToPhotosAlbumOptions, SaveVideoToPhotosAlbumSuccessCallback,
+ CompressVideo, CompressVideoOptions, CompressVideoFailCallback, CompressVideoSuccessCallback
+} from "../interface.uts"
+import {
+ UniError_PreviewImage, UniError_GetImageInfo, UniError_SaveImageToPhotosAlbum, UniError_SaveVideoToPhotosAlbum,
+ UniErrors
+} from "../unierror.uts"
+import { CODE_CAMERA_ERROR, CODE_GALLERY_ERROR, CODE_GET_IMAGE_INFO_CODE } from "../ChooseImageUtils.uts"
+import { chooseMediaImage, chooseMediaVideo } from "./utils/ChooseMediaUtils.uts"
+import { transcodeImage, transcodeVideo } from './utils/CompressUtils.uts'
+import { getVideoMetadata } from "./utils/MediaUtils.uts"
+import Intent from 'android.content.Intent';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import Manifest from 'android.Manifest';
+import Build from 'android.os.Build';
+import File from 'java.io.File';
+import Uri from 'android.net.Uri';
+import ArrayList from 'java.util.ArrayList';
+
+import Glide from 'com.bumptech.glide.Glide';
+import CustomTarget from 'com.bumptech.glide.request.target.CustomTarget';
+import Drawable from 'android.graphics.drawable.Drawable';
+import Transition from 'com.bumptech.glide.request.transition.Transition';
+import ExifInterface from 'android.media.ExifInterface';
+import BitmapFactory from 'android.graphics.BitmapFactory';
+import TextUtils from 'android.text.TextUtils';
+import FileInputStream from 'java.io.FileInputStream';
+import FileOutputStream from 'java.io.FileOutputStream';
+import Environment from 'android.os.Environment';
+import LongClickEventManager from 'io.dcloud.uts.nativeObj.photoview.LongClickEventManager';
+import JSONObject from 'org.json.JSONObject';
+import ActivityManager from 'io.dcloud.uts.nativeObj.photoview.ActivityManager';
+import MediaMetadataRetriever from 'android.media.MediaMetadataRetriever';
+import MediaStore from 'android.provider.MediaStore';
+import ContentValues from 'android.content.ContentValues';
+import Exception from 'java.lang.Exception';
+import BufferedOutputStream from 'java.io.BufferedOutputStream';
+import ByteArrayInputStream from 'java.io.ByteArrayInputStream';
+// import { actionSheetImpl, ShowActionSheetOptions, closeActionSheet } from "./showActionSheet.uts";
+
+
+/**
+ * 图片压缩目前采用原java代码压缩方式
+ */
+
+
+export const chooseImage : ChooseImage = function (option : ChooseImageOptions) {
+ chooseMediaImage(option)
+}
+
+export const previewImage : PreviewImage = function (options : PreviewImageOptions) {
+ if (options.urls.length > 0) {
+ let values : ArrayList = new ArrayList()
+ let oroginalValues : ArrayList = new ArrayList()
+ options.urls.forEach((original) => {
+ let localPath = original
+ if (!localPath.startsWith("data:image") && !isNetPath(localPath)) {
+ localPath = UTSAndroid.convert2AbsFullPath(localPath)
+ }
+ values.add(localPath)
+ oroginalValues.add(original)
+ })
+ let intent = new Intent()
+ intent.setClassName(getUniActivity()!, "io.dcloud.uts.nativeObj.photoview.PhotoActivity");
+ intent.putExtra("image_urlList", values);
+ intent.putExtra("original_image_urlArray", oroginalValues)
+ var current = 0;
+ if (options.current != null) {
+ try {
+ current = (options.current!.toString()).toInt()
+ if (current < 0) {
+ current = 0
+ }
+ } catch (e) {
+
+ }
+ }
+ intent.putExtra("image_current_index", current)
+ intent.putExtra("image_loop", options.loop != null ? options.loop! : false);
+ if (options.indicator != null) {
+ intent.putExtra("image_indicator", options.indicator!);
+ }
+ intent.putExtra("image_photo", true);
+ var callbackId = System.currentTimeMillis() + ":"
+ intent.putExtra("preview_callback", callbackId);
+ // uts目前无法支持嵌套方法，长按事件暂时不支持
+ // LongClickEventManager.getInstance().addOnlongClickListener(callbackId, new LongClick(options))
+ getUniActivity()!.startActivity(intent)
+ let success : PreviewImageSuccessCallback = { errMsg: 'ok', "errSubject": UniError_PreviewImage }
+ options.success?.(success)
+ options.complete?.(success)
+ } else {
+ let error : UniError = { "errCode": 1101002, "errMsg": UniErrors[1101002]!, "errSubject": UniError_PreviewImage }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+}
+
+class LongClick implements LongClickEventManager.OnLongClickListener {
+ options : PreviewImageOptions
+ constructor(options : PreviewImageOptions) {
+ this.options = options
+ }
+ override onLongClickListener(values : JSONObject) {
+ var itemList : Array | null = null
+ var itemColor : string | null = null
+ var hasLongPressAction = false;
+ if (this.options.longPressActions != null && this.options.longPressActions!.itemList != null && this.options.longPressActions!.itemList!.length > 0) {
+ itemList = this.options.longPressActions!.itemList!
+ hasLongPressAction = true
+ } else {
+ itemList = ["保存"]
+ }
+ if (this.options.longPressActions != null && this.options.longPressActions!.itemColor != null) {
+ itemColor = this.options.longPressActions!.itemColor!
+ }
+ // let actionOption : ShowActionSheetOptions = {
+ // "itemList": itemList!,
+ // "itemColor": itemColor == null ? "" : itemColor!,
+ // success: (e) => {
+ // if (hasLongPressAction) {
+ // let success : LongPressActionsSuccessData = {
+ // "index": values.optInt("index"),
+ // "tapIndex": e.tapIndex!
+ // }
+ // this.options.longPressActions?.success?.(success)
+ // this.options.longPressActions?.complete?.(success)
+ // return
+ // }
+ // let saveOption : SaveImageToPhotosAlbumOptions = {
+ // "filePath": values.optString("url"),
+ // success: (e) => {
+ // uni.showToast({
+ // title: "uni.previewImage.save.success",
+ // position: "bottom"
+ // })
+ // },
+ // fail: (e) => {
+ // uni.showToast({
+ // title: "uni.previewImage.save.fail",
+ // position: "bottom"
+ // })
+ // },
+ // complete: (e) => {
+ // }
+ // }
+ // loadFile(saveOption, false)
+ // },
+ // fail: (e) => {
+ // if (hasLongPressAction) {
+ // let fail = {
+ // "errMsg": "user cancel"
+ // }
+ // this.options.longPressActions?.fail?.(fail)
+ // this.options.longPressActions?.complete?.(fail)
+ // }
+ // }
+ // }
+ // let activity = ActivityManager.getInstance().getRunningActivity("io.dcloud.uts.nativeObj.photoview.PhotoActivity")
+ // actionSheetImpl(activity, actionOption)
+ // uni.showActionSheet()
+ }
+}
+
+function isNetPath(url : string) : boolean {
+ if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("rtmp://") || url.startsWith("rtsp://")) {
+ return true;
+ }
+ return false;
+}
+
+export const closePreviewImage : ClosePreviewImage = function (options : ClosePreviewImageOptions) {
+ // 可能存在执行关闭的时候 action sheet 正在显示
+ // closeActionSheet()
+ let activity = ActivityManager.getInstance().getRunningActivity("io.dcloud.uts.nativeObj.photoview.PhotoActivity")
+ if (activity != null) {
+ activity.onBackPressed()
+ }
+ let callback : ClosePreviewImageSuccessCallback = {
+ errMsg: "ok"
+ }
+ options.success?.(callback)
+ options.complete?.(callback)
+}
+
+export const getImageInfo : GetImageInfo = function (options : GetImageInfoOptions) {
+ if (isNetPath(options.src)) {
+ Glide.with(getUniActivity()!).asFile().load(options.src).into(new ImageInfoTarget(options))
+ } else {
+ var path = ""
+ if (options.src.length > 0) {
+ path = UTSAndroid.convert2AbsFullPath(options.src)
+ getExif(path, options, null)
+ } else {
+ let imageInfoCallback : UniError = { "errCode": 1101003, "errMsg": UniErrors[1101003]!, "errSubject": UniError_GetImageInfo }
+ options.fail?.(imageInfoCallback)
+ options.complete?.(imageInfoCallback)
+ }
+ }
+}
+
+class ImageInfoTarget extends CustomTarget {
+ options : GetImageInfoOptions
+
+ constructor(options : GetImageInfoOptions) {
+ super();
+ this.options = options
+ }
+
+ override onResourceReady(resource : File, transition : Transition> | null) {
+ let bitmapOption = new BitmapFactory.Options();
+ bitmapOption.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(resource.getPath(), bitmapOption)
+ let mimeType : string = bitmapOption.outMimeType
+ if (!TextUtils.isEmpty(mimeType) && mimeType.contains("/")) {
+ mimeType = mimeType.substring(mimeType.indexOf("/") + 1)
+ }
+ // 拼接保存路径
+ let path = UTSAndroid.getAppTempPath()! + "imageInfo/" + System.currentTimeMillis()
+ if (!TextUtils.isEmpty(mimeType)) {
+ path += "." + mimeType
+ } else {
+ path += ".jpg"
+ }
+ if (copyFile(resource.getPath(), path)) {
+ getExif(path, this.options, bitmapOption)
+ } else {
+ let imageInfoCallback : UniError = { "errCode": 1101004, "errMsg": UniErrors[1101004]!, "errSubject": UniError_GetImageInfo }
+ this.options.fail?.(imageInfoCallback)
+ this.options.complete?.(imageInfoCallback)
+ }
+ }
+
+ override onLoadCleared(placeholder : Drawable | null) {
+ }
+
+ override onLoadFailed(errorDrawable : Drawable | null) {
+ let imageInfoCallback : UniError = { "errCode": 1101004, "errMsg": UniErrors[1101004]!, "errSubject": UniError_GetImageInfo }
+ this.options.fail?.(imageInfoCallback)
+ this.options.complete?.(imageInfoCallback)
+ }
+}
+
+function getExif(src : string, options : GetImageInfoOptions, bitmapOption : BitmapFactory.Options | null) {
+ if (!new File(src).exists()) {
+ let imageInfoCallback : UniError = { "errCode": 1101003, "errMsg": UniErrors[1101003]!, "errSubject": UniError_GetImageInfo }
+ options.fail?.(imageInfoCallback)
+ options.complete?.(imageInfoCallback)
+ return
+ }
+ try {
+ let exifInfo = new ExifInterface(src);
+ if (bitmapOption == null) {
+ bitmapOption = new BitmapFactory.Options();
+ bitmapOption.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(src, bitmapOption)
+ }
+ let width = bitmapOption!.outWidth
+ let height = bitmapOption!.outHeight
+ let mimeType : string = bitmapOption!.outMimeType
+ if (!TextUtils.isEmpty(mimeType) && mimeType.contains("/")) {
+ mimeType = mimeType.substring(mimeType.indexOf("/") + 1)
+ }
+ let orientation = exifInfo.getAttribute(ExifInterface.TAG_ORIENTATION);
+ let orientationStr = ""
+ switch (orientation) {
+ case "2":
+ orientationStr = "up-mirrored";
+ break;
+ case "3":
+ orientationStr = "down";
+ break;
+ case "4":
+ orientationStr = "down-mirrored";
+ break;
+ case "5":
+ orientationStr = "left-mirrored";
+ break;
+ case "6":
+ orientationStr = "right";
+ break;
+ case "7":
+ orientationStr = "right-mirrored";
+ break;
+ case "8":
+ orientationStr = "left";
+ break;
+ case "0":
+ case "1":
+ default:
+ orientationStr = "up";
+ break;
+ }
+ let imageInfoCallback : GetImageInfoSuccessCallback = {
+ "width": width,
+ "height": height,
+ "path": "file://" + src,
+ "orientation": orientationStr,
+ "type": TextUtils.isEmpty(mimeType) ? "unknown" : mimeType
+ }
+ options.success?.(imageInfoCallback)
+ options.complete?.(imageInfoCallback)
+ } catch (e:Exception) {
+ let imageInfoCallback : UniError = { "errCode": 1101010, "errMsg": UniErrors[1101010]!+e.toString(), "errSubject": UniError_GetImageInfo }
+ options.fail?.(imageInfoCallback)
+ options.complete?.(imageInfoCallback)
+ }
+}
+
+
+function copyFile(fromFilePath : string, toFilePath : string) : boolean {
+ let fromFile = new File(fromFilePath)
+ if (!fromFile.exists()) {
+ return false;
+ }
+ if (!fromFile.isFile()) {
+ return false
+ }
+ if (!fromFile.canRead()) {
+ return false;
+ }
+ let toFile = new File(toFilePath)
+ if (!toFile.getParentFile().exists()) {
+ toFile.getParentFile().mkdirs()
+ }
+ if (!toFile.exists()) {
+ toFile.createNewFile()
+ }
+ try {
+ let fis = new FileInputStream(fromFile)
+ let fos = new FileOutputStream(toFile)
+ let byteArrays = ByteArray(1024)
+ var c = fis.read(byteArrays)
+ while (c > 0) {
+ fos.write(byteArrays, 0, c)
+ c = fis.read(byteArrays)
+ }
+ fis.close()
+ fos.close()
+ return true
+ } catch (e) {
+ return false;
+ }
+}
+export const saveImageToPhotosAlbum : SaveImageToPhotosAlbum = function (options : SaveImageToPhotosAlbumOptions) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ let requestPermissionList : Array = [Manifest.permission.WRITE_EXTERNAL_STORAGE]
+ UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, requestPermissionList, (a : boolean, b : string[]) => {
+ loadFile(options, true)
+ }, (a : boolean, b : string[]) => {
+ let error : UniError = {
+ "errCode": 1101005,
+ "errMsg": UniErrors[1101005]!,
+ "errSubject": UniError_SaveImageToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ })
+ } else {
+ loadFile(options, true)
+ }
+}
+
+function loadFile(options : SaveImageToPhotosAlbumOptions, saveToAlbum : boolean) {
+ if (isNetPath(options.filePath)) {
+ Glide.with(getUniActivity()!).asFile().load(options.filePath).into(new SaveToAlbumTarget(options, saveToAlbum))
+ } else {
+ if (TextUtils.isEmpty(options.filePath)) {
+ let error : UniError = {
+ "errCode": 1101003,
+ "errMsg": UniErrors[1101003]!,
+ "errSubject": UniError_SaveImageToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ return
+ }
+ let originalPath = UTSAndroid.convert2AbsFullPath(options.filePath)
+ if (!new File(originalPath).exists()) {
+ let error : UniError = {
+ "errCode": 1101003,
+ "errMsg": UniErrors[1101003]!,
+ "errSubject": UniError_SaveImageToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ return
+ }
+ let path = DCIM_PATH + originalPath.substring(originalPath.lastIndexOf("/") + 1)
+ if (copyFileToPublicPath(originalPath, path, false)) {
+ if (saveToAlbum) {
+ sendSaveToAlbumBroad(path)
+ }
+ let success : SaveImageToPhotosAlbumSuccessCallback = {
+ "path": path
+ }
+ options.success?.(success)
+ options.complete?.(success)
+ } else {
+ let error : UniError = {
+ "errCode": 1101006,
+ "errMsg": UniErrors[1101006]!,
+ "errSubject": UniError_SaveImageToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+ }
+}
+
+function copyFileToPublicPath(fromFilePath : string, toFilePath : string, isVideo : boolean) : boolean {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+ try {
+ return copyFile(fromFilePath, toFilePath)
+ } catch (e) {
+ return false
+ }
+ }
+ if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && UTSAndroid.getUniActivity()!.getApplicationInfo().targetSdkVersion >= 29) || (Build.VERSION.SDK_INT >= 30)) {
+ try {
+ var fis = new FileInputStream(fromFilePath)
+ if (fis == null) {
+ return false
+ }
+ var mimeType : string | null = null
+ if (isVideo) {
+ var retriever = new MediaMetadataRetriever()
+ retriever.setDataSource(fromFilePath)
+ mimeType = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE);
+ } else {
+ let opt = new BitmapFactory.Options();
+ opt.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(fromFilePath, opt)
+ mimeType = opt.outMimeType;
+ }
+ if (mimeType == null) {
+ return false
+ }
+ var uri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+ if (mimeType!.startsWith("image/")) {
+ uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+ } else if (mimeType!.startsWith("video/")) {
+ uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+ } else if (mimeType!.startsWith("audio/")) {
+ uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+ }
+ var resolver = UTSAndroid.getUniActivity()!.getContentResolver()
+ var contentValue = new ContentValues()
+ let fileName = fromFilePath.substring(fromFilePath.lastIndexOf("/") + 1)
+ contentValue.put(MediaStore.Files.FileColumns.DISPLAY_NAME, fileName)
+ contentValue.put(MediaStore.Files.FileColumns.MIME_TYPE, mimeType!)
+ contentValue.put(MediaStore.Files.FileColumns.TITLE, fileName)
+ contentValue.put(MediaStore.Images.Media.RELATIVE_PATH, "DCIM/Camera/")
+ let insertUri = resolver.insert(uri, contentValue)
+ if (insertUri == null) {
+ return false
+ }
+ let fos = resolver.openOutputStream(insertUri)
+ if (fos == null) {
+ return false
+ }
+ var byteArrays = ByteArray(102400 * 2)
+ var c = fis.read(byteArrays)
+ while (c > 0) {
+ fos!.write(byteArrays, 0, c)
+ c = fis.read(byteArrays)
+ }
+ fos!.close()
+ fis.close()
+ return true
+ } catch (e : Exception) {
+ e.printStackTrace();
+ return false
+ }
+ } else {
+ try {
+ return copyFile(fromFilePath, toFilePath)
+ } catch (e) {
+ return false
+ }
+ }
+}
+
+function sendSaveToAlbumBroad(src : string) {
+ let intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + src))
+ getUniActivity()!.sendBroadcast(intent)
+}
+
+let DCIM_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() + "/Camera/"
+class SaveToAlbumTarget extends CustomTarget {
+ options : SaveImageToPhotosAlbumOptions
+ saveToAlbum : boolean
+ constructor(options : SaveImageToPhotosAlbumOptions, saveToAlbum : boolean) {
+ super();
+ this.options = options
+ this.saveToAlbum = saveToAlbum
+ }
+
+ override onResourceReady(resource : File, transition : Transition> | null) {
+ let bitmapOption = new BitmapFactory.Options();
+ bitmapOption.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(resource.getPath(), bitmapOption)
+ let mimeType : string | null = bitmapOption.outMimeType
+ if (!TextUtils.isEmpty(mimeType) && mimeType!.contains("/")) {
+ mimeType = mimeType!.substring(mimeType!.indexOf("/") + 1)
+ }
+
+ // 拼接保存路径
+ let path = DCIM_PATH + System.currentTimeMillis()
+ if (!TextUtils.isEmpty(mimeType)) {
+ path += "." + mimeType
+ } else {
+ path += ".jpg"
+ }
+ if (copyFileToPublicPath(resource.getPath(), path, false)) {
+ if (this.saveToAlbum) {
+ sendSaveToAlbumBroad(path)
+ }
+ let success : SaveImageToPhotosAlbumSuccessCallback = {
+ "path": path
+ }
+ this.options.success?.(success)
+ this.options.complete?.(success)
+ } else {
+ let imageInfoCallback : UniError = { "errCode": 1101004, "errMsg": UniErrors[1101004]!, "errSubject": UniError_SaveImageToPhotosAlbum }
+ this.options.fail?.(imageInfoCallback)
+ this.options.complete?.(imageInfoCallback)
+ }
+ }
+
+ override onLoadCleared(placeholder : Drawable | null) {
+ }
+
+ override onLoadFailed(errorDrawable : Drawable | null) {
+ let imageInfoCallback : UniError = { "errCode": 1101004, "errMsg": UniErrors[1101004]!, "errSubject": UniError_SaveImageToPhotosAlbum }
+ this.options.fail?.(imageInfoCallback)
+ this.options.complete?.(imageInfoCallback)
+ }
+}
+
+export const compressImage : CompressImage = function (options : CompressImageOptions) {
+ transcodeImage(options)
+}
+
+export const chooseVideo : ChooseVideo = function (options : ChooseVideoOptions) {
+ chooseMediaVideo(options)
+}
+
+
+export const getVideoInfo : GetVideoInfo = function (options : GetVideoInfoOptions) {
+ let result = getVideoMetadata(options.src)
+ if (result instanceof GetVideoInfoSuccessCallback) {
+ options.success?.(result as GetVideoInfoSuccessCallback)
+ } else if (result instanceof UniError)
+ options.fail?.(result as UniError)
+ options.complete?.(result)
+}
+
+
+export const saveVideoToPhotosAlbum : SaveVideoToPhotosAlbum = function (options : SaveVideoToPhotosAlbumOptions) {
+ if (TextUtils.isEmpty(options.filePath)) {
+ let error : UniError = {
+ "errCode": 1101003,
+ "errMsg": UniErrors[1101003]!,
+ "errSubject": UniError_SaveVideoToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ return
+ }
+ let originalPath = UTSAndroid.convert2AbsFullPath(options.filePath)
+ if (!new File(originalPath).exists()) {
+ let error : UniError = {
+ "errCode": 1101003,
+ "errMsg": UniErrors[1101003]!,
+ "errSubject": UniError_SaveVideoToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ return
+ }
+ let path = DCIM_PATH + originalPath.substring(originalPath.lastIndexOf("/") + 1)
+ if (copyFileToPublicPath(originalPath, path, true)) {
+ sendSaveToAlbumBroad(path)
+ let success : SaveVideoToPhotosAlbumSuccessCallback = {
+ // "path": path
+ }
+ options.success?.(success)
+ options.complete?.(success)
+ } else {
+ let error : UniError = {
+ "errCode": 1101006,
+ "errMsg": UniErrors[1101006]!,
+ "errSubject": UniError_SaveVideoToPhotosAlbum
+ }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+}
+
+export const compressVideo : CompressVideo = function (options : CompressVideoOptions) {
+ transcodeVideo(options)
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/libs/nativeobj-preview-release.aar b/uni_modules/uni-media/utssdk/app-android/libs/nativeobj-preview-release.aar
new file mode 100644
index 0000000000000000000000000000000000000000..50b20482c6092006bd2913eaeef07f2b4e6de7d3
Binary files /dev/null and b/uni_modules/uni-media/utssdk/app-android/libs/nativeobj-preview-release.aar differ
diff --git a/uni_modules/uni-media/utssdk/app-android/res/anim/slide_in_bottom.xml b/uni_modules/uni-media/utssdk/app-android/res/anim/slide_in_bottom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c0de2a5b0eccc3918e7aa01ab20bfe09d3adadb
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/anim/slide_in_bottom.xml
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/anim/slide_out_top.xml b/uni_modules/uni-media/utssdk/app-android/res/anim/slide_out_top.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7fba593bf0140d08929aca1cf789ad65c9d3a301
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/anim/slide_out_top.xml
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded.xml b/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a05570ccb67dc626f7908b1de7de17380f9ba19
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml b/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b976cd2923ce13c6dcc30b33023325175c964e0a
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet.xml b/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dafe2acc4f77cb09ddaaedbb73c38c9b02e70612
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet_night.xml b/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..87c48b77f5d956250b9f0986fd1bfc222a51f045
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/layout/action_sheet_night.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout.xml b/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cdbeeed3400ced711663dfd3e8a2967fd2dbc778
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout_night.xml b/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43751b2cca080ac7f0fb206224c299c881791bb8
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/layout/recyclerview_layout_night.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/values-zh/strings.xml b/uni_modules/uni-media/utssdk/app-android/res/values-zh/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18aeb020f5ef279466bfd634a100580f32dcd936
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/values-zh/strings.xml
@@ -0,0 +1,4 @@
+
+ Configuration
+ 取消
+
diff --git a/uni_modules/uni-media/utssdk/app-android/res/values/colors.xml b/uni_modules/uni-media/utssdk/app-android/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a206cb7cdda0ef6b5b967e9e886a96033cfe460b
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/values/colors.xml
@@ -0,0 +1,46 @@
+
+
+
+ #FFFFFF
+ #efefef
+
+ #DEDEDE
+ #FFFFFF
+
+ #1C1C1C
+ #272727
+
+
+
+ #000000
+ #F6F6F6
+
+
+ #696969
+ #D8D8D8
+
+
+ #F6F6F6
+ #1c1c1c
+
+
+ #000000
+ #CFCFCF
+
+ #808080
+ #CFCFCF
+
+ #E0E0E0
+ #303030
+
+ #E3E3E3
+ #303030
+
+ #4A5E86
+ #7388a2
+
+ #a5a5a5
+ #a5a5a5
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/values/strings.xml b/uni_modules/uni-media/utssdk/app-android/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d84d4991016f203d38ec63a724ab959ce899c2d
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/values/strings.xml
@@ -0,0 +1,5 @@
+
+
+ Configuration
+ Cancel
+
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/res/values/styles.xml b/uni_modules/uni-media/utssdk/app-android/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8fd963b14853d9dacaa9e1b838666f3026e9a9dd
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/res/values/styles.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts b/uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
new file mode 100644
index 0000000000000000000000000000000000000000..723b1e0e474dd2242b5badfb2742e28f3a60d091
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
@@ -0,0 +1,439 @@
+import {
+ ChooseImageOptions, ChooseImageSuccessCallback, ChooseImageCropOptions,
+ ChooseVideoOptions, ChooseVideoSuccessCallback,
+ GetVideoInfoSuccessCallback,
+} from "../../interface.uts"
+import {
+ UniError_ChooseImage, UniError_ChooseVideo,
+ UniErrors
+} from "../../unierror.uts"
+import { getVideoMetadata } from "./MediaUtils.uts"
+import { uniChooseImage, CODE_CAMERA_ERROR, CODE_GALLERY_ERROR, CODE_GET_IMAGE_INFO_CODE, uniChooseVideo } from "../../ChooseImageUtils.uts"
+import { getUniActivity } from "io.dcloud.uts.android";
+import Intent from 'android.content.Intent';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import File from 'java.io.File';
+import MediaStore from 'android.provider.MediaStore';
+import IMGEditActivity from "io.dcloud.uts.gallery.imageedit.IMGEditActivity";
+import Media from "io.dcloud.uts.dmcbig.mediapicker.entity.Media";
+import Uri from 'android.net.Uri';
+import Parcelable from 'android.os.Parcelable';
+import FileProvider from 'androidx.core.content.FileProvider';
+import Build from 'android.os.Build';
+import Manifest from 'android.Manifest';
+import Listener from 'io.dcloud.uts.androidtranscoder.MediaTranscoder.Listener';
+import MediaTranscoder from 'io.dcloud.uts.androidtranscoder.MediaTranscoder';
+import MediaFormatStrategyPresets from 'io.dcloud.uts.androidtranscoder.format.MediaFormatStrategyPresets';
+import CompressUtil from 'io.dcloud.uts.util.CompressUtil';
+
+const GALLERY_MEDIA_PICKER_RESULT = 1004;
+
+export function chooseMediaImage(option : ChooseImageOptions) {
+ uniChooseImage(option, function (count : number, compressed : boolean, index : number) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ let requestPermissionList : Array = [Manifest.permission.CAMERA]
+ if (index == 1) {
+ requestPermissionList = [Manifest.permission.READ_EXTERNAL_STORAGE]
+ if (getUniActivity()!.getApplicationInfo().targetSdkVersion >= 33) {
+ requestPermissionList = ["android.permission.READ_MEDIA_IMAGES"]
+ }
+ }
+ UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, requestPermissionList, (a : boolean, b : string[]) => {
+ if (index == 0) {
+ openCameraForImage(option, compressed)
+ } else {
+ openAlbumForImage(option, count, 100)
+ }
+ }, (a : boolean, b : string[]) => {
+ // 失败回调
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101005, "errMsg": UniErrors[1101005]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ })
+ } else {
+ if (index == 0) {
+ openCameraForImage(option, compressed)
+ } else if (index == 1) {
+ openAlbumForImage(option, count, 101)
+ }
+ }
+ })
+}
+
+var cropFunction : ((requestCode : Int, resultCode : Int, data ?: Intent) => void) | null = null
+var takeCameraFunction : ((requestCode : Int, resultCode : Int, data ?: Intent) => void) | null = null
+
+function openCameraForImage(option : ChooseImageOptions, compressed : boolean) {
+ const cameraCode = 22;
+ const IMAGE_CAPTURE_EDIT = 5011;
+ if (cropFunction != null) {
+ UTSAndroid.offAppActivityResult(cropFunction!)
+ }
+ if (takeCameraFunction != null) {
+ UTSAndroid.offAppActivityResult(takeCameraFunction!)
+ }
+ let cameraPath = (UTSAndroid.getAppTempPath()! + "camera/" + System.currentTimeMillis() + ".jpg") // .jpg为默认配置
+ try {
+ let picFile = new File(cameraPath);
+ if (!picFile.getParentFile().exists()) {
+ picFile.getParentFile().mkdirs()
+ }
+
+ cropFunction = (requestCode : Int, resultCode : Int, data ?: Intent) => {
+ if (requestCode == IMAGE_CAPTURE_EDIT) {
+ UTSAndroid.offAppActivityResult(cropFunction!)
+ if (resultCode == -1) {
+ let success : ChooseImageSuccessCallback = {
+ "errSubject": "uni-chooseImage",
+ "tempFilePaths": ["file://" + cameraPath],
+ "errMsg": "chooseImage:ok",
+ "tempFiles": [{ "path": "file://" + cameraPath, "size": picFile.length() }]
+ }
+ option.success?.(success)
+ option.complete?.(success)
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101007, "errMsg": UniErrors[1101007]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ }
+ }
+
+ takeCameraFunction = (requestCode : Int, resultCode : Int, data ?: Intent) => {
+ if (cameraCode == requestCode) {
+ UTSAndroid.offAppActivityResult(takeCameraFunction!)
+ if (resultCode == -1) {
+ if (picFile.exists()) {
+ // 图片裁切， 宽高都存在，且都大于0
+ if (option.crop != null && option.crop!.height != null && option.crop!.width != null && option.crop!.height! > 0 && option.crop!.width > 0) {
+ let media = new Media(cameraPath,
+ "",
+ System.currentTimeMillis(),
+ MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE,
+ 1,
+ /* IMGEditActivity.CAMERA_SCENE, */ -1001,
+ picFile.getParent());
+ let cropIntent = new Intent(getUniActivity(), IMGEditActivity().javaClass)
+ let mUri = Uri.parse("file://" + media.path);
+ cropIntent.putExtra("IMAGE_URI", mUri);
+ cropIntent.putExtra("IMAGE_MEDIA_ID", media.id);
+ cropIntent.putExtra("IMAGE_INDEX", 0); // 传入当前的index，修改结束后方便替换
+ cropIntent.putExtra("IMAGE_CROP", JSON.stringify(option.crop!!));
+ UTSAndroid.onAppActivityResult(cropFunction!)
+ cropIntent.putExtra(/* IMGEditActivity.EXTRA_IMAGE_SAVE_PATH */"IMAGE_SAVE_PATH", media.path);
+ getUniActivity()!!.startActivityForResult(cropIntent, IMAGE_CAPTURE_EDIT.toInt());
+ getUniActivity()!!.overridePendingTransition(0, 0);
+ } else {
+ if (compressed) {
+ cameraPath = CompressUtil.compressImage(cameraPath, cameraPath, false, getUniActivity()!!)
+ picFile = new File(cameraPath)
+ }
+ let success : ChooseImageSuccessCallback = {
+ "errSubject": "uni-chooseImage",
+ "tempFilePaths": ["file://" + cameraPath],
+ "errMsg": "chooseImage:ok",
+ "tempFiles": [{ "path": "file://" + cameraPath, "size": picFile.length() }]
+ }
+ option.success?.(success)
+ option.complete?.(success)
+ }
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101008, "errMsg": UniErrors[1101008]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101008, "errMsg": UniErrors[1101008]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ }
+ }
+ UTSAndroid.onAppActivityResult(takeCameraFunction!)
+ let picUri : Uri = FileProvider.getUriForFile(getUniActivity()!, getUniActivity()!.packageName + ".dc.fileprovider", picFile);
+ let intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, picUri);
+ getUniActivity()?.startActivityForResult(intent, cameraCode.toInt())
+ } catch (e : Exception) { }
+}
+
+var albumFunction : ((requestCode : Int, resultCode : Int, data ?: Intent) => void) | null = null
+
+/**
+ *
+ * option
+ * count
+ * type PICKER_IMAGE = 100 PICKER_VIDEO = 102 PICKER_IMAGE_VIDEO = 101
+ */
+function openAlbumForImage(option : ChooseImageOptions, count : number, type : number) {
+ if (albumFunction != null) {
+ UTSAndroid.offAppActivityResult(albumFunction!)
+ }
+ albumFunction = (requestCode : Int, resultCode : Int, data ?: Intent) => {
+ if (requestCode == GALLERY_MEDIA_PICKER_RESULT) {
+ UTSAndroid.offAppActivityResult(albumFunction!)
+ let picPaths : Array = []
+ let picTempPathJson : Array = []
+ if (data != null) {
+ let selectMediaResult : kotlin.collections.ArrayList | null = data!!.getParcelableArrayListExtra("select_result");
+ if (selectMediaResult != null) {
+ selectMediaResult.forEach((current) => {
+ let path = (current as Media).path;
+ picPaths.push("file://" + (current as Media).path);
+ let tempPathJson = {}
+ tempPathJson["path"] = "file://" + path
+ try {
+ tempPathJson["size"] = new File(path).length()
+ } catch (e) { }
+ picTempPathJson.push(tempPathJson)
+ })
+ }
+ }
+ if (picPaths.length > 0) {
+ let success : ChooseImageSuccessCallback = {
+ "errSubject": "uni-chooseImage",
+ "tempFilePaths": picPaths,
+ "errMsg": "chooseImage:ok",
+ "tempFiles": picTempPathJson
+ }
+ option.success?.(success)
+ option.complete?.(success)
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseImage, "errCode": 1101001, "errMsg": UniErrors[1101001]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ }
+ }
+ UTSAndroid.onAppActivityResult(albumFunction!)
+ openGalleryActivity(count, type, false, option.sizeType, option.crop);
+}
+
+export function chooseMediaVideo(options : ChooseVideoOptions) {
+ uniChooseVideo(options, (count : number, compressed : boolean, index : number) => {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ let requestPermissionList : Array = [Manifest.permission.CAMERA]
+ if (index == 1) {
+ requestPermissionList = [Manifest.permission.READ_EXTERNAL_STORAGE]
+ if (getUniActivity()!.getApplicationInfo().targetSdkVersion >= 33) {
+ requestPermissionList = ["android.permission.READ_MEDIA_VIDEO"]
+ }
+ }
+ UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, requestPermissionList, (a : boolean, b : string[]) => {
+ if (index == 0) {
+ openCameraForVideo(options, compressed)
+ } else {
+ openAlbumForVideo(options, count, 102, compressed)
+ }
+ }, (a : boolean, b : string[]) => {
+ // 失败回调
+ if (index == 0) {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101005, "errMsg": UniErrors[1101005]! }
+ options.fail?.(error)
+ options.complete?.(error)
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101005, "errMsg": UniErrors[1101005]! }
+ options.fail?.(error)
+ options.complete?.(error)
+ }
+ })
+ } else {
+ if (index == 0) {
+ openCameraForVideo(options, compressed)
+ } else if (index == 1) {
+ openAlbumForVideo(options, count, 102, compressed)
+ }
+ }
+ })
+}
+
+var takeVideoFunction : ((requestCode : Int, resultCode : Int, data ?: Intent) => void) | null = null
+
+function openCameraForVideo(option : ChooseVideoOptions, compressed : boolean) {
+ const cameraCode = 22;
+
+ if (takeVideoFunction != null) {
+ UTSAndroid.offAppActivityResult(takeVideoFunction!)
+ }
+ let cameraPath = (UTSAndroid.getAppTempPath()! + "camera/" + System.currentTimeMillis() + ".mp4") // .mp4为默认配置
+ try {
+ let picFile = new File(cameraPath);
+ if (!picFile.getParentFile().exists()) {
+ picFile.getParentFile().mkdirs()
+ }
+ takeVideoFunction = (requestCode : Int, resultCode : Int, data ?: Intent) => {
+ if (cameraCode == requestCode) {
+ UTSAndroid.offAppActivityResult(takeVideoFunction!)
+ if (resultCode == -1) {
+ if (picFile.exists()) {
+ if (compressed) {
+ // cameraPath = CompressUtil.compressImage(cameraPath, cameraPath, false, getUniActivity()!!)
+ // picFile = new File(cameraPath)
+ let outPath = (UTSAndroid.getAppTempPath()! + "camera/" + System.currentTimeMillis() + ".mp4")
+ MediaTranscoder.getInstance().transcodeVideo(cameraPath, outPath, MediaFormatStrategyPresets.createAndroid720pStrategy(2, 1.0), new MediaTranscoderListener(option, cameraPath, outPath))
+ } else {
+ var metadata : GetVideoInfoSuccessCallback | null = null
+ let result = getVideoMetadata(cameraPath)
+ if (result instanceof GetVideoInfoSuccessCallback) {
+ metadata = result as GetVideoInfoSuccessCallback
+ }
+ let success : ChooseVideoSuccessCallback = {
+ tempFilePath: "file://" + cameraPath,
+ width: metadata == null ? 0 : metadata!.width,
+ height: metadata == null ? 0 : metadata!.height,
+ size: metadata == null ? 0 : metadata!.size,
+ duration: metadata == null ? 0 : metadata!.duration,
+ }
+ option.success?.(success)
+ option.complete?.(success)
+ }
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101008, "errMsg": UniErrors[1101008]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ } else {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101008, "errMsg": UniErrors[1101008]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ }
+ }
+ }
+ UTSAndroid.onAppActivityResult(takeVideoFunction!)
+ let picUri : Uri = FileProvider.getUriForFile(getUniActivity()!, getUniActivity()!.packageName + ".dc.fileprovider", picFile);
+ let intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, picUri);
+ if (option.maxDuration != null && option.maxDuration! > 0) {
+ intent.putExtra(MediaStore.EXTRA_DURATION_LIMIT, option.maxDuration!);
+ }
+ if (option.camera != null && option.camera! == "front") {
+ intent.putExtra("android.intent.extras.CAMERA_FACING", 1);//前置摄像
+ } else {
+ intent.putExtra("android.intent.extras.CAMERA_FACING", 0);//后置摄像
+ }
+ getUniActivity()?.startActivityForResult(intent, cameraCode.toInt())
+ } catch (e : Exception) { }
+}
+
+class MediaTranscoderListener implements Listener {
+ option : ChooseVideoOptions
+ inPath : string
+ outPath : string
+ constructor(option : ChooseVideoOptions, inPath : string, outPath : string) {
+ this.option = option
+ this.inPath = inPath
+ this.outPath = outPath
+ }
+ override onTranscodeProgress(progress : Double) {
+
+ }
+
+ override onTranscodeCompleted() {
+ this.deleteInPath()
+ var metadata : GetVideoInfoSuccessCallback | null = null
+ let result = getVideoMetadata(this.outPath)
+ if (result instanceof GetVideoInfoSuccessCallback) {
+ metadata = result as GetVideoInfoSuccessCallback
+ }
+ let success : ChooseVideoSuccessCallback = {
+ tempFilePath: "file://" + this.outPath,
+ width: metadata == null ? 0 : metadata!.width,
+ height: metadata == null ? 0 : metadata!.height,
+ size: metadata == null ? 0 : metadata!.size,
+ duration: metadata == null ? 0 : metadata!.duration,
+ }
+ this.option.success?.(success)
+ this.option.complete?.(success)
+ }
+
+ override onTranscodeCanceled() {
+ this.deleteInPath()
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101004, "errMsg": UniErrors[1101004]! }
+ this.option.fail?.(error)
+ this.option.complete?.(error)
+ }
+
+ override onTranscodeFailed(exception : Exception) {
+ this.deleteInPath()
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101010, "errMsg": UniErrors[1101010]! + exception.toString() }
+ this.option.fail?.(error)
+ this.option.complete?.(error)
+ }
+
+ deleteInPath() {
+ let file = new File(this.inPath)
+ if (file.exists()) {
+ file.delete()
+ }
+ }
+}
+
+var openAlbumFunction : ((requestCode : Int, resultCode : Int, data ?: Intent) => void) | null = null
+
+function openAlbumForVideo(option : ChooseVideoOptions, count : number, type : number, compressed : boolean) {
+ if (openAlbumFunction != null) {
+ UTSAndroid.offAppActivityResult(openAlbumFunction!)
+ }
+ openAlbumFunction = (requestCode : Int, resultCode : Int, data ?: Intent) => {
+ if (requestCode == GALLERY_MEDIA_PICKER_RESULT) {
+ UTSAndroid.offAppActivityResult(openAlbumFunction!)
+ let picPaths = ""
+ if (data != null) {
+ let selectMediaResult : kotlin.collections.ArrayList | null = data!!.getParcelableArrayListExtra("select_result");
+ if (selectMediaResult != null && selectMediaResult!.size > 0) {
+ picPaths = (selectMediaResult![0] as Media).path
+ }
+ }
+ if (picPaths.isEmpty()) {
+ let error : UniError = { "errSubject": UniError_ChooseVideo, "errCode": 1101001, "errMsg": UniErrors[1101001]! }
+ option.fail?.(error)
+ option.complete?.(error)
+ } else {
+ var metadata : GetVideoInfoSuccessCallback | null = null
+ let result = getVideoMetadata(picPaths)
+ if (result instanceof GetVideoInfoSuccessCallback) {
+ metadata = result as GetVideoInfoSuccessCallback
+ }
+ let success : ChooseVideoSuccessCallback = {
+ tempFilePath: "file://" + picPaths,
+ width: metadata == null ? 0 : metadata!.width,
+ height: metadata == null ? 0 : metadata!.height,
+ size: metadata == null ? 0 : metadata!.size,
+ duration: metadata == null ? 0 : metadata!.duration,
+ }
+ option.success?.(success)
+ option.complete?.(success)
+ }
+ }
+ }
+ UTSAndroid.onAppActivityResult(openAlbumFunction!)
+ openGalleryActivity(count, type, compressed, null, null);
+}
+
+function openGalleryActivity(count : number, type : number, compressed : boolean, sizeType : (string[]) | null, crop : ChooseImageCropOptions | null) {
+ let selected : Array = [];// 已选中的图片
+ let maximum = -1;
+ let editable = true; // 是否可编辑，对应editable
+ let doneBtnText = "" // 完成按钮文字可编辑
+ // let compressed = false; // 视频压缩，对应“videoCompress”
+
+ let albumIntent = new Intent()
+ albumIntent.setClassName(getUniActivity()!!, "io.dcloud.uts.dmcbig.mediapicker.PickerActivity");
+ albumIntent.putExtra(/* SELECT_MODE = */"select_mode",/* PICKER_IMAGE_VIDEO = */type)
+ albumIntent.putExtra(/* SINGLE_SELECT = */"single_select", false)
+ albumIntent.putExtra(/* COMPRESSED = */"COMPRESSED", compressed)
+ albumIntent.putExtra(/* MAX_SELECT_COUNT = */"max_select_count", count)
+ // albumIntent.putExtra(/* DEFAULT_SELECTED_LIST = */"default_list",null); // 暂未对非uni的属性进行支持
+ // albumIntent.putExtra(/* SELECTED_MAX_CALLBACK_ID = */"select_max_cb_id","") // 暂未对非uni的属性进行支持
+ // albumIntent.putExtra(/* DONE_BUTTON_TEXT = */"done_button_text","") // 暂未对非uni的属性进行支持
+ if (sizeType != null) {
+ albumIntent.putExtra(/* PickerConfig.SIZE_TYPE */"size_type", JSON.stringify(sizeType!))
+ }
+ albumIntent.putExtra(/* DOC_PATH = */"doc_path", UTSAndroid.getAppTempPath()! + "gallery/")
+ albumIntent.putExtra(/* IMAGE_EDITABLE = */"image_editable", true);
+ if (crop != null && crop!.height != null && crop!.width != null && crop!.height! > 0 && crop!.width > 0) {
+ albumIntent.putExtra(/* IMAGE_CROP = */"image_crop", JSON.stringify(crop))
+ albumIntent.putExtra(/* MAX_SELECT_COUNT = */"max_select_count", 1) // 编辑模式下只能选中一个
+ }
+ getUniActivity()!!.startActivityForResult(albumIntent, GALLERY_MEDIA_PICKER_RESULT.toInt())
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts b/uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts
new file mode 100644
index 0000000000000000000000000000000000000000..496eeba8cd0845073e9d19a46b57ee1df3f5e86d
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts
@@ -0,0 +1,299 @@
+import {
+ CompressImageSuccessCallback, CompressImageOptions,
+ CompressVideoOptions, CompressVideoSuccessCallback
+} from "../../interface.uts"
+import {
+ UniError_ChooseImage, UniError_ChooseVideo, UniError_CompressVideo,UniError_CompressImage,
+ UniErrors
+} from "../../unierror.uts"
+import { uniChooseImage, CODE_CAMERA_ERROR, CODE_GALLERY_ERROR, CODE_GET_IMAGE_INFO_CODE } from "../../ChooseImageUtils.uts"
+import TextUtils from 'android.text.TextUtils';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import File from 'java.io.File';
+import BitmapFactory from 'android.graphics.BitmapFactory';
+import Bitmap from 'android.graphics.Bitmap';
+import Matrix from 'android.graphics.Matrix';
+import FileOutputStream from 'java.io.FileOutputStream';
+import ExifInterface from 'io.dcloud.uts.util.ExifInterface';
+import Field from 'java.lang.reflect.Field';
+import MediaTranscoder from 'io.dcloud.uts.androidtranscoder.MediaTranscoder';
+import MediaFormatStrategyPresets from 'io.dcloud.uts.androidtranscoder.format.MediaFormatStrategyPresets';
+import Listener from 'io.dcloud.uts.androidtranscoder.MediaTranscoder.Listener';
+
+// export function threadCompress() {
+// }
+export function transcodeImage(options : CompressImageOptions) {
+ if (options.src.length == 0) {
+ let fail : UniError = { "errCode": 1101003, "errMsg": UniErrors[1101003]!, "errSubject": UniError_CompressImage }
+ options.fail?.(fail)
+ options.complete?.(fail)
+ return
+ }
+ let compressOption = new CompressOptions()
+ compressOption.src = UTSAndroid.convert2AbsFullPath(options.src)
+ let srcFile = new File(compressOption.src)
+ if (!srcFile.exists()) {
+ let fail : UniError = { "errCode": 1101003, "errMsg": UniErrors[1101003]!, "errSubject": UniError_CompressImage }
+ options.fail?.(fail)
+ options.complete?.(fail)
+ return
+ }
+ if (options.quality != null && options.quality! > 0) {
+ compressOption.quality = options.quality!
+ }
+ if (options.rotate != null && options.rotate! >= 0) {
+ compressOption.rotate = options.rotate!
+ }
+ var widthStr = ""
+ var heightStr = ""
+ if (options.compressedWidth != null) {
+ compressOption.width = options.compressedWidth!
+ } else {
+ widthStr = TextUtils.isEmpty(options.width) ? "auto" : options.width!
+ }
+ if (options.compressedHeight != null) {
+ compressOption.height = options.compressedHeight!
+ } else {
+ heightStr = TextUtils.isEmpty(options.height) ? "auto" : options.height!
+ }
+ if (compressOption.width <= 0 || compressOption.height <= 0) {
+ getHeightAndWidth(compressOption, widthStr, heightStr)
+ }
+ let bitmapOptions = new BitmapFactory.Options()
+ bitmapOptions.inJustDecodeBounds = false;
+ if (srcFile.length() > 1500000) {
+ bitmapOptions.inSampleSize = 2
+ } else {
+ bitmapOptions.inSampleSize = 1
+ }
+ var srcBitmap : Bitmap | null = null
+ try {
+ srcBitmap = BitmapFactory.decodeFile(compressOption.src, bitmapOptions)
+ } catch (e) {
+ }
+ if (srcBitmap == null) {
+ let fail : UniError = { "errCode": 1101009, "errMsg": UniErrors[1101009]!, "errSubject": UniError_CompressImage }
+ options.fail?.(fail)
+ options.complete?.(fail)
+ return
+ }
+
+ if (compressOption.isZoom && compressOption.width > 0 && compressOption.height > 0) {
+ let matrix = new Matrix()
+ let scaleW = compressOption.width / srcBitmap.getWidth()
+ let scaleH = compressOption.height / srcBitmap.getHeight()
+ matrix.setScale(scaleW.toFloat(), scaleH.toFloat())
+ srcBitmap = Bitmap.createBitmap(srcBitmap!, 0, 0, srcBitmap.getWidth(), srcBitmap.getHeight(), matrix, false)
+ }
+ if (compressOption.rotate > 0) {
+ let matrix = new Matrix()
+ matrix.postRotate(compressOption.rotate.toFloat())
+ srcBitmap = Bitmap.createBitmap(srcBitmap!, 0, 0, srcBitmap.getWidth(), srcBitmap.getHeight(), matrix, false)
+ }
+ // 保存
+ let destPath = UTSAndroid.getAppTempPath()! + "compress/" + System.currentTimeMillis() + ".jpg"
+ let destFile = new File(destPath)
+ if (!destFile.getParentFile().exists()) {
+ destFile.getParentFile().mkdirs()
+ }
+ try {
+ let fos = new FileOutputStream(destFile)
+ srcBitmap!.compress(Bitmap.CompressFormat.JPEG, compressOption.quality.toInt(), fos);
+ fos.close()
+ if (!srcBitmap!.isRecycled()) {
+ srcBitmap!.recycle()
+ }
+ saveExif(options.src, destPath)
+ let success : CompressImageSuccessCallback = { "tempFilePath": "file://" + destPath }
+ options.success?.(success)
+ options.complete?.(success)
+ } catch (ex) {
+ let fail : UniError = { "errCode": 1101009, "errMsg": UniErrors[1101009]!, "errSubject": UniError_CompressImage }
+ options.fail?.(fail)
+ options.complete?.(fail)
+ }
+}
+
+function saveExif(oldFilePath : string, newFilePath : string) {
+ try {
+ let oldExif = new ExifInterface(oldFilePath);
+ let newExif = new ExifInterface(newFilePath);
+ let cls = oldExif.javaClass;
+ let fields = cls.getFields();
+ fields.forEach((field : Field) => {
+ let fieldName = field.getName();
+ if (!TextUtils.isEmpty(fieldName) && fieldName.startsWith("TAG")) {
+ var o = field.get(cls);
+ if (o != null) {
+ var fieldValue = o.toString();
+ var attribute = oldExif.getAttribute(fieldValue);
+ if (attribute != null) {
+ newExif.setAttribute(fieldValue, attribute);
+ }
+ }
+ }
+ })
+ // for (Field field : fields) {
+
+ // }
+ newExif.saveAttributes();
+ } catch (e) {
+
+ }
+}
+
+function getHeightAndWidth(compressOption : CompressOptions, widthStr : string, heightStr : string) {
+ let bopt = new BitmapFactory.Options()
+ bopt.inJustDecodeBounds = true
+ BitmapFactory.decodeFile(compressOption.src, bopt)
+ let bitmapWidth = bopt.outWidth
+ let bitmapHeight = bopt.outHeight
+ if (bitmapHeight <= 0 || bitmapWidth <= 0) {
+ return
+ }
+ if (widthStr.toLowerCase() == "auto" && heightStr.toLowerCase() == "auto") {
+ compressOption.isZoom = false
+ compressOption.width = bitmapWidth
+ compressOption.height = bitmapHeight
+ } else if (widthStr.toLowerCase() == "auto") {
+ compressOption.isZoom = true
+ compressOption.height = str2Float(heightStr, bitmapHeight, bitmapHeight)
+ compressOption.width = bitmapWidth * compressOption.height / bitmapHeight
+ } else if (heightStr.toLowerCase() == "auto") {
+ compressOption.isZoom = true
+ compressOption.width = str2Float(widthStr, bitmapWidth, bitmapWidth)
+ compressOption.height = bitmapHeight * compressOption.width / bitmapWidth
+ } else {
+ compressOption.isZoom = true
+ compressOption.width = str2Float(widthStr, bitmapWidth, bitmapWidth)
+ compressOption.height = str2Float(heightStr, bitmapHeight, bitmapHeight)
+ }
+}
+
+function str2Float(valuestr : string, realValue : number, defValue : number) : number {
+ if (TextUtils.isEmpty(valuestr)) {
+ return defValue
+ }
+ valuestr = valuestr.toLowerCase()
+ if (valuestr.endsWith("px")) {
+ valuestr == valuestr.substring(0, valuestr.length - 2);
+ }
+ try {
+ return Integer.parseInt(valuestr)
+ } catch (e) {
+ if (valuestr.endsWith("%")) {
+ valuestr = valuestr.substring(0, valuestr.length - 1)
+ }
+ try {
+ return realValue * Integer.parseInt(valuestr) / 100
+ } catch (e) {
+ return defValue
+ }
+ }
+}
+
+class CompressOptions {
+ src : string = ""
+ dst : string = ""
+ format : string = ""
+ quality : number = 80
+ width : number = 0
+ height : number = 0
+ rotate : number = 0
+ isZoom : boolean = false
+}
+
+export function transcodeVideo(options : CompressVideoOptions) {
+ let inPath = UTSAndroid.convert2AbsFullPath(options.src)
+ let inFile = new File(inPath)
+ if (!inFile.exists()) {
+ let fail : UniError = { "errCode": 1101003, "errMsg": UniErrors[1101003]!, "errSubject": UniError_CompressVideo }
+ options.fail?.(fail)
+ options.complete?.(fail)
+ return
+ }
+ var compressLevel = 1
+ switch (options.quality) {
+ case "low":
+ compressLevel = 3
+ break
+ case "medium":
+ compressLevel = 2
+ break
+ default:
+ compressLevel = 1
+ break
+ }
+
+ var resolution = options.resolution?.toDouble();
+
+ if (resolution == null) {
+ resolution = 1.0
+ } else if (resolution! > 1 || resolution! <= 0) {
+ resolution = 1.0
+ }
+ let fileName = getFileName(inPath);
+ let outPath = UTSAndroid.getAppTempPath()! + "compress/" + (fileName == "" ? (System.currentTimeMillis() + ".mp4") : fileName)
+ let outFile = new File(outPath)
+ if (!outFile.getParentFile().exists()) {
+ outFile.getParentFile().mkdirs()
+ }
+
+ MediaTranscoder.getInstance().transcodeVideo(inPath, outPath, MediaFormatStrategyPresets.createAndroid720pStrategy(compressLevel, resolution!), new MediaTranscoderListener(inPath, outPath, options))
+}
+
+function getFileName(path : string) : string {
+ const array = path.split("/")
+ if (array.length > 0) {
+ return array[array.length - 1]
+ }
+ return ""
+}
+
+class MediaTranscoderListener implements Listener {
+ inPath : string
+ outPath : string
+ options : CompressVideoOptions
+ constructor(inPath : string, outPath : string, options : CompressVideoOptions) {
+ this.inPath = inPath
+ this.outPath = outPath;
+ this.options = options
+ }
+ override onTranscodeProgress(progress : Double) {
+
+ }
+
+ override onTranscodeCompleted() {
+ let outFile = new File(this.outPath)
+ if (outFile.exists()) {
+ let success : CompressVideoSuccessCallback = {
+ tempFilePath: "file://" + this.outPath,
+ size: outFile.length()
+ }
+ this.options.success?.(success)
+ this.options.complete?.(success)
+ } else {
+ let error : UniError = {
+ "errSubject": UniError_CompressVideo, "errCode": 1101004, "errMsg": UniErrors[1101004]!
+ }
+ this.options.fail?.(error)
+ this.options.complete?.(error)
+ }
+ }
+
+ override onTranscodeCanceled() {
+ let error : UniError = {
+ "errSubject": UniError_CompressVideo, "errCode": 1101004, "errMsg": UniErrors[1101004]!
+ }
+ this.options.fail?.(error)
+ this.options.complete?.(error)
+ }
+
+ override onTranscodeFailed(exception : Exception) {
+ let error : UniError = {
+ "errSubject": UniError_CompressVideo, "errCode": 1101010, "errMsg": UniErrors[1101010]! + exception.toString()
+ }
+ this.options.fail?.(error)
+ this.options.complete?.(error)
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/utils/MediaUtils.uts b/uni_modules/uni-media/utssdk/app-android/utils/MediaUtils.uts
new file mode 100644
index 0000000000000000000000000000000000000000..4822b2d5685e602efe3569105a1c49735fcd8e60
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/utils/MediaUtils.uts
@@ -0,0 +1,104 @@
+import {
+ ChooseImageOptions, ChooseImageSuccessCallback,
+ ChooseVideoOptions, ChooseVideoSuccessCallback,
+ GetVideoInfoOptions, GetVideoInfoSuccessCallback,
+} from "../../interface.uts"
+import {
+ UniError_GetVideoInfo,
+ UniErrors
+} from "../../unierror.uts"
+import { uniChooseImage, CODE_CAMERA_ERROR, CODE_GALLERY_ERROR, CODE_GET_IMAGE_INFO_CODE, uniChooseVideo } from "../../ChooseImageUtils.uts"
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import File from 'java.io.File';
+import MediaMetadataRetriever from 'android.media.MediaMetadataRetriever';
+import BigDecimal from 'java.math.BigDecimal';
+import MediaExtractor from 'android.media.MediaExtractor';
+import MediaFormat from 'android.media.MediaFormat';
+import TextUtils from 'android.text.TextUtils';
+
+export function getVideoMetadata(src : string) : any {
+ let videoInfo : GetVideoInfoSuccessCallback = {
+ duration: 0,
+ size: 0,
+ height: 0,
+ width: 0
+ }
+ let path = UTSAndroid.convert2AbsFullPath(src)
+ let videoFile = new File(path)
+ if (!videoFile.exists()) {
+ let error : UniError = { "errSubject": UniError_GetVideoInfo, "errCode": 1101003, "errMsg": UniErrors[1101003]! }
+ return error
+ }
+ videoInfo.size = videoFile.length()
+ try {
+ let retriever = new MediaMetadataRetriever()
+ retriever.setDataSource(path)
+ let durationStr : string | null = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+ let width : number | null = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toFloat()
+ let height : number | null = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toFloat()
+ let rotation : string | null = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)
+ if ("90" == rotation || "270" == rotation) {
+ videoInfo.width = height != null ? height! : 0
+ videoInfo.height = width != null ? width : 0
+ } else {
+ videoInfo.width = width != null ? width : 0
+ videoInfo.height = height != null ? height : 0
+ }
+ switch (rotation) {
+ case "90":
+ rotation = "right";
+ break;
+ case "270":
+ rotation = "left";
+ break;
+ case "180":
+ rotation = "down";
+ break;
+ default:
+ rotation = "up";
+ break;
+ }
+ var duration : number = 0
+ if (durationStr != null) {
+ try {
+ duration = durationStr.toFloat()
+ } catch (e) {
+ }
+ }
+ let big : BigDecimal = BigDecimal.valueOf(duration.toDouble() / 1000).setScale(2, BigDecimal.ROUND_HALF_UP)
+ videoInfo.duration = big.toFloat()
+ videoInfo.orientation = rotation!
+ let mimeType : string | null = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE);
+ videoInfo.type = mimeType
+ let bitrateStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE);
+ var bitrate : number | null = null
+ try {
+ if (bitrateStr != null) {
+ bitrate = (bitrateStr.toFloat() / 1000).toInt()
+ }
+ } catch (e) { }
+ videoInfo.bitrate = bitrate
+ var fpsNum : number | null = null
+ let fps : string | null = retriever.extractMetadata(32);
+ if (TextUtils.isEmpty(fps)) {
+ let extractor = new MediaExtractor()
+ extractor.setDataSource(path)
+ let trackCount = extractor.getTrackCount();
+ for (var i = 0; i < trackCount; i++) {
+ let mediaFormat = extractor.getTrackFormat(i.toInt());
+ let mimeType = mediaFormat.getString(MediaFormat.KEY_MIME);
+ if (!TextUtils.isEmpty(mimeType) && mimeType!!.startsWith("video/")) {
+ let frame = mediaFormat.getInteger(MediaFormat.KEY_FRAME_RATE);
+ fpsNum = frame
+ }
+ }
+ } else {
+ try { fpsNum = Math.ceil(((fps!!).toFloat() / (duration)) * 1000) } catch (e) { } // 沿用1.0设计，向上取整
+ }
+ videoInfo.fps = fpsNum
+ return videoInfo
+ } catch (e) {
+ let error : UniError = { "errSubject": UniError_GetVideoInfo, "errCode": 1101010, "errMsg": UniErrors[1101010]! + e.toString() }
+ return error
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-android/utils/showActionSheet.uts b/uni_modules/uni-media/utssdk/app-android/utils/showActionSheet.uts
new file mode 100644
index 0000000000000000000000000000000000000000..00cc519907412a46e43eb26301b5c8913eee1134
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/app-android/utils/showActionSheet.uts
@@ -0,0 +1,311 @@
+import AlertDialog from 'android.app.AlertDialog';
+import Activity from 'android.app.Activity';
+import Gravity from 'android.view.Gravity';
+import { UTSAndroid } from "io.dcloud.uts";
+
+import ViewGroup from 'android.view.ViewGroup';
+import View from 'android.view.View';
+import Color from 'android.graphics.Color';
+import ColorDrawable from 'android.graphics.drawable.ColorDrawable';
+
+import R from 'io.dcloud.uts.image.R';
+import TextView from 'android.widget.TextView';
+import LayoutInflater from 'android.view.LayoutInflater';
+
+import AppCompatTextView from 'androidx.appcompat.widget.AppCompatTextView';
+import LinearLayoutCompat from 'androidx.appcompat.widget.LinearLayoutCompat';
+
+import LinearLayoutManager from 'androidx.recyclerview.widget.LinearLayoutManager';
+import RecyclerView from 'androidx.recyclerview.widget.RecyclerView';
+
+
+
+// import { ShowActionSheetOptions, ShowActionSheetSuccess,ShowActionSheetFail} from '../interface.uts'
+
+
+export type ShowActionSheetOptions = {
+ /**
+ * 菜单标题
+ */
+ title : string | null,
+ /**
+ * 警示文案（同菜单标题, app无效）
+ */
+ alertText : string | null,
+ /**
+ * 按钮的文字数组
+ */
+ itemList : string[],
+ /**
+ * 按钮的文字颜色，字符串格式（iOS默认为系统控件颜色）
+ */
+ itemColor : string | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success : ((result : ShowActionSheetSuccess) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail : ((result : ShowActionSheetFail) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete : ((result : any) => void) | null
+}
+
+export type ShowActionSheetSuccess = {
+ tapIndex : number
+}
+export type ShowActionSheetFail = {
+ errCode : number,
+ errMsg : string,
+ errSubject : string
+}
+
+let uniActionSheet : UniActionSheet | null = null
+
+/**
+ * 弹出功能入口
+ */
+export function actionSheetImpl(activity : Activity, style : ShowActionSheetOptions) {
+ if (uniActionSheet != null) {
+ uniActionSheet?.dismiss()
+ }
+ uniActionSheet = new UniActionSheet(activity, style)
+ uniActionSheet?.show()
+}
+
+export function closeActionSheet() {
+ if (uniActionSheet != null) {
+ uniActionSheet!.dismiss()
+ }
+}
+
+
+/**
+ * UniActionSheet
+ * 功能实现
+ */
+export class UniActionSheet {
+
+ /**
+ * 宿主activity
+ */
+ hostActivity : Activity
+ /**
+ * 宿主样式
+ */
+ hostStyle : ShowActionSheetOptions
+ /**
+ * 标题组件
+ */
+ title : AppCompatTextView
+ /**
+ * 取消按钮
+ */
+ cancel : AppCompatTextView
+ /**
+ * 列表 recycler
+ */
+ myRecyclerView : RecyclerView
+ /**
+ * 列表 recycler Adapter
+ */
+ recyclerviewAdapter : ItemAdapter
+ /**
+ * title 组件
+ */
+ lineTitle : LinearLayoutCompat
+ /**
+ * 内容组件
+ */
+ lineContent : LinearLayoutCompat
+ /**
+ * 取消组件
+ */
+ lineCancel : LinearLayoutCompat
+ /**
+ * 构建后的dialog
+ */
+ alertDialog : AlertDialog
+
+ constructor(activity : Activity, style : ShowActionSheetOptions) {
+ this.hostActivity = activity
+ this.hostStyle = style
+
+ let adb = AlertDialog.Builder(this.hostActivity);
+
+ let v : View
+ if (UTSAndroid.getAppDarkMode()) {
+ v = LayoutInflater.from(this.hostActivity).inflate(R.layout.action_sheet_night, null)
+ } else {
+ v = LayoutInflater.from(this.hostActivity).inflate(R.layout.action_sheet, null)
+ }
+
+
+ this.title = v.findViewById(R.id.tvTitle)
+ this.cancel = v.findViewById(R.id.tvCancelAction)
+ this.lineTitle = v.findViewById(R.id.line_title)
+ this.lineContent = v.findViewById(R.id.line_content)
+ this.lineCancel = v.findViewById(R.id.line_cancel)
+ this.myRecyclerView = v.findViewById(R.id.myRecyclerview)
+ this.myRecyclerView.layoutManager = LinearLayoutManager(this.hostActivity)
+
+
+ if (style.title != null) {
+ this.lineTitle.setVisibility(View.VISIBLE)
+ this.title.setText(style.title)
+ }
+
+ // 构造最终的展示组件
+ adb.setView(v)
+ this.alertDialog = adb.create()
+ this.cancel.setOnClickListener(new CancelClickListener(this.alertDialog, this.hostStyle));
+
+ this.recyclerviewAdapter = new ItemAdapter(this.alertDialog, style)
+ this.myRecyclerView.adapter = this.recyclerviewAdapter
+ this.recyclerviewAdapter.notifyDataSetChanged()
+ }
+
+ /**
+ * 弹出actionsheet
+ */
+ show() {
+ this.alertDialog.window!.attributes.windowAnimations = R.style.DialogAnimations_SmileWindow
+ this.alertDialog.setCancelable(true)
+ this.alertDialog.window!.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM)
+ this.alertDialog.window!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ this.alertDialog.show()
+ }
+
+
+ dismiss() {
+ this.alertDialog.dismiss()
+ }
+
+}
+
+/**
+ * 列表选项点击事件监听
+ */
+class ItemClickListener extends View.OnClickListener {
+
+ host : AlertDialog
+ hostStyle : ShowActionSheetOptions
+ hostIndex : number
+
+ constructor(dialog : AlertDialog, style : ShowActionSheetOptions, index : number) {
+ super()
+ this.host = dialog
+ this.hostStyle = style
+ this.hostIndex = index
+ }
+
+ override onClick(v ?: View) : void {
+
+ var res : ShowActionSheetSuccess = {
+ tapIndex: this.hostIndex
+ }
+
+ this.hostStyle.success?.(res)
+ this.hostStyle.complete?.(res)
+
+ this.host.dismiss()
+
+ }
+}
+
+/**
+ * 取消按钮点击事件
+ */
+class CancelClickListener extends View.OnClickListener {
+
+ host : AlertDialog
+ hostStyle : ShowActionSheetOptions
+
+ constructor(dialog : AlertDialog, style : ShowActionSheetOptions) {
+ super()
+ this.host = dialog
+ this.hostStyle = style
+ }
+
+ override onClick(v ?: View) : void {
+
+ const res : ShowActionSheetFail = {
+ errCode: 0,
+ errSubject: 'uni-prompt',
+ errMsg: 'showActionSheet:fail cancel'
+ }
+ this.hostStyle.fail?.(res)
+ this.hostStyle.complete?.(res)
+
+ this.host.dismiss()
+
+ }
+}
+
+
+/**
+ * 列表数据适配器
+ */
+class ItemAdapter extends RecyclerView.Adapter{
+
+
+ mItemList : Array
+ hostStyle : ShowActionSheetOptions
+ hostDialog : AlertDialog
+
+ constructor(dialog : AlertDialog, style : ShowActionSheetOptions) {
+ super()
+ this.hostDialog = dialog
+ this.mItemList = style.itemList
+ this.hostStyle = style
+ }
+
+ /**
+ * view 持有容器
+ */
+ ViewHolder = class extends RecyclerView.ViewHolder {
+
+ itemName : TextView;
+ constructor(view : View) {
+ super(view);
+ itemName = view.findViewById(R.id.tvName) as TextView;
+ }
+ }
+
+ override onCreateViewHolder(
+ parent : ViewGroup,
+ viewType : Int
+ ) : ViewHolder {
+
+ let view : View
+ if (UTSAndroid.getAppDarkMode()) {
+ view =
+ LayoutInflater.from(parent.context).inflate(R.layout.recyclerview_layout_night, parent, false)
+ } else {
+ view =
+ LayoutInflater.from(parent.context).inflate(R.layout.recyclerview_layout, parent, false)
+ }
+
+ return ViewHolder(view)
+ }
+
+ override onBindViewHolder(holder : ViewHolder, position : Int) {
+ let perContent : String = mItemList[position]
+ holder.itemName.setText(perContent)
+ if (this.hostStyle.itemColor != null) {
+ try {
+ holder.itemName.setTextColor(Color.parseColor(this.hostStyle.itemColor))
+ } catch (e) {
+ }
+ }
+ holder.itemName.setOnClickListener(new ItemClickListener(this.hostDialog, this.hostStyle, position));
+ }
+
+ override getItemCount() : Int {
+ return mItemList.size
+ }
+
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/app-ios/index.uts b/uni_modules/uni-media/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-media/utssdk/interface.uts b/uni_modules/uni-media/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..80a348f790d845abed1935c72255a766c797cdbb
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/interface.uts
@@ -0,0 +1,794 @@
+
+
+export type ChooseImageSuccessCallback = {
+ /**
+ * 调用API的名称
+ */
+ errSubject : string,
+ errMsg : string,
+ tempFilePaths : Array,
+ tempFiles : any
+}
+
+export type ChooseImageCropOptions = {
+ /**
+ * 裁剪的宽度，单位为px，用于计算裁剪宽高比。
+ */
+ width : number;
+ /**
+ * 裁剪的高度，单位为px，用于计算裁剪宽高比。
+ */
+ height : number;
+ /**
+ * 取值范围为1-100，数值越小，质量越低（仅对jpg格式有效）。默认值为80。
+ * @defaultValue 80
+ */
+ quality : (number) | null;
+ /**
+ * 是否将width和height作为裁剪保存图片真实的像素值。默认值为true。注：设置为false时在裁剪编辑界面显示图片的像素值，设置为true时不显示。
+ * @type boolean
+ */
+ resize : (boolean) | null;
+}
+
+export type ChooseImageOptions = {
+ /**
+ * 最多可以选择的图片张数，app端不限制，微信小程序最多可支持20个。
+ * @defaultValue 9
+ */
+ count ?: (number) | null,
+ /**
+ * original 原图，compressed 压缩图，默认二者都有
+ * @type string | string []
+ * @defaultValue ['original','compressed']
+ */
+ sizeType ?: (string[]) | null,
+ /**
+ * album 从相册选图，camera 使用相机，默认二者都有
+ * @defaultValue ['album','camera']
+ */
+ sourceType ?: (string[]) | null,
+ /**
+ * 根据文件拓展名过滤，每一项都不能是空字符串。默认不过滤。仅H5支持
+ */
+ extension ?: (string[]) | null,
+ /**
+ * 图像裁剪参数，设置后 sizeType 失效。
+ */
+ crop ?: (ChooseImageCropOptions) | null,
+ /**
+ * 成功则返回图片的本地文件路径列表 tempFilePaths
+ */
+ success ?: ((callback : ChooseImageSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((callback : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((callback : any) => void) | null
+}
+
+export type ChooseImage = (options : ChooseImageOptions) => void
+
+export type PreviewImageSuccessCallback = {
+ errSubject : string,
+ errMsg : string
+}
+
+export type LongPressActionsSuccessData = {
+ /**
+ * 接口调用失败的回调函数
+ */
+ tapIndex : number,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ index : number
+};
+export type LongPressActionsOptions = {
+ /**
+ * 按钮的文字数组
+ */
+ itemList : string[],
+ /**
+ * 按钮的文字颜色，字符串格式，默认为"#000000"
+ */
+ itemColor : string | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success : ((result : LongPressActionsSuccessData) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail : ((result : any) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete : ((result : any) => void) | null
+};
+
+export type PreviewImageOptions = {
+ /**
+ * 当前显示图片的链接，不填则默认为 urls 的第一张
+ */
+ count ?: string | null,
+ /**
+ * current 为当前显示图片的链接/索引值，不填或填写的值无效则为 urls 的第一张。App平台在 1.9.5至1.9.8之间，current为必填。不填会报错
+ * @type string | number
+ */
+ current ?: any | null,
+ /**
+ * 需要预览的图片链接列表
+ */
+ urls : string[],
+ /**
+ * 图片指示器样式
+ * - default: 底部圆点指示器
+ * - number: 顶部数字指示器
+ * - none: 不显示指示器
+ * @type 'default' | 'number' | 'none'
+ */
+ indicator ?: string | null,
+ /**
+ * 是否可循环预览
+ * @type boolean
+ */
+ loop ?: boolean | null,
+ /**
+ * 长按图片显示操作菜单，如不填默认为保存相册，1.9.5 起支持。
+ */
+ longPressActions ?: LongPressActionsOptions | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : PreviewImageSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type PreviewImage = (options : PreviewImageOptions) => void;
+
+export type ClosePreviewImage = (options : ClosePreviewImageOptions) => void;
+export type ClosePreviewImageSuccessCallback = {
+ /**
+ * 错误信息
+ */
+ errMsg : string
+};
+
+export type ClosePreviewImageOptions = {
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : ClosePreviewImageSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type GetImageInfo = (options : GetImageInfoOptions) => void;
+export type GetImageInfoSuccessCallback = {
+ /**
+ * 图片宽度，单位px
+ */
+ width : number,
+ /**
+ * 图片高度，单位px
+ */
+ height : number,
+ /**
+ * 返回图片的本地路径
+ */
+ path : string,
+ /**
+ * 返回图片的方向
+ */
+ orientation : string | null,
+ /**
+ * 返回图片的格式
+ */
+ type : string | null
+};
+
+export type GetImageInfoOptions = {
+ /**
+ * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+ */
+ src : string,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : GetImageInfoSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type SaveImageToPhotosAlbum = (options : SaveImageToPhotosAlbumOptions) => void;
+
+export type SaveImageToPhotosAlbumSuccessCallback = {
+ /**
+ * 保存到相册的图片路径
+ */
+ path : string
+};
+
+export type SaveImageToPhotosAlbumOptions = {
+ /**
+ * 图片文件路径，可以是临时文件路径也可以是永久文件路径，不支持网络图片路径
+ */
+ filePath : string,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : SaveImageToPhotosAlbumSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+export type CompressImage = (options : CompressImageOptions) => void;
+export type CompressImageSuccessCallback = {
+ /**
+ * 压缩后图片的临时文件路径
+ */
+ tempFilePath : string
+};
+export type CompressImageOptions = {
+ /**
+ * 图片路径，图片的路径，可以是相对路径、临时文件路径、存储文件路径
+ */
+ src : string,
+ /**
+ * 压缩质量，范围0～100，数值越小，质量越低，压缩率越高（仅对jpg有效）
+ */
+ quality ?: number | null,
+ /**
+ * 旋转度数，范围0～360
+ */
+ rotate ?: number | null,
+ /**
+ * 缩放图片的宽度
+ */
+ width ?: string | null,
+ /**
+ * 缩放图片的高度
+ */
+ height ?: string | null,
+ /**
+ * 压缩后图片的高度，单位为px，若不填写则默认以compressedWidth为准等比缩放
+ */
+ compressedHeight ?: number | null,
+ /**
+ * 压缩后图片的宽度，单位为px，若不填写则默认以compressedHeight为准等比缩放。
+ */
+ compressedWidth ?: number | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : CompressImageSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type ChooseVideoSuccessCallback = {
+ /**
+ * 选定视频的临时文件路径
+ */
+ tempFilePath : string,
+ /**
+ * 选定的视频文件，仅H5支持
+ */
+ // tempFile: File|null,
+ /**
+ * 选定视频的时间长度
+ */
+ duration : number,
+ /**
+ * 选定视频的数据量大小
+ */
+ size : number,
+ /**
+ * 返回选定视频的长
+ */
+ height : number,
+ /**
+ * 返回选定视频的宽
+ */
+ width : number,
+ /**
+ * 包含扩展名的文件名称（仅H5支持）
+ */
+ // name: string | null
+};
+
+export type ChooseVideoOptions = {
+ /**
+ * album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera']
+ */
+ sourceType ?: (string[]) | null,
+ /**
+ * 是否压缩所选的视频源文件，默认值为true，需要压缩
+ * @type boolean
+ */
+ compressed ?: boolean | null,
+ /**
+ * 拍摄视频最长拍摄时间，单位秒。最长支持 60 秒
+ */
+ maxDuration ?: number | null,
+ /**
+ * 摄像切换
+ * - front: 前置摄像头
+ * - back: 后置摄像头
+ * @type 'front' | 'back'
+ */
+ camera ?: string | null,
+ /**
+ * 根据文件拓展名过滤，每一项都不能是空字符串。默认不过滤。
+ */
+ extension ?: (string[]) | null,
+ /**
+ * 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明
+ */
+ success ?: ((result : ChooseVideoSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type ChooseVideo = (options : ChooseVideoOptions) => void;
+
+export type GetVideoInfoSuccessCallback = {
+ /**
+ * 画面方向
+ */
+ orientation : string | null,
+ /**
+ * 视频格式
+ */
+ type : string | null,
+ /**
+ * 视频长度
+ */
+ duration : number,
+ /**
+ * 视频大小，单位 kB
+ */
+ size : number,
+ /**
+ * 视频的长，单位 px
+ */
+ height : number,
+ /**
+ * 视频的宽，单位 px
+ */
+ width : number,
+ /**
+ * 视频帧率
+ */
+ fps : number | null,
+ /**
+ * 视频码率，单位 kbps
+ */
+ bitrate : number | null
+};
+
+export type GetVideoInfoOptions = {
+ /**
+ * 视频文件路径，可以是临时文件路径也可以是永久文件路径
+ */
+ src : string,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : GetVideoInfoSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type GetVideoInfo = (options : GetVideoInfoOptions) => void;
+
+export type SaveVideoToPhotosAlbumSuccessCallback = {};
+
+export type SaveVideoToPhotosAlbumOptions = {
+ /**
+ * 视频文件路径，可以是临时文件路径也可以是永久文件路径
+ */
+ filePath : string,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : SaveVideoToPhotosAlbumSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type SaveVideoToPhotosAlbum = (options : SaveVideoToPhotosAlbumOptions) => void;
+
+export type CompressVideoSuccessCallback = {
+ /**
+ * 压缩后的临时文件地址
+ */
+ tempFilePath : string,
+ /**
+ * 压缩后的大小，单位 kB
+ */
+ size : number
+};
+
+export type CompressVideoOptions = {
+ /**
+ * 视频文件路径，可以是临时文件路径也可以是永久文件路径
+ */
+ src : string,
+ /**
+ * 压缩质量
+ * - low: 低
+ * - medium: 中
+ * - high: 高
+ * @type 'low' | 'medium' | 'high'
+ */
+ quality ?: string | null,
+ /**
+ * 码率，单位 kbps
+ */
+ bitrate ?: number | null,
+ /**
+ * 帧率
+ */
+ fps ?: number | null,
+ /**
+ * 相对于原视频的分辨率比例，取值范围(0, 1]
+ */
+ resolution ?: number | null,
+ /**
+ * 接口调用成功的回调函数
+ */
+ success ?: ((result : CompressVideoSuccessCallback) => void) | null,
+ /**
+ * 接口调用失败的回调函数
+ */
+ fail ?: ((result : UniError) => void) | null,
+ /**
+ * 接口调用结束的回调函数（调用成功、失败都会执行）
+ */
+ complete ?: ((result : any) => void) | null
+};
+
+export type CompressVideo = (options : CompressVideoOptions) => void;
+
+export interface Uni {
+ /**
+ * 从本地相册选择图片或使用相机拍照
+ * @description 从本地相册选择图片或使用相机拍照
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.chooseImage({
+ * count:3,
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * }
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=chooseimage
+ * @autotest {
+ generated:false
+ }
+ */
+ chooseImage(options : ChooseImageOptions) : void;
+ /**
+ * 预览图片
+ * @description 预览图片
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.previewImage({
+ * urls:['/static/a.jpg','/static/b.jpg'],
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * }
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=previewimage
+ * @autotest {
+ generated:false
+ }
+ */
+ previewImage(options : PreviewImageOptions) : void;
+ /**
+ * 关闭图片预览
+ * @description 关闭图片预览
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.closePreviewImage({
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * }
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=closepreviewimage
+ * @autotest {
+ generated:false
+ }
+ */
+ closePreviewImage(options : ClosePreviewImageOptions) : void;
+ /**
+ * 获取图片信息
+ * @description 获取图片信息
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.getImageInfo({
+ * src:'/static/a.jpg',
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=getimageinfo
+ * @autotest {
+ generated:false,
+ case:[
+ {
+ input:[{"src":"/static/a.jpg"}]
+ }
+ ]
+ }
+ */
+ getImageInfo(options : GetImageInfoOptions) : void;
+ /**
+ * 保存图片到系统相册
+ * @description 保存图片到系统相册
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.saveImageToPhotosAlbum({
+ * filePath:'/static/a.jpg',
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum
+ * @autotest {
+ generated:false,
+ case:[
+ {
+ input:[{"filePath":"/static/a.jpg"}]
+ }
+ ]
+ }
+ */
+ saveImageToPhotosAlbum(options : SaveImageToPhotosAlbumOptions) : void;
+ /**
+ * 压缩图片
+ * @description 压缩图片
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.compressImage({
+ * src:'/static/a.jpg',
+ * quality:80,
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/image?id=compressimage
+ * @autotest {
+ generated:false,
+ case:[
+ {
+ input:[{"src":"/static/d.jpg"},{"rotate","30"}]
+ }
+ ]
+ }
+ */
+ compressImage(options : CompressImageOptions) : void;
+ /**
+ * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+ * @description 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.chooseVideo({
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/video?id=choosevideo
+ *
+ */
+ chooseVideo(options : ChooseVideoOptions) : void;
+ /**
+ * 获取视频详细信息
+ * @description 获取视频详细信息
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.GetVideoInfo({
+ * src:"/static/a.mp4",
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/video?id=getvideoinfo
+ *
+ */
+ getVideoInfo(options : GetVideoInfoOptions) : void;
+ /**
+ * 保存视频到系统相册
+ * @description 保存视频到系统相册
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.saveVideoToPhotosAlbum({
+ * filePath:"/static/a.mp4",
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum
+ *
+ */
+ saveVideoToPhotosAlbum(options : SaveVideoToPhotosAlbumOptions) : void;
+ /**
+ * 压缩视频
+ * @description 压缩视频
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @uniVueVersion 2,3
+ * @example
+ * ```typescript
+ * uni.compressVideo({
+ * src:"/static/a.mp4",
+ * quality:"low",
+ * success(e){
+ * console.log(JSON.stringify(e))
+ * },
+ * })
+ * ```
+ * @tutorial http://uniapp.dcloud.io/api/media/video?id=compressvideo
+ *
+ */
+ compressVideo(options : CompressVideoOptions) : void;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-media/utssdk/unierror.uts b/uni_modules/uni-media/utssdk/unierror.uts
new file mode 100644
index 0000000000000000000000000000000000000000..24ddb6bc3c3eed4ad158a9e514bef97cb4dd6c89
--- /dev/null
+++ b/uni_modules/uni-media/utssdk/unierror.uts
@@ -0,0 +1,58 @@
+/**
+ * 错误主题
+ */
+export const UniError_PreviewImage = 'uni-previewImage';
+export const UniError_GetImageInfo = "uni-getImageInfo"
+export const UniError_SaveImageToPhotosAlbum = "uni-saveImageToPhotosAlbum"
+export const UniError_SaveVideoToPhotosAlbum = "uni-saveVideoToPhotosAlbum"
+export const UniError_ChooseImage = "uni-chooseImage"
+export const UniError_ChooseVideo = "uni-chooseVideo"
+export const UniError_CompressImage = "uni-compressImage"
+export const UniError_CompressVideo = "uni-compressVideo"
+export const UniError_GetVideoInfo = "uni-getVideoInfo"
+/**
+ * 错误码
+ * @UniError
+ */
+export const UniErrors : Map = new Map([
+ /**
+ * 用户取消
+ */
+ [1101001, 'user cancel'],
+ /**
+ * urls至少包含一张图片地址
+ */
+ [1101002, 'fail parameter error: parameter.urls should have at least 1 item'],
+ /**
+ * 文件不存在
+ */
+ [1101003, "file not find"],
+ /**
+ * 图片加载失败
+ */
+ [1101004, "Failed to load resource"],
+ /**
+ * 未获取权限
+ */
+ [1101005, "No Permission"],
+ /**
+ * 保存异常
+ */
+ [1101006, "save error"],
+ /**
+ * 图片裁剪失败
+ */
+ [1101007, "crop error"],
+ /**
+ * 拍照或录像失败
+ */
+ [1101008, 'camera error'],
+ /**
+ * 图片压缩失败
+ */
+ [1101009, "image output failed"],
+ /**
+ * 其他错误
+ */
+ [1101010, "unexpect error:"]
+]);
\ No newline at end of file
diff --git a/uni_modules/uni-memorywarning/package.json b/uni_modules/uni-memorywarning/package.json
index aa015a936ea73d8161f8d52e97c5bb3da080584c..9bda0f8f3a00c636c1afcc32507cf221ac38d8ea 100644
--- a/uni_modules/uni-memorywarning/package.json
+++ b/uni_modules/uni-memorywarning/package.json
@@ -5,7 +5,7 @@
"description": "UTS 实现内存警告监听",
"keywords": [
"onMemoryWarning"
-],
+ ],
"repository": "",
"engines": {
"HBuilderX": "^3.6.11"
@@ -31,18 +31,16 @@
"npmurl": ""
},
"uni_modules": {
- "uni-ext-api":{
- "uni": {
- "onMemoryWarning": "onMemoryWarning",
- "offMemoryWarning":"offMemoryWarning"
- },
- "mp-weixin":false,
- "mp-alipay":false,
- "mp-baidu":false,
- "mp-qq":false,
- "mp-kuaishou":false,
- "mp-jd":false
- },
+ "uni-ext-api": {
+ "uni": {
+ "onMemoryWarning": {
+ "web": false
+ },
+ "offMemoryWarning": {
+ "web": false
+ }
+ }
+ },
"dependencies": [],
"encrypt": [],
"platforms": {
@@ -58,10 +56,10 @@
"App": {
"app-android": {
"minVersion": "19"
- },
+ },
"app-ios": {
"minVersion": "9"
- }
+ }
},
"H5-mobile": {
"Safari": "n",
@@ -94,4 +92,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-memorywarning/utssdk/app-android/index.uts b/uni_modules/uni-memorywarning/utssdk/app-android/index.uts
index a28f12af07ade2f6be38f7c00ee4aaeb7fa8cceb..ec4a9106ec63f5468ba459e4566fe23449865f03 100644
--- a/uni_modules/uni-memorywarning/utssdk/app-android/index.uts
+++ b/uni_modules/uni-memorywarning/utssdk/app-android/index.uts
@@ -1,20 +1,20 @@
import { UTSAndroid } from "io.dcloud.uts"
+import { OnMemoryWarning, OffMemoryWarning, MemoryWarningCallback, MemoryWarningCallbackResult } from "../interface.uts"
-
-let listeners: UTSCallback[] = []
+let listeners: MemoryWarningCallback[] = []
const onAppTrimMemoryListener = (ret: number) => {
listeners.forEach(listener => {
- let res = {
- level:ret
- }
- listener(res)
+ let res: MemoryWarningCallbackResult = {
+ level:ret
+ }
+ listener(res)
})
}
@Suppress("DEPRECATION")
-export function onMemoryWarning(callback: UTSCallback) {
+export const onMemoryWarning : OnMemoryWarning = function (callback: MemoryWarningCallback) {
if (listeners.length == 0) {
// 仅首次执行底层的实际监听
UTSAndroid.onAppTrimMemory(onAppTrimMemoryListener)
@@ -28,7 +28,7 @@ export function onMemoryWarning(callback: UTSCallback) {
@Suppress("DEPRECATION")
-export function offMemoryWarning(callback: UTSCallback | null) {
+export const offMemoryWarning : OffMemoryWarning = function (callback: MemoryWarningCallback | null) {
if(callback == null){
// 清除全部回调
diff --git a/uni_modules/uni-memorywarning/utssdk/app-ios/index.uts b/uni_modules/uni-memorywarning/utssdk/app-ios/index.uts
index e4dc943ebbcd8df81034a7b0ba4929f2a00b29be..5f4f37bfdc3f0e3bf20a5c98d9a90852b1b0171b 100644
--- a/uni_modules/uni-memorywarning/utssdk/app-ios/index.uts
+++ b/uni_modules/uni-memorywarning/utssdk/app-ios/index.uts
@@ -1,56 +1,47 @@
import { NotificationCenter } from 'Foundation';
import { UIApplication } from "UIKit"
import { Selector } from "ObjectiveC"
+import { OnMemoryWarning, OffMemoryWarning, MemoryWarningCallback, MemoryWarningCallbackResult } from "../interface.uts"
class MemoryWarningTool {
- static listeners: UTSCallback[] = []
-
+ static listener: MemoryWarningCallback | null = null
// 监听内存警告
- static listenMemoryWarning(callback: UTSCallback) {
-
+ static listenMemoryWarning(callback: MemoryWarningCallback) {
+
// 只有首次才需要注册监听事件
- if (this.listeners.length == 0) {
+ if (this.listener == null) {
// 注册监听内存警告通知事件及设置回调方法
// target-action 回调方法需要通过 Selector("方法名") 构建
const method = Selector("receiveMemoryWarning")
NotificationCenter.default.addObserver(this, selector = method, name = UIApplication.didReceiveMemoryWarningNotification, object = null)
}
- this.listeners.push(callback)
+ this.listener = callback
}
-
+
// 内存警告回调的方法
// target-action 的方法前需要添加 @objc 前缀
@objc static receiveMemoryWarning() {
// 触发回调
- this.listeners.forEach(listener => {
- listener({})
- })
+ let res: MemoryWarningCallbackResult = {
+ level: 0
+ };
+ this.listener?.(res);
}
-
+
// 移除监听事件
- static removeListen(callback: UTSCallback | null) {
- // 移除所有监听
- if (callback == null) {
- this.listeners = []
- // 移除监听事件
- NotificationCenter.default.removeObserver(this)
- return
- }
-
- // 清除指定回调
- const index = this.listeners.indexOf(callback!)
- if (index > -1) {
- this.listeners.splice(index, 1)
- }
+ static removeListen(callback: MemoryWarningCallback | null) {
+ this.listener = null;
+ NotificationCenter.default.removeObserver(this)
}
}
+
// 开启监听内存警告
-export function onMemoryWarning(callback: UTSCallback) {
+export const onMemoryWarning : OnMemoryWarning = function (callback: MemoryWarningCallback) {
MemoryWarningTool.listenMemoryWarning(callback)
}
// 关闭监听内存警告
-export function offMemoryWarning(callback: UTSCallback | null) {
+export const offMemoryWarning : OffMemoryWarning = function (callback: MemoryWarningCallback | null) {
MemoryWarningTool.removeListen(callback)
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-memorywarning/utssdk/index.d.ts b/uni_modules/uni-memorywarning/utssdk/index.d.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fbad2381541932af0d66eb7abc0bfb22bbdb1d36
--- /dev/null
+++ b/uni_modules/uni-memorywarning/utssdk/index.d.ts
@@ -0,0 +1,71 @@
+declare namespace UniNamespace {
+
+interface MemoryWarningCallbackResult {
+ /**
+ * 内存警告等级(仅安卓平台有效，iOS始终是0)
+ */
+ level: number
+}
+
+/**
+ * uni.onMemoryWarning/uni.offMemoryWarning回调函数定义
+ */
+type MemoryWarningCallback = (res: MemoryWarningCallbackResult) => void
+
+type OnMemoryWarning = (callback: MemoryWarningCallback) => void
+
+type OffMemoryWarning = (callback : MemoryWarningCallback | null) => void
+
+}
+
+
+declare interface Uni {
+ /**
+ * 开启监听内存警告
+ *
+ * @param {MemoryWarningCallback} callback
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/memory.html#onmemorywarning
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * }
+ * }
+ * }
+ * @uniVersion 3.7.7
+ * @uniVueVersion 2,3 //支持的vue版本
+ * @autotest { expectCallback: true }
+ */
+ onMemoryWarning(callback: UniNamespace.MemoryWarningCallback) : void,
+ /**
+ * 取消监听内存不足告警事件
+ *
+ * @param {MemoryWarningCallback} callback
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/memory.html#offmemorywarning
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * }
+ * }
+ * }
+ * @uniVersion 3.7.7
+ * @uniVueVersion 2,3 //支持的vue版本
+ * @autotest { expectCallback: true }
+ */
+ offMemoryWarning(callback : UniNamespace.MemoryWarningCallback | null) : void
+}
diff --git a/uni_modules/uni-memorywarning/utssdk/interface.uts b/uni_modules/uni-memorywarning/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..1e3250e8dbf5da28517666206eae16748871dd28
--- /dev/null
+++ b/uni_modules/uni-memorywarning/utssdk/interface.uts
@@ -0,0 +1,69 @@
+/**
+ * uni.onMemoryWarning/uni.offMemoryWarning回调参数
+ */
+export type MemoryWarningCallbackResult = {
+ /**
+ * 内存警告等级(仅安卓平台有效，iOS始终是0)
+ */
+ level: number
+}
+
+/**
+ * uni.onMemoryWarning/uni.offMemoryWarning回调函数定义
+ */
+export type MemoryWarningCallback = (res: MemoryWarningCallbackResult) => void
+
+export type OnMemoryWarning = (callback: MemoryWarningCallback) => void
+
+export type OffMemoryWarning = (callback : MemoryWarningCallback | null) => void
+
+export interface Uni {
+ /**
+ * 开启监听内存警告
+ *
+ * @param {MemoryWarningCallback} callback
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/memory.html#onmemorywarning
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.7.7",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @uniVersion 3.7.7
+ * @uniVueVersion 2,3 //支持的vue版本
+ * @autotest { expectCallback: true }
+ */
+ onMemoryWarning(callback: MemoryWarningCallback) : void,
+ /**
+ * 取消监听内存不足告警事件
+ *
+ * @param {MemoryWarningCallback} callback
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/memory.html#offmemorywarning
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4.4",
+ * "uniVer": "3.7.7",
+ * "unixVer": "3.9.0"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "3.7.7",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @uniVersion 3.7.7
+ * @uniVueVersion 2,3 //支持的vue版本
+ * @autotest { expectCallback: true }
+ */
+ offMemoryWarning(callback : MemoryWarningCallback | null) : void
+}
diff --git a/uni_modules/uni-network/changelog.md b/uni_modules/uni-network/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-network/package.json b/uni_modules/uni-network/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..2897cb750ba0c072aed6128a968884004bee8456
--- /dev/null
+++ b/uni_modules/uni-network/package.json
@@ -0,0 +1,109 @@
+{
+ "id": "uni-network",
+ "displayName": "uni-network",
+ "version": "1.0.0",
+ "description": "uni-network",
+ "keywords": [
+ "uni-network"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "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": {
+ "request": {
+ "name": "request",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "uploadFile": {
+ "name": "uploadFile",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ },
+ "downloadFile": {
+ "name": "downloadFile",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": false
+ }
+ }
+ }
+ },
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/readme.md b/uni_modules/uni-network/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..15dba64816abb1ec06a269a9d0683efd7433c8ac
--- /dev/null
+++ b/uni_modules/uni-network/readme.md
@@ -0,0 +1,6 @@
+# uni-network
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/config.json b/uni_modules/uni-network/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..fcfc9c4a8d0fcd5e82bf401d8892c0089879a5ee
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/config.json
@@ -0,0 +1,6 @@
+{
+ "dependencies": [
+ "com.squareup.okhttp3:okhttp:3.12.12"
+ ],
+ "minSdkVersion": "19"
+}
diff --git a/uni_modules/uni-network/utssdk/app-android/index.uts b/uni_modules/uni-network/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..7fe4a4602dc1eb9bae576bc6900be9f037790343
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/index.uts
@@ -0,0 +1,440 @@
+import { RequestOptions, RequestSuccess, RequestTask, UploadFileOptions, UploadFile, UploadTask, OnProgressUpdateResult, UploadFileSuccess, UploadFileProgressUpdateCallback, DownloadFile, DownloadTask, DownloadFileOptions, OnProgressDownloadResult, DownloadFileProgressUpdateCallback, DownloadFileSuccess } from '../interface'
+import { RequestFailImpl, UploadFileFailImpl, DownloadFileFailImpl, getErrcode } from '../unierror';
+import { NetworkManager, NetworkRequestListener, NetworkUploadFileListener, NetworkDownloadFileListener } from './network/NetworkManager.uts'
+import Pattern from 'java.util.regex.Pattern';
+import Locale from 'java.util.Locale';
+import TextUtils from 'android.text.TextUtils';
+import { StatusCode } from './network/StatusCode.uts'
+import Key from 'kotlinx.coroutines.CoroutineExceptionHandler.Key';
+import JSONObject from 'com.alibaba.fastjson.JSONObject';
+import ArrayList from 'java.util.ArrayList';
+import ProgressListener from 'android.os.RecoverySystem.ProgressListener';
+import Handler from 'android.os.Handler';
+import Looper from 'android.os.Looper';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import Class from 'java.lang.Class';
+import Type from 'java.lang.reflect.Type';
+
+let charsetPattern = Pattern.compile('charset=([a-z0-9-]+)')
+
+class RunnableTask extends Runnable {
+ private callback : () => void | null;
+ private looper : Looper | null = null;
+ constructor(looper : Looper | null, callback : () => void) {
+ super();
+ this.looper = looper;
+ this.callback = callback
+ }
+
+ override run() {
+ this.callback?.()
+ }
+
+ public execute() {
+ if (this.looper == null) {
+ this.run();
+ } else {
+ new Handler(this.looper!!).post(this);
+ }
+ }
+}
+
+
+class RequestNetworkListener extends NetworkRequestListener {
+ private param : RequestOptions | null = null;
+ private headers : UTSJSONObject = {};
+ private looper : Looper | null = null;
+ private type : Type | null = null;
+ private clzName : string | null = null;
+ constructor(param : RequestOptions, type : Type, clzName : string) {
+ super();
+ this.param = param;
+ this.type = type;
+ this.clzName = clzName;
+ this.looper = Looper.myLooper();
+ }
+ override onStart() : void {
+ }
+
+ override onHeadersReceived(statusCode : number, headers : MutableMap>) : void {
+ let simpleHeaders = {};
+ if (headers != null) {
+ let it = headers.iterator();
+ while (it.hasNext()) {
+ let entry = it.next();
+ let key = entry.key;
+ let value = entry.value;
+
+ let tmpKey = '_';
+ if (key == null) {
+ key = tmpKey;
+ }
+
+ if (value.size == 0) {
+ continue;
+ } else if (value.size == 1) {
+ simpleHeaders[key] = value.get(0);
+ } else {
+ simpleHeaders[key] = value.toString();
+ }
+ }
+ }
+ this.headers = simpleHeaders;
+ }
+
+ override onProgress(progress : number) : void {
+ }
+
+ override onComplete(option : UTSJSONObject) : void {
+ let kParam = this.param;
+ let result = {};
+ if (kParam != null) {
+ if (option == null || '-1' == option['statusCode']) {
+ // result['statusText'] = 'ERR_CONNECT_FAILED';
+ // result['errMsg'] = option['errorMsg'];
+ if (this.headers != null) {
+ result['header'] = this.headers;
+ }
+ let exception = option['cause']! as Exception;
+ let cause = exception.cause.toString();
+ let errMsg = option['errorMsg']! as string;
+ let errCode = (option['errorCode']! as string).toInt();
+ if (errMsg.contains("timeout")) {
+ errCode = 5;
+ errMsg = "time out";
+ } else if (cause.contains("Connection refused")) {
+ errCode = 1000;
+ errMsg = "server system error";
+ } else if (cause.contains("Network is unreachable")) {
+ errCode = 600003;
+ errMsg = "network interrupted error";
+ } else if (cause.contains("invalid URL")) {
+ errCode = 600009;
+ errMsg = "invalid URL";
+ } else {
+ errCode = 602001;
+ errMsg = "request system error";
+ }
+
+ let failResult = new RequestFailImpl(getErrcode(errCode));
+ failResult.cause = new Error(cause);
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let fail = kParam.fail;
+ if (fail != null) {
+ fail(failResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(failResult);
+ }
+ }
+ }).execute();
+ } else {
+ result['statusCode'] = option['statusCode'];
+ if (option['originalData'] == null) {
+ if ("java.lang.Object".equals(this.clzName, true)) {
+ let errMsg = option['errorMsg'];
+ if (errMsg != null) {
+ let errMsgJson = JSON.parse((option['errorMsg']! as string));
+ if (errMsgJson != null) {
+ result['data'] = errMsgJson;
+ } else {
+ result['data'] = errMsg;
+ }
+ } else {
+ result['data'] = "error";
+ }
+ } else {
+ let errMsg = option['errorMsg'];
+ if (errMsg != null) {
+ let errMsgJson = JSON.parse(errMsg as string, this.type);
+ if (errMsgJson != null) {
+ result['data'] = errMsgJson;
+ } else {
+ let failResult = new RequestFailImpl(getErrcode(100002));
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let fail = kParam.fail;
+ if (fail != null) {
+ fail(failResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(failResult);
+ }
+ }
+ }).execute();
+ return;
+ }
+ }
+ }
+ } else {
+ let charset = "";
+ let headers = this.headers.toJSONObject() as JSONObject;
+ if (headers != null) {
+ for (key in headers.keys) {
+ if (key.equals("Content-Type", true)) {
+ charset = headers[key] as string;
+ }
+ }
+ }
+
+ let strData = this.readAsString(option['originalData'] as ByteArray, charset);
+
+ let type = kParam.responseType != null ? kParam.responseType : kParam.dataType;
+ if (type == null) {
+ type = charset;
+ }
+ if (kParam.method == "HEAD") {
+ type = "";
+ }
+
+ const data = this.parseData(strData, type);
+ if (data == null) {
+ let failResult = new RequestFailImpl(getErrcode(100001));
+
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let fail = kParam.fail;
+ if (fail != null) {
+ fail(failResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(failResult);
+ }
+ }
+ }).execute();
+ return;
+ }
+
+ result['data'] = data;
+ }
+ result['statusText'] = StatusCode.getStatus(option['statusCode'] as string);
+ if (this.headers != null) {
+ result['header'] = this.headers;
+ }
+
+ let tmp : RequestSuccess = {
+ data: result['data'] as T,
+ statusCode: (result['statusCode'] as string).toInt(),
+ header: result['header']!,
+ cookies: []
+ };
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let success = kParam.success;
+ if (success != null) {
+ success(tmp);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(tmp);
+ }
+ }
+ }).execute();
+ }
+ }
+ }
+
+ private readAsString(byteArray : ByteArray, type : string) : string {
+ let charsetType = "utf-8";
+
+ if (type != null) {
+ let matcher = charsetPattern.matcher(type.toLowerCase(Locale.ENGLISH));
+ if (matcher.find()) {
+ charsetType = matcher.group(1);
+ }
+ }
+
+ try {
+ return new String(byteArray, charset(charsetType));
+ } catch (e : Exception) {
+ return new String(byteArray);
+ }
+ }
+
+ private parseData(data : string, type : string) : any | null {
+ if ("java.lang.Object".equals(this.clzName, true)) {
+ if (type.contains("json")) {
+ return JSON.parse(data);
+ } else if (type == 'jsonp') {
+ if (TextUtils.isEmpty(data)) {
+ return {};
+ }
+ let start = data.indexOf('(') + 1;
+ let end = data.indexOf(')');
+ if (start == 0 || start >= end) {
+ return {};
+ }
+ let tmp = data.substring(start, end);
+ return JSON.parse(tmp);
+ } else {
+ return data;
+ }
+ } else {
+ return JSON.parse(data, this.type);
+ }
+ }
+}
+
+
+class UploadNetworkListener implements NetworkUploadFileListener {
+ private param : UploadFileOptions | null = null;
+ public progressListeners = new ArrayList();
+ private looper : Looper | null = null;
+ constructor(param : UploadFileOptions) {
+ this.param = param;
+ this.looper = Looper.myLooper();
+ }
+
+ onProgress(progressUpdate : OnProgressUpdateResult) {
+ if (this.progressListeners.size != 0) {
+ new RunnableTask(this.looper, () => {
+ for (let i : Int = 0; i < this.progressListeners.size; i++) {
+ let listener = this.progressListeners.get(i);
+ listener(progressUpdate);
+ }
+ }).execute();
+ }
+ }
+
+ onComplete(option : UTSJSONObject) {
+ let kParam = this.param;
+ if (kParam != null) {
+ const errorMsg = option["errorMsg"];
+ let errCode = (option['statusCode']! as string).toInt();
+ if (errorMsg != null) {
+ let failResult = new UploadFileFailImpl(getErrcode(errCode));
+
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let fail = kParam.fail;
+ if (fail != null) {
+ fail(failResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(failResult);
+ }
+ }
+ }).execute();
+
+ } else {
+ let kData = option["data"];
+ let data = "";
+ if (kData != null) {
+ data = kData as string;
+ }
+ let successResult : UploadFileSuccess = {
+ data: data,
+ statusCode: errCode
+ }
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let success = kParam.success;
+ if (success != null) {
+ success(successResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(successResult);
+ }
+ }
+ }).execute();
+ }
+ }
+
+ }
+}
+class DownloadNetworkListener implements NetworkDownloadFileListener {
+ private param : DownloadFileOptions | null = null;
+ public progressListeners = new ArrayList();
+ private looper : Looper | null = null;
+ constructor(param : DownloadFileOptions) {
+ this.param = param;
+ this.looper = Looper.myLooper();
+ }
+
+ onProgress(progressUpdate : OnProgressDownloadResult) {
+ if (this.progressListeners.size != 0) {
+ new RunnableTask(this.looper, () => {
+ for (let i : Int = 0; i < this.progressListeners.size; i++) {
+ let listener = this.progressListeners.get(i);
+ listener(progressUpdate);
+ }
+ }).execute();
+ }
+ }
+ onComplete(option : UTSJSONObject) {
+ let kParam = this.param;
+ if (kParam != null) {
+ let statusCode = (option['statusCode']! as string).toInt();
+ let errMsg = option['errorMsg'];
+ if (errMsg != null) {
+ let errCode = (option['errorCode']! as string).toInt();
+ let failResult = new DownloadFileFailImpl(getErrcode(errCode));
+ failResult.errMsg = errMsg as string;
+ let exception = option['cause'];
+ if(exception != null){
+ let cause = (exception as Exception).cause.toString();
+ failResult.cause = new Error(cause);
+ }
+
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let fail = kParam.fail;
+ if (fail != null) {
+ fail(failResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(failResult);
+ }
+ }
+ }).execute();
+ } else {
+ let kTempFilePath = option["tempFilePath"];
+ let tempFilePath = "";
+ if (kTempFilePath != null) {
+ tempFilePath = kTempFilePath as string;
+ }
+ let successResult : DownloadFileSuccess = {
+ tempFilePath: tempFilePath,
+ statusCode: statusCode
+ }
+
+ new RunnableTask(this.looper, () => {
+ if (kParam != null) {
+ let success = kParam.success;
+ if (success != null) {
+ success(successResult);
+ }
+ let complete = kParam.complete;
+ if (complete != null) {
+ complete(successResult);
+ }
+ }
+ }).execute();
+ }
+ }
+ }
+}
+
+
+@UTSAndroid.keyword("inline")
+@UTSAndroid.keyword('reified')
+export function request(options : RequestOptions) : RequestTask | null {
+ const type = UTSAndroid.getGenericType();
+ const clzName = UTSAndroid.getGenericClassName();
+ return NetworkManager.getInstance().request(options, new RequestNetworkListener(options, type, clzName));
+}
+
+export const uploadFile : UploadFile = (options : UploadFileOptions) : UploadTask | null => {
+ return NetworkManager.getInstance().uploadFile(options, new UploadNetworkListener(options));
+}
+
+export const downloadFile : DownloadFile = (options : DownloadFileOptions) : DownloadTask | null => {
+ return NetworkManager.getInstance().downloadFile(options, new DownloadNetworkListener(options));
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/NetworkManager.uts b/uni_modules/uni-network/utssdk/app-android/network/NetworkManager.uts
new file mode 100644
index 0000000000000000000000000000000000000000..9cc016af9a4e9f3a88840e456abbcad41126913a
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/NetworkManager.uts
@@ -0,0 +1,430 @@
+import { RequestOptions, RequestTask, UploadTask, UploadFileOptions, OnProgressUpdateResult, UploadFileProgressUpdateCallback, OnProgressDownloadResult, DownloadTask, DownloadFileOptions, DownloadFileProgressUpdateCallback } from '../../interface.uts'
+import OkHttpClient from 'okhttp3.OkHttpClient';
+import Protocol from 'okhttp3.Protocol';
+import TimeUnit from 'java.util.concurrent.TimeUnit';
+import Collections from 'java.util.Collections';
+import { OKDns } from './OKDns.uts';
+import Uri from 'android.net.Uri';
+import ConnectionPool from 'okhttp3.ConnectionPool';
+import Request from 'okhttp3.Request';
+import Call from 'okhttp3.Call';
+import Response from 'okhttp3.Response';
+import Headers from 'okhttp3.Headers';
+import Callback from 'okhttp3.Callback';
+import ExecutorService from 'java.util.concurrent.ExecutorService';
+import Executors from 'java.util.concurrent.Executors';
+import RequestBody from 'okhttp3.RequestBody';
+import MediaType from 'okhttp3.MediaType';
+import Dispatcher from 'okhttp3.Dispatcher';
+import IOException from 'java.io.IOException';
+import List from 'java.util.List';
+import InputStream from 'java.io.InputStream';
+import ByteArrayOutputStream from 'java.io.ByteArrayOutputStream';
+import BufferedReader from 'java.io.BufferedReader';
+import InputStreamReader from 'java.io.InputStreamReader';
+import OkHostnameVerifier from 'okhttp3.internal.tls.OkHostnameVerifier';
+import { SSLFactoryManager } from './tls/SSLFactoryManager.uts';
+import { SSLConfig } from './tls/SSLConfig.uts';
+import { CookieInterceptor } from './interceptor/CookieInterceptor.uts'
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import MultipartBody from 'okhttp3.MultipartBody';
+import JSONObject from 'com.alibaba.fastjson.JSONObject';
+import { UploadController } from './upload/UploadController.uts';
+import ArrayList from 'java.util.ArrayList';
+import { DownloadController } from './download/DownloadController.uts';
+
+class NetworkRequestListener {
+ public onStart(): void { }
+
+ public onProgress(progress: number): void { }
+
+ public onComplete(option: UTSJSONObject): void { }
+
+ public onHeadersReceived(statusCode: number, headers: MutableMap>): void { }
+}
+
+interface NetworkUploadFileListener {
+ progressListeners: ArrayList;
+ onProgress(progressUpdate: OnProgressUpdateResult): void;
+ onComplete(option: UTSJSONObject): void;
+}
+
+interface NetworkDownloadFileListener {
+ progressListeners: ArrayList;
+ onProgress(progressUpdate: OnProgressDownloadResult): void;
+ onComplete(option: UTSJSONObject): void;
+}
+
+
+class NetworkRequestTaskImpl implements RequestTask {
+ private call: Call | null = null;
+ constructor(call: Call) {
+ this.call = call;
+ }
+
+ public abort() {
+ if (this.call != null) {
+ this.call?.cancel();
+ }
+ }
+}
+
+
+
+
+class NetworkManager {
+
+ private static instance: NetworkManager | null = null;
+
+ private static connectPool: ConnectionPool | null = null;
+
+ /**
+ * request的线程池
+ */
+ private requestExecutorService: ExecutorService | null = null;
+
+ public static getInstance(): NetworkManager {
+ if (this.instance == null) {
+ this.instance = new NetworkManager();
+ }
+ return this.instance!;
+ }
+
+
+
+ public request(param: RequestOptions, listener: NetworkRequestListener): RequestTask | null {
+ if (listener != null) {
+ listener.onStart();
+ }
+ let client = this.createRequestClient(param!);
+ let request = this.createRequest(param!, listener!);
+ if (request == null) {
+ return null;
+ }
+ let call: Call = client.newCall(request);
+
+ call.enqueue(new SimpleCallback(listener));
+
+ let task = new NetworkRequestTaskImpl(call);
+ return task;
+ }
+
+ public createRequestClient(param: RequestOptions): OkHttpClient {
+ let clientBuilder = OkHttpClient.Builder();
+ const timeout: Long = param.timeout != null ? param.timeout!.toLong() : 60000;
+ clientBuilder.connectTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.readTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.writeTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.callTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.protocols(Collections.singletonList(Protocol.HTTP_1_1));
+
+ clientBuilder.addInterceptor(new CookieInterceptor());
+
+
+
+ if (param.firstIpv4 != null) {
+ let firstIpv4 = param.firstIpv4!;
+ if (firstIpv4) {
+ let okDns = new OKDns();
+ clientBuilder.dns(okDns);
+ }
+ }
+ // let requestHost = Uri.parse(param.url).getHost();
+
+ //todo tls暂时搁置
+ //todo 把call保存起来， 存储到task里面，等待调用。
+ // let tlsOption: UTSJSONObject = param.tls;
+ // if (tlsOption != null) {
+ // let sslConfig = new SSLConfig();
+ // sslConfig.setKeystore(tlsOption['keystore']);
+ // sslConfig.setStorePass(tlsOption['storePass']);
+ // let caArray:JSONArray = tlsOption['ca'];
+ // let caParam:Array = null;
+ // if (caArray != null){
+ // caParam = caArray.toArray(emptyArray());
+ // }
+ // sslConfig.setCa(caParam);
+
+ // clientBuilder.sslSocketFactory(SSLFactoryManager.getInstance().getSSLSocketFactory(sslConfig));
+ // clientBuilder.hostnameVerifier(OkHostnameVerifier.INSTANCE);
+ // }
+
+ if (NetworkManager.connectPool == null) {
+ NetworkManager.connectPool = new ConnectionPool();
+ }
+
+ clientBuilder.connectionPool(NetworkManager.connectPool);
+
+ if (this.requestExecutorService == null) {
+ this.requestExecutorService = Executors.newFixedThreadPool(10);
+ }
+
+ clientBuilder.dispatcher(new Dispatcher(this.requestExecutorService));
+
+ return clientBuilder.build();
+ }
+
+ public createRequest(param: RequestOptions, listener: NetworkRequestListener): Request | null {
+
+ let requestBilder = new Request.Builder();
+ try {
+ requestBilder.url(param.url);
+ } catch (e: Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '600009';
+ option['errorMsg'] = "invalid URL";
+ option['cause'] = e;
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+
+ let ua = UTSAndroid.getWebViewInfo(UTSAndroid.getAppContext()!)["ua"].toString();
+ requestBilder.header("User-Agent", ua);
+
+ if (param.header == null) {
+ param.header = {}
+ }
+
+ let contentType = "application/x-www-form-urlencoded; charset=UTF-8";
+ let hasContentType = false;
+ let headers = param.header!.toJSONObject() as JSONObject;
+ for (key in headers.keys) {
+ if (key.equals("Content-Type", true)) {
+ contentType = "" + headers![key]!;
+ hasContentType = true;
+ }
+ requestBilder.header(key, "" + headers[key]);
+ }
+
+ if (!hasContentType) {
+ if (!"GET".equals(param.method)) {
+ contentType = "application/json";
+ }
+ }
+
+ if ("POST".equals(param.method) || "PUT".equals(param.method) || "PATCH".equals(param.method) || "DELETE".equals(param.method)) {
+ if (param.data != null && listener != null) {
+ listener.onProgress(0);
+ }
+
+ let body: string = "";
+ if (param.data != null) {
+ if (typeof(param.data) == 'string') {
+ body = param.data as string;
+ } else if (param.data instanceof UTSJSONObject){
+ if(contentType.indexOf("application/x-www-form-urlencoded") == 0){
+ const data = param.data as UTSJSONObject;
+ const map:Map = data.toMap();
+ const bodyArray = new Array();
+ map.forEach((value, key)=>{
+ bodyArray.push(key + "="+ value);
+ })
+ body = bodyArray.join("&");
+ }else{
+ body = JSON.stringify(param.data);
+ }
+ }
+ }
+ let requestBody = RequestBody.create(MediaType.parse(contentType), body);
+ requestBilder.method(param.method, requestBody);
+ if (listener != null) {
+ listener.onProgress(100);
+ }
+ } else if ("HEAD".equals(param.method)) {
+ requestBilder.head();
+ }else if ("OPTIONS".equals(param.method)) {
+ requestBilder.method(param.method, null);
+ } else if (param.method == null || "GET".equals(param.method)){
+ const data = param.data;
+ if (data != null) {
+ let json: UTSJSONObject | null = null;
+ if (typeof(data) == 'string') {
+ json = JSON.parseObject(data as string);
+ }else if(data instanceof UTSJSONObject) {
+ json = data;
+ }
+ if (json != null){
+ let url = param.url;
+ try {
+ requestBilder.url(this.stringifyQuery(url, json));
+ } catch (e: Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '600009';
+ option['errorMsg'] = "invalid URL";
+ option['cause'] = e;
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+ }
+ }
+ }
+
+
+ return requestBilder.build();
+ }
+
+ /**
+ * data拼接到url上
+ */
+ private stringifyQuery(url: string, data: UTSJSONObject) : string{
+ let newUrl = url;
+ //http:xxx/xxx?a=b&c=d#123
+ let str = url.split('#')
+ let hash = ''
+ if(str.length > 1){
+ hash = str[1] //123
+ }
+ str = str[0].split('?')
+ let query = ''
+ if(str.length > 1){
+ query = str[1] //a=b&c=d
+ }
+ newUrl = str[0] // http:xxx/xxx
+ const pairs = query.split('&')
+ const queryMap = new Map();
+ pairs.forEach((item, _)=>{
+ const temp = item.split('=')
+ if(temp.length > 1){
+ queryMap[temp[0]] = temp[1]
+ }
+ });
+ const dataMap: Map = data.toMap();
+ dataMap.forEach((value, key)=>{
+ if (value instanceof UTSJSONObject || value instanceof Array){
+ queryMap[key] = JSON.stringify(value);
+ }else{
+ queryMap[key] = "" + value;
+ }
+ })
+ let queryStr = "";
+ queryMap.forEach((value, key)=>{
+ queryStr += key + "=" + value + "&"
+ });
+ queryStr = queryStr.slice(0, -1);
+ if(queryStr.length > 0){
+ newUrl += "?" + queryStr;
+ }
+ if(hash.length > 0){
+ newUrl += "#" + hash;
+ }
+ return newUrl;
+ }
+
+
+ public uploadFile(options: UploadFileOptions, listener: NetworkUploadFileListener): UploadTask | null {
+ return UploadController.getInstance().uploadFile(options, listener);
+ }
+
+ public downloadFile(options: DownloadFileOptions, listener: NetworkDownloadFileListener): DownloadTask | null {
+ return DownloadController.getInstance().downloadFile(options, listener);
+ }
+
+
+}
+
+class SimpleCallback implements Callback {
+ private listener?: NetworkRequestListener = null;
+ constructor(listener: NetworkRequestListener) {
+ this.listener = listener;
+ }
+
+ override onResponse(call: Call, response: Response): void {
+ let headers: Headers = response.headers();
+ let headerMap = headers.toMultimap();
+ let code = response.code();
+ let option = {};
+ option["statusCode"] = code + "";
+
+ let pListener = this.listener;
+
+ if (pListener != null) {
+ pListener.onHeadersReceived(code, headerMap);
+ }
+
+ let rawStream = response.body()!.byteStream()!;
+ if (response.isSuccessful()) {
+ option['originalData'] = this.readInputStreamAsBytes(rawStream, this.listener);
+ } else {
+ option['errorMsg'] = this.readInputStream(rawStream, this.listener);
+ }
+
+ if (pListener != null) {
+ pListener.onComplete(option);
+ }
+ }
+ override onFailure(call: Call, e: IOException): void {
+ let pListener = this.listener;
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '602001';
+ option['errorMsg'] = e.message;
+ option['cause'] = e;
+ if (pListener != null) {
+ pListener.onComplete(option);
+ }
+ }
+
+
+ private readInputStreamAsBytes(inputSteam?: InputStream, listener?: NetworkRequestListener): ByteArray | null {
+ if (inputSteam == null) {
+ return null;
+ }
+ let buffer = new ByteArrayOutputStream();
+
+ let readCount = 0;
+ let data = new ByteArray(2048);
+
+ do {
+ let len = inputSteam.read(data, 0, data.size);
+ if (len == -1) {
+ break;
+ }
+ buffer.write(data, 0, len);
+ readCount += len;
+ if (listener != null) {
+ listener.onProgress(readCount);
+ }
+
+ } while (true);
+
+ buffer.flush();
+ return buffer.toByteArray();
+ }
+
+ private readInputStream(inputSteam?: InputStream, listener?: NetworkRequestListener): string | null {
+ if (inputSteam == null) {
+ return null;
+ }
+
+ let builder = new StringBuilder();
+ let localBufferedReader = new BufferedReader(new InputStreamReader(inputSteam));
+ let data = new CharArray(2048);
+ do {
+ let len = localBufferedReader.read(data);
+ if (len == -1) {
+ break;
+ }
+ builder.append(data, 0, len);
+ if (listener != null) {
+ listener.onProgress(builder.length);
+ }
+ } while (true);
+ localBufferedReader.close();
+
+ return builder.toString();
+ }
+}
+
+
+export {
+ NetworkManager,
+ NetworkRequestListener,
+ NetworkUploadFileListener,
+ NetworkDownloadFileListener
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/OKDns.uts b/uni_modules/uni-network/utssdk/app-android/network/OKDns.uts
new file mode 100644
index 0000000000000000000000000000000000000000..94d68c58b4b6a60a1eac059c4268fdb08292b2d6
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/OKDns.uts
@@ -0,0 +1,32 @@
+import Dns from 'okhttp3.Dns';
+import UnknownHostException from 'java.net.UnknownHostException';
+import InetAddress from 'java.net.InetAddress';
+import Inet4Address from 'java.net.Inet4Address';
+
+export class OKDns implements Dns {
+
+ public override lookup(hostName: string): kotlin.collections.MutableList {
+ if (hostName == null) {
+ throw UnknownHostException("hostname == null");
+ } else {
+ try {
+ let inetAddressesList: Array = [];
+ let inetAddresses = InetAddress.getAllByName(hostName);
+ for (inetAddress in inetAddresses) {
+ if (inetAddress instanceof Inet4Address) {
+ inetAddressesList.unshift(inetAddress)
+ } else {
+ inetAddressesList.push(inetAddress);
+ }
+ }
+ return inetAddressesList;
+ } catch (e: Exception) {
+ let unknownHostException = new UnknownHostException("error");
+ unknownHostException.initCause(e);
+ throw unknownHostException;
+ }
+
+ }
+ }
+}
+
diff --git a/uni_modules/uni-network/utssdk/app-android/network/StatusCode.uts b/uni_modules/uni-network/utssdk/app-android/network/StatusCode.uts
new file mode 100644
index 0000000000000000000000000000000000000000..7b96af14541a28e79a6dd7daf2549f0c951f98aa
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/StatusCode.uts
@@ -0,0 +1,80 @@
+
+
+
+class StatusCode {
+ public static statusCodeMap : Map | null = null;
+
+ private static initStatusCodeMap() {
+ let map = new Map();
+ this.statusCodeMap = map;
+ map.set('100', "Continue");
+ map.set('101', "Switching Protocol");
+ map.set('200', "OK");
+ map.set('201', "Created");
+ map.set('202', "Accepted");
+ map.set('203', "Non-Authoritative Information");
+ map.set('204', "No Content");
+ map.set('205', "Reset Content");
+ map.set('206', "Partial Content");
+ map.set('300', "Multiple Choice");
+ map.set('301', "Moved Permanently");
+ map.set('302', "Found");
+ map.set('303', "See Other");
+ map.set('304', "Not Modified");
+ map.set('305', "Use Proxy");
+ map.set('306', "unused");
+ map.set('307', "Temporary Redirect");
+ map.set('308', "Permanent Redirect");
+ map.set('400', "Bad Request");
+ map.set('401', "Unauthorized");
+ map.set('402', "Payment Required");
+ map.set('403', "Forbidden");
+ map.set('404', "Not Found");
+ map.set('405', "Method Not Allowed");
+ map.set('406', "Not Acceptable");
+ map.set('407', "Proxy Authentication Required");
+ map.set('408', "Request Timeout");
+ map.set('409', "Conflict");
+ map.set('410', "Gone");
+ map.set('411', "Length Required");
+ map.set('412', "Precondition Failed");
+ map.set('413', "Payload Too Large");
+ map.set('414', "URI Too Long");
+ map.set('415', "Unsupported Media Type");
+ map.set('416', "Requested Range Not Satisfiable");
+ map.set('417', "Expectation Failed");
+ map.set('418', "I'm a teapot");
+ map.set('421', "Misdirected Request");
+ map.set('426', "Upgrade Required");
+ map.set('428', "Precondition Required");
+ map.set('429', "Too Many Requests");
+ map.set('431', "Request Header Fields Too Large");
+ map.set('500', "Internal Server Error");
+ map.set('501', "Not Implemented");
+ map.set('502', "Bad Gateway");
+ map.set('503', "Service Unavailable");
+ map.set('504', "Gateway Timeout");
+ map.set('505', "HTTP Version Not Supported");
+ map.set('506', "Variant Also Negotiates");
+ map.set('507', "Variant Also Negotiates");
+ map.set('511', "Network Authentication Required");
+ }
+
+ public static getStatus(code : string) : string {
+ let map = this.statusCodeMap;
+ if (map == null) {
+ this.initStatusCodeMap();
+ }
+ let tmp = this.statusCodeMap!;
+ if (!(tmp.has(code))) {
+ return 'unknown status';
+ } else {
+ return tmp.get(code)! as string;
+ }
+ }
+}
+
+
+export {
+ StatusCode
+}
diff --git a/uni_modules/uni-network/utssdk/app-android/network/download/DownloadController.uts b/uni_modules/uni-network/utssdk/app-android/network/download/DownloadController.uts
new file mode 100644
index 0000000000000000000000000000000000000000..5b64c7016710f754f7c2e1f0262dc176bea30905
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/download/DownloadController.uts
@@ -0,0 +1,462 @@
+import { DownloadFileOptions, DownloadTask, DownloadFileProgressUpdateCallback, OnProgressDownloadResult } from '../../../interface.uts';
+import { NetworkDownloadFileListener } from '../NetworkManager.uts'
+import OkHttpClient from 'okhttp3.OkHttpClient';
+import TimeUnit from 'java.util.concurrent.TimeUnit';
+import ExecutorService from 'java.util.concurrent.ExecutorService';
+import Executors from 'java.util.concurrent.Executors';
+import Dispatcher from 'okhttp3.Dispatcher';
+import Callback from 'okhttp3.Callback';
+import Response from 'okhttp3.Response';
+import Request from 'okhttp3.Request';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import Call from 'okhttp3.Call';
+import IOException from 'java.io.IOException';
+import ResponseBody from 'okhttp3.ResponseBody';
+import File from 'java.io.File';
+import BufferedSink from 'okio.BufferedSink';
+import BufferedSource from 'okio.BufferedSource';
+import Okio from 'okio.Okio';
+import TextUtils from 'android.text.TextUtils';
+import StringTokenizer from 'java.util.StringTokenizer';
+import MimeTypeMap from 'android.webkit.MimeTypeMap';
+import URLDecoder from 'java.net.URLDecoder';
+import CookieManager from 'android.webkit.CookieManager';
+import KotlinArray from 'kotlin.Array';
+import Context from 'android.content.Context';
+import Environment from 'android.os.Environment';
+
+class NetworkDownloadTaskImpl implements DownloadTask {
+ private call : Call | null = null;
+ private listener : NetworkDownloadFileListener | null = null;
+ constructor(call : Call, listener : NetworkDownloadFileListener) {
+ this.call = call;
+ this.listener = listener;
+ }
+
+ public abort() {
+ if (this.call != null) {
+ this.call?.cancel();
+ }
+ }
+
+ public onProgressUpdate(option : DownloadFileProgressUpdateCallback) {
+ const kListener = this.listener;
+ if (kListener != null) {
+ kListener.progressListeners.add(option);
+ }
+ }
+}
+
+
+
+export class DownloadController {
+ private static instance : DownloadController | null = null
+
+ /**
+ * 上传的线程池
+ */
+ private downloadExecutorService : ExecutorService | null = null;
+
+ public static getInstance() : DownloadController {
+ if (this.instance == null) {
+ this.instance = new DownloadController();
+ }
+ return this.instance!;
+ }
+
+ public downloadFile(options : DownloadFileOptions, listener : NetworkDownloadFileListener) : DownloadTask | null {
+ const client = this.createDownloadClient(options);
+ let request = this.createDownloadRequest(options, listener);
+ if (request == null) {
+ return null;
+ }
+ let call : Call = client.newCall(request);
+ call.enqueue(new SimpleDownloadCallback(listener, options.filePath ?? ""));
+
+ let task = new NetworkDownloadTaskImpl(call, listener);
+
+ return task;
+ }
+
+
+
+
+ private createDownloadClient(option : DownloadFileOptions) : OkHttpClient {
+
+ let clientBuilder = OkHttpClient.Builder();
+ const timeout : Long = option.timeout != null ? option.timeout!.toLong() : 120000;
+ clientBuilder.connectTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.readTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.writeTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.callTimeout(timeout, TimeUnit.MILLISECONDS);
+
+ if (this.downloadExecutorService == null) {
+ this.downloadExecutorService = Executors.newFixedThreadPool(10);
+ }
+
+ clientBuilder.dispatcher(new Dispatcher(this.downloadExecutorService));
+
+ return clientBuilder.build();
+ }
+
+ private createDownloadRequest(options : DownloadFileOptions, listener : NetworkDownloadFileListener) : Request | null {
+ let requestBilder = new Request.Builder();
+ try {
+ requestBilder.url(options.url);
+ } catch (e : Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = "invalid URL";
+ option['cause'] = e;
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+
+ let ua = UTSAndroid.getWebViewInfo(UTSAndroid.getAppContext()!)["ua"].toString();
+ requestBilder.header("User-Agent", ua);
+
+ const headers = options.header?.toMap();
+ if (headers != null) {
+ for (entry in headers) {
+ const key = entry.key;
+ const value = entry.value;
+
+ if (value != null) {
+ requestBilder.addHeader(key, "" + value);
+ } else {
+ continue;
+ }
+ }
+ }
+
+ return requestBilder.build();
+ }
+
+}
+
+class SimpleDownloadCallback implements Callback {
+ private downloadFilePath = "/download/";
+ private listener : NetworkDownloadFileListener | null = null;
+ private specifyPath = "";
+ constructor(listener : NetworkDownloadFileListener, specifyPath : string) {
+ this.listener = listener;
+ this.specifyPath = specifyPath;
+ }
+
+
+ override onFailure(call : Call, exception : IOException) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = exception.message;
+ option['cause'] = exception;
+ this.listener?.onComplete(option);
+ }
+ override onResponse(call : Call, response : Response) {
+ if (response.isSuccessful()) {
+ const source = response.body()?.source()
+ if (source != null) {
+ this.setCookie(response);
+ const tempFile = this.getTempFile()
+ let tempSink : BufferedSink | null = null;
+ let tempSource : BufferedSource | null = null;
+ let targetSink : BufferedSink | null = null;
+ try {
+ tempSink = Okio.buffer(Okio.sink(tempFile));
+ let totalBytesRead : Long = 0;
+ const contentLength = response.body()!!.contentLength();
+ const bufferSize : Int = 8 * 1024;
+ const buffer = ByteArray(bufferSize);
+
+
+ do {
+ let bytesRead = source.read(buffer);
+ if (bytesRead == -1) {
+ break;
+ }
+
+
+ tempSink.write(buffer, 0, bytesRead)
+ totalBytesRead += bytesRead.toLong();
+ const progress = (totalBytesRead.toFloat() / contentLength) * 100
+ let downloadProgressUpdate : OnProgressDownloadResult = {
+ progress: progress,
+ totalBytesWritten: totalBytesRead,
+ totalBytesExpectedToWrite: contentLength
+ }
+ this.listener?.onProgress(downloadProgressUpdate);
+
+ } while (true)
+
+ tempSink.flush()
+
+ tempSource = Okio.buffer(Okio.source(tempFile));
+ let targetFile = this.getFile(response)
+ targetSink = Okio.buffer(Okio.sink(targetFile));
+ targetSink.writeAll(tempSource);
+ targetSink.flush();
+
+ let option = {};
+ option['statusCode'] = response.code() + "";
+ if (targetFile.exists()) {
+ option['tempFilePath'] = targetFile.getPath();
+ }
+ this.listener?.onComplete(option);
+ } finally {
+ tempSink?.close()
+ targetSink?.close()
+ tempSource?.close()
+ tempFile.delete()
+ }
+ }
+
+ } else {
+ let option = {};
+ const code = response.code() + "";
+ const errorMsg = response.body()?.string();
+ option['statusCode'] = code;
+ option['errorCode'] = code;
+ option['errorMsg'] = errorMsg;
+ option['cause'] = null;
+ this.listener?.onComplete(option);
+ }
+ }
+
+ setCookie(response : Response) {
+ const setCookie = response.header("Set-Cookie")
+ if (!TextUtils.isEmpty(setCookie)) {
+ CookieManager.getInstance().setCookie(response.request().url().toString(), setCookie);
+ }
+ }
+
+ getTempFile() : File {
+ return new File(UTSAndroid.getAppContext()!.getExternalCacheDir(), "temp_" + System.currentTimeMillis())
+ }
+
+
+ getRealPath() : string {
+ var path = UTSAndroid.getAppTempPath() ?? "";
+ return path + this.downloadFilePath;
+ }
+
+ getFile(response : Response) : File {
+ let targetPath = "";
+ if (this.specifyPath != "") {
+ const sourcePath = UTSAndroid.convert2AbsFullPath("/");
+ const sourceFileDir = new File(sourcePath);
+ if (this.isDescendant(sourceFileDir, new File(this.specifyPath))) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '602001';
+ option['errorMsg'] = "This path is not supported";
+ option['cause'] = null;
+ this.listener?.onComplete(option);
+ return new File("")
+ }
+
+ const pos = this.specifyPath.lastIndexOf("/")
+ if (pos == this.specifyPath.length - 1) {
+ //如果filePath是目录
+ if (this.isAbsolute(this.specifyPath)) {
+ targetPath = this.specifyPath;
+ } else {
+ targetPath = UTSAndroid.getAppTempPath()!! + "/" + this.specifyPath
+ }
+ } else {
+ let path = "";
+ if (this.isAbsolute(this.specifyPath)) {
+ path = this.specifyPath;
+ } else {
+ path = UTSAndroid.getAppTempPath()!! + "/" + this.specifyPath;
+ }
+
+ const file = new File(path)
+ const parentFile = file.getParentFile()
+ if (parentFile != null) {
+ if (!parentFile.exists()) {
+ parentFile.mkdirs()
+ }
+ }
+ if (file.exists() && file.isDirectory()) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '602001';
+ option['errorMsg'] = "The target file path is already a directory file, and file creation failed.";
+ option['cause'] = null;
+ this.listener?.onComplete(option);
+ }
+
+ if (!file.exists()) {
+ try {
+ file.createNewFile()
+ } catch (exception : Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '602001';
+ option['errorMsg'] = exception.message;
+ option['cause'] = exception;
+ this.listener?.onComplete(option);
+ }
+ }
+ return file
+ }
+ } else {
+ targetPath = this.getRealPath();
+ }
+
+
+ let fileName = "";
+ let remoteFileName = response.header("content-disposition");
+ if (!TextUtils.isEmpty(remoteFileName)) {
+ // form-data; name="file"; filename="xxx.pdf"
+ const segments : KotlinArray | null = this.stringSplit(remoteFileName, ";")
+ if (segments != null) {
+ for (let i : Int = 0; i < segments.size; i++) {
+ const segment = segments[i];
+ if (segment != null) {
+ if (segment.contains("filename")) {
+ const pair = this.stringSplit(segment.trim(), "=") //目前认为只存在一个键值对
+ if (pair != null) {
+ let key = pair[0];
+ let value = pair[1];
+ if (key != null) {
+ key = key.replace("\"", "");
+ }
+ if (value != null) {
+ value = value.replace("\"", "");
+ }
+
+ if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value) && key!.equals("filename", true)) {
+ if (value != null) {
+ fileName = value;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (TextUtils.isEmpty(fileName)) {
+ let path = response.request().url().encodedPath()
+ let pos = path.lastIndexOf('/')
+ if (pos >= 0) {
+ path = path.substring(pos + 1)
+ if (path.indexOf('.') >= 0) { //存在后缀,则认为成功
+ if (path.contains("?")) {
+ path = path.substring(0, path.indexOf("?"))
+ }
+ fileName = path
+ }
+ }
+ }
+
+
+ if (TextUtils.isEmpty(fileName)) {
+ fileName = System.currentTimeMillis().toString()
+ const contentType = response.header("content-type")
+ let type = MimeTypeMap.getSingleton().getExtensionFromMimeType(contentType);
+ if (type != null) {
+ fileName += "." + type;
+ }
+ }
+
+ fileName = URLDecoder.decode(fileName, "UTF-8")
+ fileName = fileName.replace(File.separator.toRegex(), "")
+ if (fileName.contains("?")) {
+ fileName = fileName.replace("\\?".toRegex(), "0")
+ }
+ if (fileName.length > 80) {
+ const subFileName : String = fileName.substring(0, 80)
+ fileName = subFileName + System.currentTimeMillis()
+ }
+
+ targetPath += fileName
+
+ if (new File(targetPath).exists()) {
+ const index = targetPath.lastIndexOf(".");
+ let tFileName = targetPath;
+ let tFileType = "";
+ if (index >= 0) {
+ tFileName = targetPath.substring(0, index)
+ tFileType = targetPath.substring(index)
+ }
+
+ var number = 1
+ while (new File(targetPath).exists()) {
+ targetPath = tFileName + "(" + number + ")" + tFileType;
+ number++
+ }
+ }
+
+ const file = new File(targetPath)
+ const parentFile = file.getParentFile()
+ if (parentFile != null) {
+ if (!parentFile.exists()) {
+ parentFile.mkdirs()
+ }
+ }
+ if (!file.exists()) {
+ try {
+ file.createNewFile()
+ } catch (exception : Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '602001';
+ option['errorMsg'] = exception.message;
+ option['cause'] = exception;
+ this.listener?.onComplete(option);
+ }
+ }
+ return file
+ }
+
+ isAbsolute(path : string) : boolean {
+ const context = UTSAndroid.getAppContext()!! as Context;
+ if (path.startsWith(context.getFilesDir().getParent())) {
+ return true;
+ }
+
+ const exPath = context.getExternalFilesDir(null)?.getParent();
+ if (exPath != null && path.startsWith(exPath)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * 判断两个文件的上下级关系
+ */
+ isDescendant(parent : File, child : File) : boolean {
+ //有可能开发者传入的是/sdcard 或者/storage/emulated/ 这样的文件路径, 所以要用软连接的实际文件路径进行对比.
+ if (child.getCanonicalPath() == parent.getCanonicalPath()) {
+ return true;
+ }
+ let parentFile = child.getParentFile();
+
+ if (parentFile == null) {
+ return false;
+ }
+ return this.isDescendant(parent, parentFile);
+ }
+
+
+ stringSplit(str : String | null, delim : String | null) : KotlinArray | null {
+ if (!TextUtils.isEmpty(str) && !TextUtils.isEmpty(delim)) {
+ const stringTokenizer = new StringTokenizer(str, delim, false);
+ const result = arrayOfNulls(stringTokenizer.countTokens())
+ var index : Int = 0
+ while (stringTokenizer.hasMoreElements()) {
+ result[index] = stringTokenizer.nextToken().trim()
+ index += 1
+ }
+ return result
+ }
+ return null
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/interceptor/CookieInterceptor.uts b/uni_modules/uni-network/utssdk/app-android/network/interceptor/CookieInterceptor.uts
new file mode 100644
index 0000000000000000000000000000000000000000..9baef0cd7c2995f434a788d7620ad1f59e8c671a
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/interceptor/CookieInterceptor.uts
@@ -0,0 +1,82 @@
+import Interceptor from 'okhttp3.Interceptor';
+import Response from 'okhttp3.Response';
+import CookieHandler from 'java.net.CookieHandler';
+import TreeMap from 'java.util.TreeMap';
+import Headers from 'okhttp3.Headers';
+import Request from 'okhttp3.Request';
+class CookieInterceptor implements Interceptor {
+
+ override intercept(chain : Interceptor.Chain) : Response {
+ let request = chain.request()
+ let headerCookie = request.header("cookie")
+ let uri = request.url().uri()
+ let cookieHandler = CookieHandler.getDefault()
+ if (headerCookie == null) {
+ let requestBuilder = request.newBuilder()
+ try {
+ let currentHeaders = this.toMap(request.headers())
+ let localCookie = cookieHandler.get(uri, currentHeaders)
+ this.addCookies(requestBuilder, localCookie)
+ } catch (e : Exception) {
+ }
+ request = requestBuilder.build()
+ }
+
+ let response = chain.proceed(request)
+
+ try {
+ cookieHandler.put(uri, this.toMap(response.headers()))
+ } catch (e : Exception) {
+ }
+
+ return response
+ }
+
+ private toMap(headers : Headers) : MutableMap> {
+ let result : MutableMap> = new TreeMap(String.CASE_INSENSITIVE_ORDER)
+ let size = headers.size()
+ for (let i:Int = 0; i < size; i++) {
+ let name = headers.name(i)
+ let values = result[name]
+ if (values == null) {
+ values = arrayListOf()
+ result[name] = values
+ }
+ values.add(headers.value(i))
+ }
+ return result
+ }
+
+ private addCookies(builder : Request.Builder, localCookie : MutableMap>) : void {
+
+ let totalList = mutableListOf()
+ let flagList = mutableListOf()
+ for (key in localCookie.keys) {
+ if (flagList.size == 2) {
+ break
+ }
+ if ("cookie".equals(key, true) || "cookie2".equals(key, true)) {
+ flagList.add(key)
+ let cookieList = localCookie[key]
+ if (!cookieList.isNullOrEmpty()) {
+ totalList.addAll(cookieList)
+ }
+ }
+ }
+ let headerStr = new StringBuilder()
+ for (let str in totalList) {
+ headerStr.append(str)
+ headerStr.append("; ")
+ }
+ if (headerStr.toString().endsWith("; ")) {
+ headerStr.deleteRange(headerStr.length - 2, headerStr.length - 1)
+ }
+ if (!headerStr.toString().isEmpty()){
+ builder.addHeader("Cookie", headerStr.toString())
+ }
+ }
+}
+
+export {
+ CookieInterceptor
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/tls/SSLConfig.uts b/uni_modules/uni-network/utssdk/app-android/network/tls/SSLConfig.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e7787f20eb6c72291ce8710e8998720cd28d91be
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/tls/SSLConfig.uts
@@ -0,0 +1,48 @@
+import Arrays from 'java.util.Arrays';
+import KotlinArray from 'kotlin.Array'
+
+class SSLConfig {
+
+ private keystore ?: string = null;
+ private storePass ?: string = null;
+ private ca ?: KotlinArray = null;
+
+ public getKeystore() : string | null {
+ return this.keystore;
+ }
+
+ public setKeystore(ks : string) {
+ if (ks == null) {
+ ks = "";
+ }
+ this.keystore = ks;
+ }
+
+ public getStorePass() : string | null {
+ return this.storePass;
+ }
+
+ public setStorePass(sp : string) {
+ if (sp == null) {
+ sp = "";
+ }
+ this.storePass = sp;
+ }
+
+
+ public getCa() : KotlinArray | null {
+ return this.ca;
+ }
+
+ public setCa(ca : KotlinArray) {
+ if (ca == null) {
+ ca = emptyArray();
+ }
+ this.ca = ca;
+ }
+}
+
+
+export {
+ SSLConfig
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/tls/SSLFactoryManager.uts b/uni_modules/uni-network/utssdk/app-android/network/tls/SSLFactoryManager.uts
new file mode 100644
index 0000000000000000000000000000000000000000..1d2fdcbbcd1dfb7dd7e45448cdd445817ea26176
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/tls/SSLFactoryManager.uts
@@ -0,0 +1,65 @@
+import SSLSocketFactory from 'javax.net.ssl.SSLSocketFactory';
+import { SSLConfig } from './SSLConfig.uts'
+import SSLContext from 'javax.net.ssl.SSLContext';
+import KeyStore from 'java.security.KeyStore';
+import KeyManagerFactory from 'javax.net.ssl.KeyManagerFactory';
+import CertificateFactory from 'java.security.cert.CertificateFactory';
+import TextUtils from 'android.text.TextUtils';
+
+
+class SSLFactoryManager {
+ private static instance?: SSLFactoryManager = null;
+
+ private cacheSSLFactory: Map = new Map();
+
+ public static getInstance(): SSLFactoryManager {
+ if (this.instance == null) {
+ this.instance = SSLFactoryManager();
+ }
+ return this.instance!;
+ }
+
+ public getSSLSocketFactory(sslConfig: SSLConfig): SSLSocketFactory | null {
+ if (sslConfig == null) {
+ return null;
+ }
+
+
+ if (this.cacheSSLFactory.has(sslConfig)){
+ let sslFactory = this.cacheSSLFactory.get(sslConfig);
+ if (sslConfig != null){
+ return sslFactory;
+ }
+ }
+
+
+ try{
+ let sslContext = SSLContext.getInstance('TLS');
+ let keyStore = KeyStore.getInstance('PKCS12');
+ let keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+
+ if (!TextUtils.isEmpty(sslConfig.getKeystore()) && !TextUtils.isEmpty(sslConfig.getStorePass())){
+ //todo 1. 这里需要解析keystore
+ // 2. 如果是文件需要转换一下路径，然后读出来。
+ // resolve ： 原生层会提供bundleurl和运行模式的接口。
+
+ }else{
+ keyManagerFactory = null;
+ }
+
+ let certificateFactory = CertificateFactory.getInstance('X.509');
+ let caKeyStore = KeyStore.getInstance('PKCS12');
+
+
+
+ }catch(e : Exception){
+
+ }
+
+ return null;
+ }
+}
+
+export {
+ SSLFactoryManager
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/upload/InputStreamRequestBody.uts b/uni_modules/uni-network/utssdk/app-android/network/upload/InputStreamRequestBody.uts
new file mode 100644
index 0000000000000000000000000000000000000000..0925757344b06910324e256f7c32991250634d86
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/upload/InputStreamRequestBody.uts
@@ -0,0 +1,47 @@
+import RequestBody from 'okhttp3.RequestBody';
+import MediaType from 'okhttp3.MediaType';
+import InputStream from 'java.io.InputStream';
+import BufferedSink from 'okio.BufferedSink';
+import Source from 'okio.Source';
+import Okio from 'okio.Okio';
+import Util from 'okhttp3.internal.Util';
+
+
+
+export class InputStreamRequestBody extends RequestBody {
+ private mediaType : MediaType | null = null;
+ private length : Long = -1;
+ private inputStream : InputStream | null = null;
+
+ constructor(mediaType : MediaType, length : Long, inputStream : InputStream) {
+ super()
+ this.mediaType = mediaType;
+ this.length = length;
+ this.inputStream = inputStream;
+ }
+
+
+ override contentLength() : Long {
+ return this.length;
+ }
+
+ override contentType() : MediaType {
+ const type = this.mediaType;
+ if (type == null) {
+ return MediaType.parse("application/octet-stream")!;
+ } else {
+ return type;
+ }
+ }
+
+ override writeTo(sink : BufferedSink) {
+ let source : Source | null = null;
+ try {
+ source = Okio.source(this.inputStream);
+ sink.writeAll(source);
+ } catch (e) {
+ }
+ Util.closeQuietly(source);
+ }
+
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/upload/ProgressRequestBody.uts b/uni_modules/uni-network/utssdk/app-android/network/upload/ProgressRequestBody.uts
new file mode 100644
index 0000000000000000000000000000000000000000..f025825b7fba8a04b310e5539e8ae617d92a2a40
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/upload/ProgressRequestBody.uts
@@ -0,0 +1,62 @@
+import RequestBody from 'okhttp3.RequestBody';
+import MediaType from 'okhttp3.MediaType';
+import BufferedSink from 'okio.BufferedSink';
+import ForwardingSink from 'okio.ForwardingSink';
+import Sink from 'okio.Sink';
+import Buffer from 'okio.Buffer';
+import Okio from 'okio.Okio';
+
+export interface UploadProgressListener {
+ onProgress(bytesWritten : number, contentLength : number) : void;
+}
+
+class CountingSink extends ForwardingSink {
+ private listener : UploadProgressListener | null = null;
+ private bytesWritten : number = 0;
+ private total : number = 0;
+ constructor(sink : Sink, total : number, listener : UploadProgressListener) {
+ super(sink)
+ this.listener = listener;
+ this.total = total;
+ }
+
+ override write(source : Buffer, byteCount : Long) {
+ super.write(source, byteCount);
+ this.bytesWritten += byteCount;
+ this.listener?.onProgress(this.bytesWritten, this.total);
+ }
+
+}
+
+
+export class ProgressRequestBody extends RequestBody {
+ private requestBody : RequestBody | null = null;
+ private listener : UploadProgressListener | null = null;
+ constructor(requestBody : RequestBody, listener : UploadProgressListener) {
+ super();
+ this.requestBody = requestBody;
+ this.listener = listener;
+ }
+
+
+ override contentLength() : Long {
+ return this.requestBody?.contentLength() ?? 0;
+ }
+
+ override contentType() : MediaType {
+ const body = this.requestBody;
+ if (body == null) {
+ return MediaType.parse("application/octet-stream")!;
+ } else {
+ return body.contentType()!;
+ }
+ }
+
+ override writeTo(sink : BufferedSink) {
+ const countingSink = new CountingSink(sink, this.contentLength(), this.listener!);
+ const bufferedSink = Okio.buffer(countingSink);
+ this.requestBody?.writeTo(bufferedSink);
+ bufferedSink.flush();
+ }
+
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-android/network/upload/UploadController.uts b/uni_modules/uni-network/utssdk/app-android/network/upload/UploadController.uts
new file mode 100644
index 0000000000000000000000000000000000000000..22c366779781b323b3f2adfb8924682af8d7a16c
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-android/network/upload/UploadController.uts
@@ -0,0 +1,378 @@
+import { UploadFileOptions, UploadTask, UploadFileProgressUpdateCallback, UploadFileOptionFiles, OnProgressUpdateResult } from '../../../interface.uts';
+import { NetworkUploadFileListener } from '../NetworkManager.uts'
+import OkHttpClient from 'okhttp3.OkHttpClient';
+import TimeUnit from 'java.util.concurrent.TimeUnit';
+import ExecutorService from 'java.util.concurrent.ExecutorService';
+import Executors from 'java.util.concurrent.Executors';
+import RequestBody from 'okhttp3.RequestBody';
+import MediaType from 'okhttp3.MediaType';
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+import MultipartBody from 'okhttp3.MultipartBody';
+import Call from 'okhttp3.Call';
+import Dispatcher from 'okhttp3.Dispatcher';
+import Request from 'okhttp3.Request';
+import MimeTypeMap from 'android.webkit.MimeTypeMap';
+import TextUtils from 'android.text.TextUtils';
+import File from 'java.io.File';
+import Uri from 'android.net.Uri';
+import InputStream from 'java.io.InputStream';
+import MediaStore from 'android.provider.MediaStore';
+import FileInputStream from 'java.io.FileInputStream';
+import { InputStreamRequestBody } from './InputStreamRequestBody.uts';
+import { UploadProgressListener, ProgressRequestBody } from './ProgressRequestBody.uts'
+import Callback from 'okhttp3.Callback';
+import Response from 'okhttp3.Response';
+import IOException from 'java.io.IOException';
+import Retention from 'java.lang.annotation.Retention';
+import URI from 'java.net.URI';
+import Build from 'android.os.Build';
+import Environment from 'android.os.Environment';
+import UUID from 'java.util.UUID';
+
+
+class FileInformation {
+ public inputStream : InputStream | null = null;
+ public size : Long = -1;
+ public mime : string | null = null;
+ public name : string | null = null;
+}
+
+class NetworkUploadTaskImpl implements UploadTask {
+ private call : Call | null = null;
+ private listener : NetworkUploadFileListener | null = null;
+ constructor(call : Call, listener : NetworkUploadFileListener) {
+ this.call = call;
+ this.listener = listener;
+ }
+
+ public abort() {
+ if (this.call != null) {
+ this.call?.cancel();
+ }
+ }
+
+ public onProgressUpdate(option : UploadFileProgressUpdateCallback) {
+ const kListener = this.listener;
+ if (kListener != null) {
+ kListener.progressListeners.add(option);
+ }
+ }
+}
+
+class NetworkUploadProgressListener implements UploadProgressListener {
+ private listener : NetworkUploadFileListener | null = null;
+ constructor(listener : NetworkUploadFileListener) {
+ this.listener = listener;
+ }
+
+ onProgress(bytesWritten : number, contentLength : number) {
+ const progress = (bytesWritten.toFloat() / contentLength) * 100
+ const progressUpdate : OnProgressUpdateResult = {
+ progress: progress.toInt(),
+ totalBytesSent: bytesWritten,
+ totalBytesExpectedToSend: contentLength
+ }
+
+ this.listener?.onProgress(progressUpdate);
+ }
+}
+
+class UploadController {
+ private static instance : UploadController | null = null
+
+ /**
+ * 上传的线程池
+ */
+ private uploadExecutorService : ExecutorService | null = null;
+
+ public static getInstance() : UploadController {
+ if (this.instance == null) {
+ this.instance = new UploadController();
+ }
+ return this.instance!;
+ }
+
+ public uploadFile(options : UploadFileOptions, listener : NetworkUploadFileListener) : UploadTask | null {
+ const client = this.createUploadClient(options);
+
+ let request = this.createUploadRequest(options, listener);
+ if (request == null) {
+ return null;
+ }
+ let call : Call = client.newCall(request);
+ call.enqueue(new SimpleUploadCallback(listener));
+
+ let task = new NetworkUploadTaskImpl(call, listener);
+
+ return task;
+ }
+
+ private createUploadClient(option : UploadFileOptions) : OkHttpClient {
+
+ let clientBuilder = OkHttpClient.Builder();
+ const timeout : Long = option.timeout != null ? option.timeout!.toLong() : 120000;
+ clientBuilder.connectTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.readTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.writeTimeout(timeout, TimeUnit.MILLISECONDS);
+ clientBuilder.callTimeout(timeout, TimeUnit.MILLISECONDS);
+
+ if (this.uploadExecutorService == null) {
+ this.uploadExecutorService = Executors.newFixedThreadPool(10);
+ }
+
+ clientBuilder.dispatcher(new Dispatcher(this.uploadExecutorService));
+
+ return clientBuilder.build();
+ }
+
+
+ private createUploadRequest(options : UploadFileOptions, listener : NetworkUploadFileListener) : Request | null {
+ let requestBilder = new Request.Builder();
+ try {
+ requestBilder.url(options.url);
+ } catch (e : Exception) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = "invalid URL";
+ option['cause'] = "invalid URL";
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+
+ let multiPartBody = (new MultipartBody.Builder("----" + UUID.randomUUID().toString())).setType(MultipartBody.FORM);
+
+ const formData = options.formData?.toMap();
+ if (formData != null) {
+ for (entry in formData) {
+ const key = entry.key;
+ const value = entry.value;
+ if (value != null) {
+ multiPartBody.addFormDataPart(key, "" + value);
+ } else {
+ continue;
+ }
+ }
+ }
+
+ const tempFiles = options.files;
+ if (tempFiles != null && tempFiles!.length > 0) {
+ const files : UploadFileOptionFiles[] = tempFiles;
+ for (let i = 0; i < files.length; i++) {
+ const file = files[i];
+ const path = file.uri;
+ const fileInformation = this.getFileInformation(path)
+ const name = file.name ?? "file";
+
+ const inputStream = fileInformation?.inputStream;
+ if (fileInformation != null && inputStream != null) {
+ let requestBody = new InputStreamRequestBody(MediaType.parse(fileInformation.mime ?? "*/*")!, fileInformation.size, inputStream);
+ multiPartBody.addFormDataPart(name, fileInformation.name, requestBody);
+ } else {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = "Illegal file";
+ option['cause'] = "Illegal file";
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+ }
+ } else {
+ const filePath = options.filePath;
+ if (filePath == null) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = "filePath is null";
+ option['cause'] = "filePath is null";
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+
+ const fileInformation = this.getFileInformation(filePath);
+ const name = options.name ?? "file";
+
+ const inputStream = fileInformation?.inputStream;
+ if (fileInformation != null && inputStream != null) {
+ let requestBody = new InputStreamRequestBody(MediaType.parse(fileInformation.mime ?? "*/*")!, fileInformation.size, inputStream);
+ multiPartBody.addFormDataPart(name, fileInformation.name, requestBody);
+ } else {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = "Illegal file";
+ option['cause'] = "Illegal file";
+ if (listener != null) {
+ listener.onComplete(option);
+ }
+ return null;
+ }
+ }
+
+
+ let ua = UTSAndroid.getWebViewInfo(UTSAndroid.getAppContext()!)["ua"].toString();
+ requestBilder.header("User-Agent", ua);
+
+ const headers = options.header?.toMap();
+ if (headers != null) {
+ for (entry in headers) {
+ const key = entry.key;
+ const value = entry.value;
+
+ if (value != null) {
+ requestBilder.addHeader(key, "" + value);
+ } else {
+ continue;
+ }
+ }
+ }
+
+ requestBilder.post(new ProgressRequestBody(multiPartBody.build(), new NetworkUploadProgressListener(listener)));
+
+ return requestBilder.build();
+ }
+
+
+ /**
+ * 获取文件信息对象
+ */
+ private getFileInformation(uri : string) : FileInformation | null {
+ let result : FileInformation | null = null;
+ if (uri.startsWith("content://")) {
+ const contentUri = Uri.parse(uri);
+ const context = UTSAndroid.getAppContext();
+ let cursor = context!.getContentResolver().query(contentUri, null, null, null, null);
+ if (cursor != null) {
+ cursor.moveToFirst();
+ let fileInformation = new FileInformation();
+ fileInformation.inputStream = context.getContentResolver().openInputStream(contentUri);
+ fileInformation.size = cursor.getInt(cursor.getColumnIndex(MediaStore.Images.Media.SIZE)).toLong();
+ fileInformation.name = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME));
+ fileInformation.mime = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE))
+ result = fileInformation;
+ cursor.close()
+ }
+ } else {
+ if (!uri.startsWith("file://")) {
+ // 如果不是file://开头的，就说明是相对路径。
+ uri = UTSAndroid.convert2AbsFullPath(uri)
+ } else {
+ uri = uri.substring("file://".length)
+ }
+
+ let file = new File(uri);
+ let fileInputStream = new FileInputStream(file);
+ let size = file.length();
+ let name = file.getName();
+ let mime = this.getMimeType(name);
+
+ let fileInformation = new FileInformation();
+ fileInformation.inputStream = fileInputStream;
+ fileInformation.size = size;
+ fileInformation.name = name;
+ fileInformation.mime = mime;
+ result = fileInformation;
+ }
+
+ return result;
+ }
+
+ private checkPrivatePath(path : string) : boolean {
+ if (Build.VERSION.SDK_INT > 29 && Environment.isExternalStorageManager()) {
+ return true;
+ }
+
+ if (path.startsWith("file://")) {
+ path = path.replace("file://", "");
+ }
+ const context = UTSAndroid.getAppContext()!;
+ let cache = context.getExternalCacheDir();
+ let sPrivateExternalDir = ""
+ if (cache == null) {
+ sPrivateExternalDir = Environment.getExternalStorageDirectory().getPath() + "/Android/data/" + context.getPackageName();
+ } else {
+ sPrivateExternalDir = cache.getParent();
+ }
+ const sPrivateDir = context.getFilesDir().getParent();
+
+ if (sPrivateExternalDir.startsWith("/") && !path.startsWith("/")) {
+ path = "/" + path;
+ }
+
+ if ((path.contains(sPrivateDir) || path.contains(sPrivateExternalDir))//表示应用私有路径
+ || this.isAssetFile(path) //表示apk的assets路径文件
+ || Build.VERSION.SDK_INT < Build.VERSION_CODES.Q//表示当前手机属于可正常访问路径系统
+ ) {
+ //文件路径在私有路径下或手机系统版符合非分区存储逻辑
+ return true;
+ }
+
+ return false;
+ }
+
+ private isAssetFile(filePath : string) : boolean {
+ let isAsset = false;
+ if (filePath.startsWith("apps/")) {
+ isAsset = true;
+ } else if (filePath.startsWith("/android_asset/") || filePath.startsWith("android_asset/")) {
+ isAsset = true;
+ }
+ return isAsset;
+ }
+
+
+ /**
+ * 获取文件mime
+ */
+ private getMimeType(filename : string) : string {
+ let map = MimeTypeMap.getSingleton()
+ var extType = MimeTypeMap.getFileExtensionFromUrl(filename)
+ if (extType == null && filename.lastIndexOf(".") >= 0) {
+ extType = filename.substring(filename.lastIndexOf(".") + 1)
+ }
+ let ret = map.getMimeTypeFromExtension(extType);
+ if (TextUtils.isEmpty(ret)) {
+ if (TextUtils.isEmpty(extType)) {
+ ret = "*/*"
+ } else {
+ ret = "application/" + extType
+ }
+ }
+
+ return ret!;
+ }
+}
+
+class SimpleUploadCallback implements Callback {
+ private listener : NetworkUploadFileListener | null = null;
+ constructor(listener : NetworkUploadFileListener) {
+ this.listener = listener;
+ }
+
+
+ override onFailure(call : Call, exception : IOException) {
+ let option = {};
+ option['statusCode'] = '-1';
+ option['errorCode'] = '-1';
+ option['errorMsg'] = exception.message;
+ option['cause'] = exception.message;
+ this.listener?.onComplete(option);
+ }
+ override onResponse(call : Call, response : Response) {
+ const result = {};
+ result["statusCode"] = response.code() + "";
+ result["data"] = response.body()?.string();
+ this.listener?.onComplete(result);
+ }
+}
+
+export {
+ UploadController
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-ios/CodingHandler.swift b/uni_modules/uni-network/utssdk/app-ios/CodingHandler.swift
new file mode 100644
index 0000000000000000000000000000000000000000..979052708eb26e5391d3858f188a8cbd80d6534d
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-ios/CodingHandler.swift
@@ -0,0 +1,41 @@
+//
+// CodingHandler.swift
+//
+// Created by TaoHebin on 2023/3/6.
+//
+
+import Foundation
+
+
+func cleanUTF8(data:Data?) -> Data? {
+ if let data = data {
+ let cd = iconv_open("UTF-8", "UTF-8")
+ var one = 1
+ let argPointer = withUnsafeMutablePointer(to: &one) {$0}
+ iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, argPointer)
+ var inbytesleft:Int = data.count
+ var outbytesleft:Int = data.count
+
+ var inbuf = data.withUnsafeBytes { (buffer : UnsafeRawBufferPointer) in
+ let src:UnsafeMutablePointer? = UnsafeMutablePointer.allocate(capacity:buffer.count)
+ memset(src, 0, buffer.count)
+ memcpy(src, buffer.baseAddress, buffer.count)
+ return src
+ }
+ let outbuf:UnsafeMutablePointer? = UnsafeMutablePointer.allocate(capacity:data.count)
+ var outPtr = outbuf
+ if iconv(cd, &inbuf, &inbytesleft, &outPtr, &outbytesleft) == -1{
+ return nil
+ }
+
+ var result : Data? = nil
+ if let outbuf = outbuf{
+ result = Data(bytes: outbuf, count: data.count)
+ }
+ iconv_close(cd)
+ outbuf?.deallocate()
+ return result
+ }else{
+ return nil
+ }
+}
diff --git a/uni_modules/uni-network/utssdk/app-ios/index.uts b/uni_modules/uni-network/utssdk/app-ios/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..e3eeb48d02ec3bada413fbb3aa16cfc18ce30ff3
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-ios/index.uts
@@ -0,0 +1,175 @@
+import { Request, RequestOptions, RequestSuccess, RequestFail, RequestTask } from './interface';
+import { NetworkManager, NetworkRequestListener } from './network/NetworkManager.uts'
+import { Data, HTTPURLResponse, NSError, NSNumber , ComparisonResult } from 'Foundation';
+import { StatusCode } from './network/StatusCode.uts';
+
+class SimpleNetworkListener extends NetworkRequestListener {
+ private param : RequestOptions | null = null;
+ private headers : Map | null = null;
+ private received : number = 0;
+ private data : Data = new Data();
+ constructor(param : RequestOptions) {
+ this.param = param;
+ super();
+ }
+
+ public override onStart() : void {
+ }
+
+ public override onHeadersReceived(statusCode : number, headers : Map) : void {
+ this.headers = headers;
+ }
+ public override onDataReceived(data : Data) : void {
+ this.received += data.count;
+ this.data.append(data);
+ }
+
+ public override onFinished(response : HTTPURLResponse) : void {
+ try {
+ let headers = response.allHeaderFields as Map;
+ let kParam = this.param;
+ let result = {};
+ result['statusCode'] = response.statusCode;
+ result['statusText'] = StatusCode.getStatus(new String(response.statusCode));
+ if (headers != null) {
+ result['header'] = headers;
+ }
+ let strData = this.readStringFromData(this.data, response.textEncodingName);
+
+
+ let type = kParam?.responseType != null ? kParam?.responseType : kParam?.dataType;
+
+ if (type == null && headers != null) {
+
+ for (entry in headers){
+ let key = entry.key;
+ if (key.caseInsensitiveCompare("Content-Type") == ComparisonResult.orderedSame) {
+ type = headers[key] as string;
+ }
+ }
+ }
+
+
+ result['data'] = this.parseData(this.data, strData, type);
+
+ let tmp : RequestSuccess = {
+ data: result['data']!,
+ statusCode: (new NSNumber(value = response.statusCode)),
+ header: result['header'] ?? "",
+ cookies: []
+ };
+ let success = kParam?.success;
+ let complete = kParam?.complete;
+ success?.(tmp);
+ complete?.(tmp);
+
+ } catch (e) {
+ }
+ }
+
+ public override onFail(error : NSError) : void {
+
+ let kParam = this.param;
+ let result = {};
+ let code = (error as NSError).code;
+ // result['data'] = error.localizedDescription + "(" + new String(code) + ")";
+ // result['errorMsg'] = error.localizedDescription + "(" + new String(code) + ")";
+ // result['statusText'] = StatusCode.getStatus(new String(code) + "");
+ // if (this.headers != null) {
+ // result['header'] = this.headers;
+ // }
+
+ let errCode = code;
+ let errMsg = error.localizedDescription;
+ if (code == -1001) {
+ errCode = 5;
+ } else if (code == -1004) {
+ errCode = 1000;
+ } else if (code == -1009) {
+ errCode = 600003;
+ } else if (code == -1000 || code == -1002 || code == -1003) {
+ errMsg = 'ERR_INVALID_REQUEST';
+ }
+
+
+ // let failResult : RequestFail = {
+ // errSubject: "uni-request",
+ // errMsg: errMsg,
+ // errCode: errCode,
+ // };
+ let failResult : RequestFail = new UniError("uni-request", Number.from(errCode), errMsg);
+
+ let fail = kParam?.fail;
+ let complete = kParam?.complete;
+ fail?.(failResult);
+ complete?.(failResult);
+ }
+
+
+ private readStringFromData(data : Data, type : string | null) : string | null {
+ let result : string | null = null;
+ let finalType = type;
+ if (finalType == null || finalType!.length == 0) {
+ finalType = "utf-8";
+ }
+
+ let cfEncoding = CFStringConvertIANACharSetNameToEncoding(finalType as CFString);
+ if (cfEncoding != kCFStringEncodingInvalidId) {
+ let stringEncoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
+ let encode = new String.Encoding(rawValue = stringEncoding);
+ result = new String(data = data, encoding = encode);
+ }
+ return result;
+ }
+
+ private parseData(data : Data | null, dataStr : string | null, type : string | null) : any | null {
+ if (type != null && type!.contains("json")) {
+ if (dataStr == null || dataStr!.length == 0) {
+ return {};
+ }
+ return this.parseJson(dataStr!);
+ } else if (type == 'jsonp') {
+ if (dataStr == null || dataStr!.length == 0) {
+ return {};
+ }
+ let start = dataStr!.indexOf('(');
+ let end = dataStr!.indexOf(')');
+ if (start == 0 || start >= end) {
+ return {};
+ }
+ start += 1;
+ let tmp = dataStr!.slice(start, end);
+ return this.parseJson(tmp);
+ } else {
+ //dataStr如果解码失败是空的时候，还需要继续尝试解码。极端情况，服务器不是utf8的，所以字符解码会出现乱码，所以特殊处理一下非utf8的字符。
+ if (data == null) {
+ return data;
+ }
+
+ let currentStr : string | null = dataStr;
+ //todo 等uts支持swift文件混编的时候，再进行处理。
+ // if (currentStr == null) {
+ // let data = cleanUTF8(data);
+ // if (data != null) {
+ // currentStr = new String(data = data, encoding = String.Encoding.utf8);
+ // }
+ // }
+
+ if (currentStr == null) {
+ currentStr = new String(data = data!, encoding = String.Encoding.ascii);
+ }
+
+ return currentStr;
+ }
+ }
+
+
+ private parseJson(str : string) : any | null{
+ return JSON.parse(str);
+ }
+}
+
+
+export const request : Request = (param : RequestOptions) : RequestTask | null => {
+ return NetworkManager.getInstance().request(param, new SimpleNetworkListener(param));
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-ios/interface.uts b/uni_modules/uni-network/utssdk/app-ios/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..334a16790ae5d752dec4ce9d5b8581638bef6808
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-ios/interface.uts
@@ -0,0 +1,574 @@
+
+export type Request = (param: RequestOptions) => RequestTask | null;
+
+/**
+ * 网络请求参数
+ */
+export type RequestOptions = {
+ /**
+ * 开发者服务器接口地址
+ */
+ url: string,
+ /**
+ * 请求的参数 Object|String类型
+ * @type {RequestDataOptions}
+ * @defaultValue null
+ */
+ data?: any | null,
+ /**
+ * 设置请求的 header，header 中不能设置 Referer
+ * @defaultValue null
+ */
+ header?: UTSJSONObject,
+ /**
+ * 请求类型 默认值GET
+ * GET|POST|PUT|DELETE|HEAD|OPTIONS
+ * @type {RequestMethod}
+ * @defaultValue "GET"
+ */
+ method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS"| null,
+ /**
+ * 超时时间，单位 ms
+ * @defaultValue 60000
+ */
+ timeout?: number | null,
+ /**
+ * 如果设为 json，会对返回的数据进行一次 JSON.parse，非 json 不会进行 JSON.parse
+ * @defaultValue "json"
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ dataType?: string | null,
+ /**
+ * 设置响应的数据类型。
+ *
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ responseType?: string | null,
+ /**
+ * 验证 ssl 证书
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ sslVerify?: boolean | null,
+ /**
+ * 跨域请求时是否携带凭证（cookies）
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ withCredentials?: boolean | null,
+ /**
+ * DNS解析时优先使用ipv4
+ * @defaultValue false
+ */
+ firstIpv4?: boolean | null,
+ /**
+ * 网络请求成功回调。
+ * @defaultValue null
+ */
+ success?: RequestSuccessCallback | null,
+ /**
+ * 网络请求失败回调。
+ * @defaultValue null
+ */
+ fail?: RequestFailCallback | null,
+ /**
+ * 网络请求完成回调，成功或者失败都会调用。
+ * @defaultValue null
+ */
+ complete?: RequestCompleteCallback | null
+}
+
+export type RequestSuccess = {
+ /**
+ * 开发者服务器返回的数据
+ * @type {RequestDataOptions}
+ */
+ data: any | null,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number,
+ /**
+ * 开发者服务器返回的 HTTP Response Header
+ */
+ header: any,
+ /**
+ * 开发者服务器返回的 cookies，格式为字符串数组
+ */
+ cookies: Array
+}
+
+export type RequestFail = UniError;
+export type RequestSuccessCallback = (option: RequestSuccess) => void;
+export type RequestFailCallback = (option: RequestFail) => void;
+export type RequestCompleteCallback = (option: any) => void;
+
+
+export interface RequestTask {
+ /**
+ * abort()
+ * @description
+ * 中断网络请求。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/request.html#request
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var requestTask = uni.request({
+ url: 'http://192.168.12.106:8080/postHalo', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ requestTask.abort();
+ ```
+ */
+ abort(): void
+}
+
+
+//===============================上传==================================
+
+
+export type UploadFile = (options: UploadFileOptions) => UploadTask | null;
+export type UploadFileOptionFiles = {
+ /**
+ * multipart 提交时，表单的项目名，默认为 file，如果 name 不填或填的值相同，可能导致服务端读取文件时只能读取到一个文件。
+ */
+ name: string | null,
+ /**
+ * 要上传文件资源的路径
+ */
+ uri: string,
+ /**
+ * 要上传的文件对象，仅H5（2.6.15+）支持
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ file: any | null
+};
+export type UploadFileSuccess = {
+ /**
+ * 开发者服务器返回的数据
+ */
+ data: string,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number
+};
+export type UploadFileSuccessCallback = (result: UploadFileSuccess) => void;
+export type UploadFileFail = UniError;
+export type UploadFileFailCallback = (result: UploadFileFail) => void;
+
+export type UploadFileCompleteCallback = (result: any) => void;
+export type UploadFileOptions = {
+ /**
+ * 开发者服务器 url
+ */
+ url: string,
+ /**
+ * 要上传文件资源的路径
+ */
+ filePath?: string | null,
+ /**
+ * 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+ */
+ name?: string | null,
+ /**
+ * 需要上传的文件列表。
+ */
+ files?: (UploadFileOptionFiles[]) | null,
+ /**
+ * HTTP 请求 Header, header 中不能设置 Referer
+ */
+ header?: UTSJSONObject | null,
+ /**
+ * HTTP 请求中其他额外的 form data
+ */
+ formData?: UTSJSONObject | null,
+ /**
+ * 超时时间，单位 ms
+ */
+ timeout?: number | null,
+ /**
+ * 成功返回的回调函数
+ */
+ success?: UploadFileSuccessCallback | null,
+ /**
+ * 失败的回调函数
+ */
+ fail?: UploadFileFailCallback | null,
+ /**
+ * 结束的回调函数（调用成功、失败都会执行）
+ */
+ complete?: UploadFileCompleteCallback | null
+};
+export type OnProgressUpdateResult = {
+ /**
+ * 上传进度百分比
+ */
+ progress: number,
+ /**
+ * 已经上传的数据长度，单位 Bytes
+ */
+ totalBytesSent: number,
+ /**
+ * 预期需要上传的数据总长度，单位 Bytes
+ */
+ totalBytesExpectedToSend: number
+};
+
+export type UploadFileProgressUpdateCallback = (result: OnProgressUpdateResult) => void
+export interface UploadTask {
+ /**
+ * abort()
+ * @description
+ * 中断上传任务。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var uploadTask = uni.uploadFile({
+ url: 'http://192.168.12.106:8080/uploadFile', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ uploadTask.abort();
+ ```
+ */
+ abort(): void,
+ /**
+ * onProgressUpdate()
+ * @description
+ * 监听上传进度变化。
+ * @param {UploadFileProgressUpdateCallback} callback
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uploadTask.onProgressUpdate((res) => {
+ console.log('上传进度' + res.progress);
+ console.log('已经上传的数据长度' + res.totalBytesSent);
+ console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+ });
+ ```
+ */
+ onProgressUpdate(callback: UploadFileProgressUpdateCallback): void,
+};
+
+//===============================下载==================================
+
+export type DownloadFile = (options: DownloadFileOptions) => DownloadTask | null;
+export type DownloadFileSuccess = {
+ /**
+ * 临时文件路径，下载后的文件会存储到一个临时文件
+ */
+ tempFilePath: string,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number
+};
+export type DownloadFileSuccessCallback = (result: DownloadFileSuccess) => void;
+export type DownloadFileFail = UniError;
+export type DownloadFileFailCallback = (result: DownloadFileFail) => void;
+export type DownloadFileComplete = any;
+export type DownloadFileCompleteCallback = (result: DownloadFileComplete) => void;
+export type DownloadFileOptions = {
+ /**
+ * 下载资源的 url
+ */
+ url: string,
+ /**
+ * HTTP 请求 Header，header 中不能设置 Referer
+ */
+ header?: UTSJSONObject | null,
+ /**
+ * 超时时间，单位 ms
+ */
+ timeout?: number | null,
+ /**
+ * 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'}
+ */
+ success?: DownloadFileSuccessCallback | null,
+ /**
+ * 失败的回调函数
+ */
+ fail?: DownloadFileFailCallback | null,
+ /**
+ * 结束的回调函数（调用成功、失败都会执行）
+ */
+ complete?: DownloadFileCompleteCallback | null
+};
+export type OnProgressDownloadResult = {
+ /**
+ * 下载进度百分比
+ */
+ progress: number,
+ /**
+ * 已经下载的数据长度，单位 Bytes
+ */
+ totalBytesWritten: number,
+ /**
+ * 预期需要下载的数据总长度，单位 Bytes
+ */
+ totalBytesExpectedToWrite: number
+};
+export type DownloadFileProgressUpdateCallback = (result: OnProgressDownloadResult) => void;
+export interface DownloadTask {
+ /**
+ * abort()
+ * @description
+ * 中断下载任务。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var downloadTask = uni.downloadFile({
+ url: 'https://www.example.com/file/test', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ downloadTask.abort();
+ ```
+ */
+ abort(): void,
+ /**
+ * onProgressUpdate()
+ * @description
+ * 监听下载进度变化。
+ * @param {DownloadFileProgressUpdateCallback} callback
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ downloadTask.onProgressUpdate((res) => {
+ console.log('下载进度' + res.progress);
+ console.log('已经下载的数据长度' + res.totalBytesWritten);
+ console.log('预期需要下载的数据总长度' + res.totalBytesExpectedToWrite);
+ });
+ ```
+ */
+ onProgressUpdate(callback: DownloadFileProgressUpdateCallback): void,
+};
+
+
+export interface Uni {
+ /**
+ * Request()
+ * @description
+ * 发起网络请求。
+ * @param {RequestOptions} options
+ * @return {RequestTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/request.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.request({
+ url: "http://192.168.12.106:8080/postHalo",
+ dataType: "json",
+ responseType: "json",
+ method: "POST",
+ data: {
+ platform: "ios",
+ },
+ // header: {
+ // "Content-Type": "application/json",
+ // },
+ timeout: 6000,
+ sslVerify: false,
+ withCredentials: false,
+ firstIpv4: false,
+ success(res) {
+ console.log("success :", res.data);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete(res) {
+ console.log("complete :", res);
+ },
+ });
+ ```
+ */
+ request: Request,
+ /**
+ * UploadFile()
+ * @description
+ * 将本地资源上传到开发者服务器。
+ * @param {UploadFileOptions} options
+ * @return {UploadTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.uploadFile({
+ url: 'http://192.168.12.106:8080/uploadFile', //仅为示例，非真实的接口地址
+ filePath: "/static/logo.png",
+ name: 'file',
+ formData: {
+ 'user': 'test'
+ },
+ success: (uploadFileRes) => {
+ console.log(uploadFileRes.data);
+ }
+ });
+ ```
+ */
+ uploadFile: UploadFile,
+ /**
+ * DownloadFile()
+ * @description
+ * 下载文件资源到本地，客户端直接发起一个 HTTP GET 请求，返回文件的本地临时路径。
+ * @param {DownloadFileOptions} options
+ * @return {DownloadTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.downloadFile({
+ url: "http://192.168.12.106:8080/downloadfile",
+ success(e) {
+ console.log("success111 :", e);
+ }
+ });
+ ```
+ */
+ downloadFile: DownloadFile
+}
diff --git a/uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts b/uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts
new file mode 100644
index 0000000000000000000000000000000000000000..b8ced5bbb5d72fe14ec116581c382a5ea3185d0f
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts
@@ -0,0 +1,174 @@
+import { RequestOptions, RequestTask } from '../interface.uts'
+import { UTSiOS } from "DCloudUTSFoundation";
+import { URLSessionDataDelegate, URL, CharacterSet, URLSession, URLSessionConfiguration, OperationQueue, URLSessionTask, URLResponse, URLSessionDataTask, URLAuthenticationChallengeSender, URLAuthenticationChallenge, URLCredential, URLSessionTaskMetrics, Data, HTTPURLResponse, NSError, URLRequest, ComparisonResult } from 'Foundation';
+
+class NetworkRequestListener {
+ public onStart() : void { }
+
+ public onHeadersReceived(statusCode : number, headers : Map) : void { }
+
+ public onDataReceived(data : Data) : void { }
+
+ public onFinished(response : HTTPURLResponse) : void { }
+
+ public onFail(error : NSError) : void { }
+}
+
+class NetworkRequestTaskImpl implements RequestTask {
+ private task : URLSessionDataTask | null = null;
+ constructor(task : URLSessionDataTask | null) {
+ this.task = task;
+ super();
+ }
+
+ public abort() {
+ this.task?.cancel()
+ }
+}
+
+class NetworkManager implements URLSessionDataDelegate {
+ private static instance : NetworkManager | null = null;
+
+ private session : URLSession | null = null;
+
+ private taskMap : Map = new Map();
+
+ public static getInstance() : NetworkManager {
+ if (this.instance == null) {
+ this.instance = new NetworkManager();
+ }
+ return this.instance!;
+ }
+
+
+ public request(param : RequestOptions, listener : NetworkRequestListener) : RequestTask | null {
+ let request = this.createRequest(param);
+ if (request == null) {
+ let error = new NSError(domain = "invalid URL", code = 600009);
+ listener.onFail(error);
+ return null;
+ }
+
+ if (this.session == null) {
+ let urlSessionConfig = URLSessionConfiguration.default;
+
+ this.session = new URLSession(configuration = urlSessionConfig, delegate = this, delegateQueue = OperationQueue.main);
+ }
+ let task = this.session?.dataTask(with = request!);
+ task?.resume();
+ if (task != null) {
+ this.taskMap.set(task!, listener);
+ }
+ let requestTask = new NetworkRequestTaskImpl(task);
+ return requestTask;
+ }
+
+
+ public createRequest(param : RequestOptions) : URLRequest | null {
+ let url = new URL(string = param.url);
+ if (url == null) {
+ return null
+ }
+
+
+ let timeout = param.timeout == null ? 60000 : param.timeout;
+ let timeoutInterval = new Double(timeout!) / 1000;
+
+ let request = new URLRequest(url = url!, cachePolicy = URLRequest.CachePolicy.useProtocolCachePolicy, timeoutInterval = timeoutInterval);
+ request.httpShouldHandleCookies = true;
+ let method = param.method;
+ if (method == null || method!.trimmingCharacters(in = CharacterSet.whitespacesAndNewlines).count == 0) {
+ method = "GET";
+ }
+ request.httpMethod = method!;
+
+ let ua = UTSiOS.getUserAgent();
+ request.setValue(ua, forHTTPHeaderField = "User-Agent");
+
+ if (param.header == null) {
+ param.header = {}
+ }
+
+
+ let headers = param.header?.toMap() as Map;
+ let hasContentType = false;
+ if (headers != null) {
+ for (entry in headers) {
+ let key = entry.key;
+ if (key.caseInsensitiveCompare("Content-Type") == ComparisonResult.orderedSame) {
+ hasContentType = true;
+ }
+ if (typeof(entry.value) == 'string') {
+ request.setValue((entry.value) as string, forHTTPHeaderField = key);
+ }
+ }
+ }
+
+ if (!hasContentType) {
+ if ("GET" != param.method) {
+ request.setValue("application/json", forHTTPHeaderField = "Content-Type");
+ }
+ }
+
+
+ if (param.data != null) {
+ let body : Data | null = null;
+ if (typeof(param.data) == 'string') {
+ body = (param.data as string).data(using = String.Encoding.utf8);
+ } else {
+ body = JSON.stringify(param.data)?.data(using = String.Encoding.utf8);
+ }
+ if (body == null) {
+ return null;
+ }
+
+ request.httpBody = body;
+ }
+
+ return request;
+ }
+
+
+ //mark --- URLSessionDataDelegate
+
+ urlSession(session : URLSession, @argumentLabel("") task : URLSessionTask, @argumentLabel("didSendBodyData") bytesSent : Int64, @argumentLabel("") totalBytesSent : Int64, @argumentLabel("") totalBytesExpectedToSend : Int64) {
+ //todo 原生的onDataSent貌似没实现 ，考虑删掉这个回调。
+ }
+ urlSession(session : URLSession, @argumentLabel("") dataTask : URLSessionDataTask, @argumentLabel("didReceive") response : URLResponse, @argumentLabel("") @escaping completionHandler : (dis : URLSession.ResponseDisposition) => void) {
+ // response开始的时候的header回调
+ let listener = this.taskMap.get(dataTask);
+ if (listener != null) {
+ let httpResponse : HTTPURLResponse = response as HTTPURLResponse;
+ let statusCode = new NSNumber(value = httpResponse.statusCode);
+ listener?.onHeadersReceived(statusCode, httpResponse.allHeaderFields as Map);
+ }
+
+ completionHandler(URLSession.ResponseDisposition.allow);
+ }
+
+ urlSession(session : URLSession, @argumentLabel("") dataTask : URLSessionDataTask, @argumentLabel("didReceive") data : Data) {
+ let listener = this.taskMap.get(dataTask);
+ listener?.onDataReceived(data);
+ }
+
+ urlSession(session : URLSession, @argumentLabel("") task : URLSessionTask, @argumentLabel("didCompleteWithError") error : NSError | null) {
+ let listener = this.taskMap.get(task);
+
+ if (error != null) {
+ listener?.onFail(error as NSError);
+ } else {
+ listener?.onFinished(task.response as HTTPURLResponse);
+ }
+ this.taskMap.delete(task);
+ }
+ //todo 暂时证书验证先不实现。
+ // urlSession( session: URLSession, @argumentLabel("didReceive") challenge: URLAuthenticationChallenge, @escaping completionHandler:(dis:URLSession.AuthChallengeDisposition, credentiual:URLCredential)=>void) {
+ // console.log("didReceivechallenge");
+ // }
+}
+
+
+export {
+ NetworkManager,
+ NetworkRequestListener
+}
\ No newline at end of file
diff --git a/uni_modules/uni-network/utssdk/app-ios/network/StatusCode.uts b/uni_modules/uni-network/utssdk/app-ios/network/StatusCode.uts
new file mode 100644
index 0000000000000000000000000000000000000000..7af0669eb6d51d87faf59f52540a02e116e35c26
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/app-ios/network/StatusCode.uts
@@ -0,0 +1,81 @@
+
+
+
+class StatusCode {
+ private static statusCodeMap : Map | null = null;
+
+ private static initStatusCodeMap() {
+ let map = new Map();
+ map.set('100', "Continue");
+ map.set('101', "Switching Protocol");
+ map.set('200', "OK");
+ map.set('201', "Created");
+ map.set('202', "Accepted");
+ map.set('203', "Non-Authoritative Information");
+ map.set('204', "No Content");
+ map.set('205', "Reset Content");
+ map.set('206', "Partial Content");
+ map.set('300', "Multiple Choice");
+ map.set('301', "Moved Permanently");
+ map.set('302', "Found");
+ map.set('303', "See Other");
+ map.set('304', "Not Modified");
+ map.set('305', "Use Proxy");
+ map.set('306', "unused");
+ map.set('307', "Temporary Redirect");
+ map.set('308', "Permanent Redirect");
+ map.set('400', "Bad Request");
+ map.set('401', "Unauthorized");
+ map.set('402', "Payment Required");
+ map.set('403', "Forbidden");
+ map.set('404', "Not Found");
+ map.set('405', "Method Not Allowed");
+ map.set('406', "Not Acceptable");
+ map.set('407', "Proxy Authentication Required");
+ map.set('408', "Request Timeout");
+ map.set('409', "Conflict");
+ map.set('410', "Gone");
+ map.set('411', "Length Required");
+ map.set('412', "Precondition Failed");
+ map.set('413', "Payload Too Large");
+ map.set('414', "URI Too Long");
+ map.set('415', "Unsupported Media Type");
+ map.set('416', "Requested Range Not Satisfiable");
+ map.set('417', "Expectation Failed");
+ map.set('418', "I'm a teapot");
+ map.set('421', "Misdirected Request");
+ map.set('426', "Upgrade Required");
+ map.set('428', "Precondition Required");
+ map.set('429', "Too Many Requests");
+ map.set('431', "Request Header Fields Too Large");
+ map.set('500', "Internal Server Error");
+ map.set('501', "Not Implemented");
+ map.set('502', "Bad Gateway");
+ map.set('503', "Service Unavailable");
+ map.set('504', "Gateway Timeout");
+ map.set('505', "HTTP Version Not Supported");
+ map.set('506', "Variant Also Negotiates");
+ map.set('507', "Variant Also Negotiates");
+ map.set('511', "Network Authentication Required");
+ this.statusCodeMap = map;
+ }
+
+ public static getStatus(code : string) : string {
+ let map = this.statusCodeMap;
+ if (map == null) {
+ this.initStatusCodeMap();
+ }
+ let tmp = this.statusCodeMap!;
+
+ if (!(tmp.has(code))) {
+ return 'unknown status';
+ } else {
+ return tmp.get(code)! as string;
+ }
+ }
+}
+
+
+export {
+ StatusCode
+}
diff --git a/uni_modules/uni-network/utssdk/interface.types.uts b/uni_modules/uni-network/utssdk/interface.types.uts
new file mode 100644
index 0000000000000000000000000000000000000000..84815e5882d66648c952106c4806aeccdd81607e
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/interface.types.uts
@@ -0,0 +1,205 @@
+
+export type RequestDataOptions =
+ /**
+ * @description json对象
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ Object
+ /**
+ * @description 字符串
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | String
+ /**
+ * @description ArrayBuffer
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "x",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "x",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ | ArrayBuffer;
+
+
+
+export type RequestMethod =
+ /**
+ * @description GET
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ GET
+ /**
+ * @description POST
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | POST
+ /**
+ * @description PUT
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | PUT
+ /**
+ * @description DELETE
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | DELETE
+ /**
+ * @description CONNECT
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | CONNECT
+ /**
+ * @description HEAD
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | HEAD
+ /**
+ * @description OPTIONS
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | OPTIONS
+ /**
+ * @description TRACE
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * }
+ * }
+ * }
+ */
+ | TRACE;
+
diff --git a/uni_modules/uni-network/utssdk/interface.uts b/uni_modules/uni-network/utssdk/interface.uts
new file mode 100644
index 0000000000000000000000000000000000000000..8c194d33413e08924b9110684dff069e7273028f
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/interface.uts
@@ -0,0 +1,637 @@
+export type Request = (param: RequestOptions) => RequestTask | null;
+
+/**
+ * 网络请求参数
+ */
+export type RequestOptions = {
+ /**
+ * 开发者服务器接口地址
+ */
+ url: string,
+ /**
+ * 请求的参数 UTSJSONObject|string类型
+ * @type {RequestDataOptions}
+ * @defaultValue null
+ */
+ data?: any | null,
+ /**
+ * 设置请求的 header，header 中不能设置 Referer
+ * @defaultValue null
+ */
+ header?: UTSJSONObject | null,
+ /**
+ * 请求方法
+ * 如果设置的值不在取值范围内，会以GET方法进行请求。
+ * @type {RequestMethod}
+ * @defaultValue "GET"
+ */
+ method?: RequestMethod | null,
+ /**
+ * 超时时间，单位 ms
+ * @defaultValue 60000
+ */
+ timeout?: number | null,
+ /**
+ * 如果设为 json，会对返回的数据进行一次 JSON.parse，非 json 不会进行 JSON.parse
+ * @defaultValue "json"
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ dataType?: string | null,
+ /**
+ * 设置响应的数据类型。
+ *
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ responseType?: string | null,
+ /**
+ * 验证 ssl 证书
+ *
+ * @deprecated 不支持
+ * @autodoc false
+ */
+ sslVerify?: boolean | null,
+ /**
+ * 跨域请求时是否携带凭证（cookies）
+ *
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ *
+ */
+ withCredentials?: boolean | null,
+ /**
+ * DNS解析时优先使用ipv4
+ * @defaultValue false
+ */
+ firstIpv4?: boolean | null,
+ /**
+ * 网络请求成功回调。
+ * @defaultValue null
+ */
+ success?: RequestSuccessCallback | null,
+ /**
+ * 网络请求失败回调。
+ * @defaultValue null
+ */
+ fail?: RequestFailCallback | null,
+ /**
+ * 网络请求完成回调，成功或者失败都会调用。
+ * @defaultValue null
+ */
+ complete?: RequestCompleteCallback | null
+}
+
+export type RequestSuccess = {
+ /**
+ * 开发者服务器返回的数据
+ * @type {RequestDataOptions}
+ */
+ data: T | null,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number,
+ /**
+ * 开发者服务器返回的 HTTP Response Header
+ */
+ header: any,
+ /**
+ * 开发者服务器返回的 cookies，格式为字符串数组
+ */
+ cookies: Array
+}
+
+/**
+ * 请求方法
+ * - GET GET方法请求一个指定资源的表示形式，使用 GET 的请求应该只被用于获取数据。
+ * - POST POST方法用于将实体提交到指定的资源，通常导致在服务器上的状态变化或副作用。
+ * - PUT PUT方法用有效载荷请求替换目标资源的所有当前表示。
+ * - PATCH PATCH方法用于对资源应用部分修改。
+ * - DELETE DELETE方法删除指定的资源。
+ * - HEAD HEAD方法请求一个与GET请求的响应相同的响应，但没有响应体。
+ * - OPTIONS OPTIONS 方法用于描述目标资源的通信选项。
+ */
+export type RequestMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
+
+/**
+ * 错误码
+ * - 5 接口超时
+ * - 1000 服务端系统错误
+ * - 100001 json数据解析错误
+ * - 100002 错误信息json解析失败
+ * - 600000 未知的网络错误
+ * - 600003 网络中断
+ * - 600009 URL格式不合法
+ * - 600010 请求的 data 序列化失败
+ * - 602001 request系统错误
+ */
+export type RequestErrorCode = 5 | 1000 | 100001 | 100002 | 600000 | 600003 | 600009 | 600010 | 602001;
+/**
+ * 网络请求失败的错误回调参数
+ */
+export interface RequestFail extends IUniError{
+ errCode: RequestErrorCode
+};
+export type RequestSuccessCallback = (option: RequestSuccess) => void;
+export type RequestFailCallback = (option: RequestFail) => void;
+export type RequestCompleteCallback = (option: any) => void;
+
+
+export interface RequestTask {
+ /**
+ * abort()
+ * @description
+ * 中断网络请求。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/request.html#request
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var requestTask = uni.request({
+ url: 'http://192.168.12.106:8080/postHalo', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ requestTask.abort();
+ ```
+ */
+ abort(): void
+}
+
+//===============================上传==================================
+
+
+export type UploadFile = (options: UploadFileOptions) => UploadTask | null;
+export type UploadFileOptionFiles = {
+ /**
+ * multipart 提交时，表单的项目名，默认为 file，如果 name 不填或填的值相同，可能导致服务端读取文件时只能读取到一个文件。
+ * @defaultValue "file"
+ */
+ name: string | null,
+ /**
+ * 要上传文件资源的路径
+ */
+ uri: string,
+ /**
+ * 要上传的文件对象
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ */
+ file: any | null
+};
+export type UploadFileSuccess = {
+ /**
+ * 开发者服务器返回的数据
+ */
+ data: string,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number
+};
+export type UploadFileSuccessCallback = (result: UploadFileSuccess) => void;
+/**
+ * 上传文件失败的错误回调参数
+ */
+export interface UploadFileFail extends IUniError{
+ errCode: RequestErrorCode
+};
+export type UploadFileFailCallback = (result: UploadFileFail) => void;
+
+export type UploadFileCompleteCallback = (result: any) => void;
+export type UploadFileOptions = {
+ /**
+ * 开发者服务器 url
+ */
+ url: string,
+ /**
+ * 要上传文件资源的路径
+ * @defaultValue null
+ */
+ filePath?: string | null,
+ /**
+ * 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+ * @defaultValue null
+ */
+ name?: string | null,
+ /**
+ * 需要上传的文件列表。
+ * @defaultValue null
+ */
+ files?: (UploadFileOptionFiles[]) | null,
+ /**
+ * HTTP 请求 Header, header 中不能设置 Referer
+ * @defaultValue null
+ */
+ header?: UTSJSONObject | null,
+ /**
+ * HTTP 请求中其他额外的 form data
+ * @defaultValue null
+ */
+ formData?: UTSJSONObject | null,
+ /**
+ * 超时时间，单位 ms
+ * @defaultValue 120000
+ */
+ timeout?: number | null,
+ /**
+ * 成功返回的回调函数
+ * @defaultValue null
+ */
+ success?: UploadFileSuccessCallback | null,
+ /**
+ * 失败的回调函数
+ * @defaultValue null
+ */
+ fail?: UploadFileFailCallback | null,
+ /**
+ * 结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete?: UploadFileCompleteCallback | null
+};
+export type OnProgressUpdateResult = {
+ /**
+ * 上传进度百分比
+ */
+ progress: number,
+ /**
+ * 已经上传的数据长度，单位 Bytes
+ */
+ totalBytesSent: number,
+ /**
+ * 预期需要上传的数据总长度，单位 Bytes
+ */
+ totalBytesExpectedToSend: number
+};
+
+export type UploadFileProgressUpdateCallback = (result: OnProgressUpdateResult) => void
+export interface UploadTask {
+ /**
+ * abort()
+ * @description
+ * 中断上传任务。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var uploadTask = uni.uploadFile({
+ url: 'http://192.168.12.106:8080/uploadFile', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ uploadTask.abort();
+ ```
+ */
+ abort(): void,
+ /**
+ * onProgressUpdate()
+ * @description
+ * 监听上传进度变化。
+ * @param {UploadFileProgressUpdateCallback} callback
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uploadTask.onProgressUpdate((res) => {
+ console.log('上传进度' + res.progress);
+ console.log('已经上传的数据长度' + res.totalBytesSent);
+ console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+ });
+ ```
+ */
+ onProgressUpdate(callback: UploadFileProgressUpdateCallback): void,
+};
+
+//===============================下载==================================
+
+export type DownloadFile = (options: DownloadFileOptions) => DownloadTask | null;
+export type DownloadFileSuccess = {
+ /**
+ * 临时文件路径，下载后的文件会存储到一个临时文件
+ */
+ tempFilePath: string,
+ /**
+ * 开发者服务器返回的 HTTP 状态码
+ */
+ statusCode: number
+};
+export type DownloadFileSuccessCallback = (result: DownloadFileSuccess) => void;
+/**
+ * 下载文件失败的错误回调参数
+ */
+export interface DownloadFileFail extends IUniError{
+ errCode: RequestErrorCode
+};
+export type DownloadFileFailCallback = (result: DownloadFileFail) => void;
+export type DownloadFileComplete = any;
+export type DownloadFileCompleteCallback = (result: DownloadFileComplete) => void;
+export type DownloadFileOptions = {
+ /**
+ * 下载资源的 url
+ */
+ url: string,
+ /**
+ * HTTP 请求 Header，header 中不能设置 Referer
+ * @defaultValue null
+ */
+ header?: UTSJSONObject | null,
+ /**
+ * 指定文件下载路径
+ * 支持相对路径与绝对路径，例：
+ * `/imgs/pic.png`、`/storage/emulated/0/Android/data/io.dcloud.HBuilder/apps/HBuilder/temp/imgs/pic.png`
+ * 并且支持指定下载目录，例：
+ * `/imgs/`
+ * @defaultValue null
+ */
+ filePath?: string | null,
+ /**
+ * 超时时间，单位 ms
+ * @defaultValue 120000
+ */
+ timeout?: number | null,
+ /**
+ * 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'}
+ * @defaultValue null
+ */
+ success?: DownloadFileSuccessCallback | null,
+ /**
+ * 失败的回调函数
+ * @defaultValue null
+ */
+ fail?: DownloadFileFailCallback | null,
+ /**
+ * 结束的回调函数（调用成功、失败都会执行）
+ * @defaultValue null
+ */
+ complete?: DownloadFileCompleteCallback | null
+};
+export type OnProgressDownloadResult = {
+ /**
+ * 下载进度百分比
+ */
+ progress: number,
+ /**
+ * 已经下载的数据长度，单位 Bytes
+ */
+ totalBytesWritten: number,
+ /**
+ * 预期需要下载的数据总长度，单位 Bytes
+ */
+ totalBytesExpectedToWrite: number
+};
+export type DownloadFileProgressUpdateCallback = (result: OnProgressDownloadResult) => void;
+export interface DownloadTask {
+ /**
+ * abort()
+ * @description
+ * 中断下载任务。
+ * @param {void}
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ var downloadTask = uni.downloadFile({
+ url: 'https://www.example.com/file/test', //仅为示例，并非真实接口地址。
+ complete: ()=> {}
+ });
+ downloadTask.abort();
+ ```
+ */
+ abort(): void,
+ /**
+ * onProgressUpdate()
+ * @description
+ * 监听下载进度变化。
+ * @param {DownloadFileProgressUpdateCallback} callback
+ * @return {void}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ downloadTask.onProgressUpdate((res) => {
+ console.log('下载进度' + res.progress);
+ console.log('已经下载的数据长度' + res.totalBytesWritten);
+ console.log('预期需要下载的数据总长度' + res.totalBytesExpectedToWrite);
+ });
+ ```
+ */
+ onProgressUpdate(callback: DownloadFileProgressUpdateCallback): void,
+};
+
+
+export interface Uni {
+ /**
+ * Request()
+ * @description
+ * 发起网络请求。
+ * @param {RequestOptions} options
+ * @return {RequestTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/request.html
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.request({
+ url: "http://192.168.12.106:8080/postHalo",
+ dataType: "json",
+ responseType: "json",
+ method: "POST",
+ data: {
+ platform: "ios",
+ },
+ // header: {
+ // "Content-Type": "application/json",
+ // },
+ timeout: 6000,
+ sslVerify: false,
+ withCredentials: false,
+ firstIpv4: false,
+ success(res) {
+ console.log("success :", res.data);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete(res) {
+ console.log("complete :", res);
+ },
+ });
+ ```
+ */
+ request(param: RequestOptions): RequestTask | null;
+ /**
+ * UploadFile()
+ * @description
+ * 将本地资源上传到开发者服务器。
+ * @param {UploadFileOptions} options
+ * @return {UploadTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#uploadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.uploadFile({
+ url: 'http://192.168.12.106:8080/uploadFile', //仅为示例，非真实的接口地址
+ filePath: "/static/logo.png",
+ name: 'file',
+ formData: {
+ 'user': 'test'
+ },
+ success: (uploadFileRes) => {
+ console.log(uploadFileRes.data);
+ }
+ });
+ ```
+ */
+ uploadFile(options: UploadFileOptions): UploadTask | null;
+ /**
+ * DownloadFile()
+ * @description
+ * 下载文件资源到本地，客户端直接发起一个 HTTP GET 请求，返回文件的本地临时路径。
+ * @param {DownloadFileOptions} options
+ * @return {DownloadTask | null}
+ * @tutorial https://uniapp.dcloud.net.cn/api/request/network-file.html#downloadfile
+ * @uniPlatform {
+ * "app": {
+ * "android": {
+ * "osVer": "4.4",
+ * "uniVer": "√",
+ * "unixVer": "3.9+"
+ * },
+ * "ios": {
+ * "osVer": "9.0",
+ * "uniVer": "√",
+ * "unixVer": "x"
+ * }
+ * }
+ * }
+ * @example
+ ```typescript
+ uni.downloadFile({
+ url: "http://192.168.12.106:8080/downloadfile",
+ success(e) {
+ console.log("success111 :", e);
+ }
+ });
+ ```
+ */
+ downloadFile(options: DownloadFileOptions): DownloadTask | null;
+}
diff --git a/uni_modules/uni-network/utssdk/unierror.uts b/uni_modules/uni-network/utssdk/unierror.uts
new file mode 100644
index 0000000000000000000000000000000000000000..b1df42bc05295367d4ca377c2d0ce3ddbae58a55
--- /dev/null
+++ b/uni_modules/uni-network/utssdk/unierror.uts
@@ -0,0 +1,86 @@
+import { RequestErrorCode, RequestFail, UploadFileFail, DownloadFileFail } from "./interface.uts"
+
+/**
+ * 错误主题
+ */
+export const UniErrorSubject = 'uni-request';
+/**
+ * 错误码
+ * @UniError
+ */
+export const UniErrors : Map = new Map([
+
+ /**
+ * 接口超时
+ */
+ [5, 'time out'],
+ /**
+ * 服务端系统错误
+ */
+ [1000, 'server system error'],
+ /**
+ * json数据解析错误
+ */
+ [100001, 'invalid json'],
+ /**
+ * 错误信息json解析失败
+ */
+ [100002, 'error message invalid json'],
+ /**
+ * 未知的网络错误
+ */
+ [600000, 'unknown network error'],
+ /**
+ * 网络中断
+ */
+ [600003, 'network interrupted error'],
+ /**
+ * URL 格式不合法
+ */
+ [600009, 'invalid URL'],
+ /**
+ * 请求的 data 序列化失败
+ */
+ [600010, 'invalid request data'],
+
+ /**
+ * request系统错误
+ */
+ [602001, 'request system error']
+]);
+
+
+export function getErrcode(errCode : number) : RequestErrorCode {
+ const res = UniErrors[errCode];
+ return res == null ? 602001 : errCode;
+}
+
+
+export class RequestFailImpl extends UniError implements RequestFail {
+ constructor(errCode : RequestErrorCode) {
+ super();
+ this.errSubject = UniErrorSubject;
+ this.errCode = errCode;
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
+
+
+export class UploadFileFailImpl extends UniError implements UploadFileFail {
+ constructor(errCode : RequestErrorCode) {
+ super();
+ this.errSubject = "uni-uploadFile";
+ this.errCode = errCode;
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
+
+
+export class DownloadFileFailImpl extends UniError implements DownloadFileFail {
+ constructor(errCode : RequestErrorCode) {
+ super();
+ this.errSubject = "uni-downloadFile";
+ this.errCode = errCode;
+ this.errMsg = UniErrors[errCode] ?? "";
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/changelog.md b/uni_modules/uni-prompt/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-prompt/package.json b/uni_modules/uni-prompt/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..15dae6d655d11f595123c6bd5522c694273ef96f
--- /dev/null
+++ b/uni_modules/uni-prompt/package.json
@@ -0,0 +1,134 @@
+{
+ "id": "uni-prompt",
+ "displayName": "uni-prompt",
+ "version": "1.0.0",
+ "description": "uni-prompt",
+ "keywords": [
+ "uni-prompt"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.6.8"
+ },
+ "dcloudext": {
+ "type": "uts",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "",
+ "data": "",
+ "permissions": ""
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "uni-ext-api": {
+ "uni": {
+ "showToast": {
+ "name": "showToast",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "hideToast": {
+ "name": "hideToast",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "showLoading": {
+ "name": "showLoading",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "hideLoading": {
+ "name": "hideLoading",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "showModal": {
+ "name": "showModal",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ },
+ "showActionSheet": {
+ "name": "showActionSheet",
+ "app": {
+ "js": false,
+ "kotlin": true,
+ "swift": true
+ }
+ }
+ }
+ },
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-android": "u",
+ "app-ios": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
+
diff --git a/uni_modules/uni-prompt/readme.md b/uni_modules/uni-prompt/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..d080f9fd411f7f27962f068c1ccade4a75d24b9c
--- /dev/null
+++ b/uni_modules/uni-prompt/readme.md
@@ -0,0 +1,6 @@
+# uni-prompt
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/AndroidManifest.xml b/uni_modules/uni-prompt/utssdk/app-android/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c55e98b98a9eb44532c232ba4db558dd77f12e64
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/AndroidManifest.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/uni_modules/uni-prompt/utssdk/app-android/WaitingView.uts b/uni_modules/uni-prompt/utssdk/app-android/WaitingView.uts
new file mode 100644
index 0000000000000000000000000000000000000000..2378944ab7ace4d26632e0e2af286f8fb3b9c776
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/WaitingView.uts
@@ -0,0 +1,313 @@
+// import Context from 'android.content.Context';
+import LayoutInflater from 'android.view.LayoutInflater';
+import R from 'io.dcloud.uts.prompt.R';
+import ViewGroup from 'android.view.ViewGroup';
+import LinearLayout from 'android.widget.LinearLayout';
+import Activity from 'android.app.Activity';
+import TextView from 'android.widget.TextView';
+import PopupWindow from 'android.widget.PopupWindow';
+import Build from 'android.os.Build';
+import Gravity from 'android.view.Gravity';
+import Color from 'android.graphics.Color';
+import Handler from 'android.os.Handler';
+import Looper from 'android.os.Looper';
+import string from 'android.R.string';
+import View from 'android.view.View';
+import MotionEvent from 'android.view.MotionEvent';
+import JSONObject from 'com.alibaba.fastjson.JSONObject';
+import ProgressBar from 'android.widget.ProgressBar';
+import BitmapFactory from 'android.graphics.BitmapFactory';
+import bool from 'android.R.bool';
+import Bitmap from 'android.graphics.Bitmap';
+import ImageView from 'android.widget.ImageView';
+import { UTSAndroid } from "io.dcloud.uts";
+import FileInputStream from 'java.io.FileInputStream';
+import File from 'java.io.File';
+import ByteArrayOutputStream from 'java.io.ByteArrayOutputStream';
+import InputStream from 'java.io.InputStream';
+import array from 'android.R.array';
+import Dialog from 'android.app.Dialog';
+
+export class WaitingView extends Dialog{
+
+ private context?: Activity
+ private style: JSONObject
+
+ private waitingView: ViewGroup
+ private waitingRootView: LinearLayout
+ private textView: TextView
+ private mProgressBar: ProgressBar
+ private seaparatorView: View
+ private mImageView: ImageView
+
+ private height: Int = -2
+ private width: Int = -2
+ private mask: boolean = false
+ private title: string = ""
+
+ screenWidth: Int
+ ScreenHeight: Int
+ density: number = 0
+
+ // json数据
+ private padding: Int = 0
+ private textSize: Int = 0
+
+
+ private loadingdDisplay = ""
+ private loadingHeight = 0
+ private LoadingIcon: string = ""
+ private mBitmap: Bitmap | null = null;
+
+
+ constructor(context?: Activity, style: UTSJSONObject) {
+
+ super(context!,R.style.loadingDialog);
+
+ this.context = context;
+ this.style = style.toJSONObject() as JSONObject
+ this.screenWidth = context?.getResources()?.getDisplayMetrics()!.widthPixels
+ this.ScreenHeight = context?.getResources()?.getDisplayMetrics()!.heightPixels
+ this.density = context?.getResources()?.getDisplayMetrics()!.density
+ this.waitingView = LayoutInflater.from(context).inflate(R.layout.dcloud_loadingview, null, false) as ViewGroup
+ this.waitingRootView = this.waitingView.findViewById(R.id.dcloud_pd_root)
+ this.mProgressBar = this.waitingView.findViewById(R.id.dcloud_pb_loading)
+ this.textView = this.waitingView.findViewById(R.id.dcloud_tv_loading)
+ this.seaparatorView = this.waitingView.findViewById(R.id.dcloud_view_seaparator)
+ this.mImageView = this.waitingView.findViewById(R.id.dcloud_iv_loading)
+
+ this.textView.setMaxLines(2)
+
+ this.handlerArguments()
+
+ let llp = (this.waitingRootView).getLayoutParams() as LinearLayout.LayoutParams
+ llp.width = this.width > 0 ? (this.width * this.density).toInt() : this.width
+ llp.height = -2
+ this.waitingRootView.setLayoutParams(llp)
+
+ this.initView()
+ this.makeBitmap()
+
+ setContentView(waitingView)
+ }
+
+ handlerArguments() {
+ if (this.style["height"] != null) {
+ this.height = parseInt(this.style["height"] as string).toInt()
+ }
+ if (this.style["width"] != null) {
+ this.width = parseInt(this.style["width"] as string).toInt()
+ }
+ if (this.style["modal"] != null) {
+ this.mask = this.style["modal"] as boolean
+ }
+ this.title = this.style.get("name") as string
+ if (this.style["loading"] != null) {
+ let loading = this.style["loading"] as JSONObject
+ this.loadingdDisplay = loading["display"] as string
+ if (loading["icon"] != null) {
+ this.LoadingIcon = loading["icon"] as string
+ }
+ if (loading["height"] != null) {
+ this.loadingHeight = parseInt(loading["height"] as string).toInt()
+ }
+ }
+ if ("block" == this.loadingdDisplay) {
+ this.waitingRootView.setOrientation(LinearLayout.VERTICAL)
+ } else if ("inline" == this.loadingdDisplay) {
+ this.waitingRootView.setOrientation(LinearLayout.HORIZONTAL)
+ } else if ("none" == this.loadingdDisplay) {
+ this.seaparatorView.setVisibility(View.GONE)
+ this.mProgressBar.setVisibility(View.GONE)
+ }
+ }
+
+ initView() {
+ // 初始化默认参数
+ // this.textView.setTextColor(0xffffffff)
+ this.textView.setTextColor(Color.WHITE)
+ this.textView.setGravity(Gravity.CENTER)
+ this.textView.setText(this.title)
+ this.textView.setTextSize(0, (16 * this.density).toFloat())
+
+ if(this.title.length < 1){
+ // 没有文本需要展示
+ this.textView.setVisibility(View.GONE)
+ this.waitingRootView.setPadding((10 * this.density).toInt(), (40 * this.density).toInt(), (10 * this.density).toInt(), (30 * this.density).toInt())
+ }else{
+ // 既有loading,也有文本
+ this.waitingRootView.setPadding((10 * this.density).toInt(), (20 * this.density).toInt(), (10 * this.density).toInt(), (20 * this.density).toInt())
+ }
+
+ let drawable = this.context?.getResources()!!.getDrawable(R.drawable.uts_dcloud_circle_white_progress)
+ if (this.loadingHeight > 0) {
+ this.mProgressBar.setLayoutParams(new LinearLayout.LayoutParams((this.loadingHeight * this.density).toInt(), (this.loadingHeight * this.density).toInt()))
+ } else {
+ let height = (drawable.getIntrinsicHeight() * 0.3).toInt()
+ this.mProgressBar.setLayoutParams(new LinearLayout.LayoutParams(height, height))
+ }
+
+ this.mProgressBar.setIndeterminateDrawable(drawable)
+ this.waitingRootView.setFocusable(true)
+ this.waitingRootView.setAlpha(0.9.toFloat())
+ }
+
+
+ override onTouchEvent(ev: MotionEvent): Boolean{
+ if(this.mask){
+ /**
+ * 明确说明了要遮罩 拦截
+ */
+ return super.onTouchEvent(ev)
+ }
+
+ let event=MotionEvent.obtain(ev.downTime, ev.eventTime, ev.action,
+ ev.rawX, ev.rawY,
+ ev.pressure, ev.size, ev.metaState, ev.xPrecision, ev.yPrecision, ev.deviceId, ev.edgeFlags)
+
+ return passThrough(event)
+ }
+ /**
+ * 决定是否要透传点击事件
+ */
+ passThrough(ev: MotionEvent): Boolean{
+ if(this.context == null){
+ return false
+ }
+ return this.context!.dispatchTouchEvent(ev)
+ }
+
+
+ showWaiting() {
+ this.setCanceledOnTouchOutside(false)
+ this.show()
+ }
+
+ close() {
+ this.dismiss()
+ if (this.mBitmap != null) {
+ this.mBitmap = null;
+ }
+ }
+
+ makeBitmap() {
+ if (this.LoadingIcon != null) {
+ // let mBitmap: Bitmap | null = null;
+ let imageBytes: ByteArray | null = null
+ if (this.LoadingIcon == "successIcon") {
+ imageBytes = this.inputStreamToArray(this.context?.getResources()!!.getAssets().open("uniappsuccess_icon.png"))
+ } else if (this.LoadingIcon == "errorIcon") {
+ imageBytes = this.inputStreamToArray(this.context?.getResources()!!.getAssets().open("uniapperror_icon.png"))
+ } else if (this.LoadingIcon.length > 0) {
+ let path: string = ""
+ if (this.LoadingIcon.startsWith("file://")) {
+ path = this.LoadingIcon.replace("file://", "")
+ } else {
+ path = UTSAndroid.getResourcePath(this.LoadingIcon)
+ }
+ if (path != null && path.length > 0) {
+ try {
+ let fis: FileInputStream = new FileInputStream(new File(path));
+ imageBytes = this.inputStreamToArray(fis);
+ fis.close()
+ } catch (e: Throwable) {
+ }
+ }
+ } else {
+ return
+ }
+ if (imageBytes == null || imageBytes.size == 0) {
+ return
+ }
+ let option = new BitmapFactory.Options()
+ option.inJustDecodeBounds = true
+ BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size, option)
+ let width = option.outWidth
+ let height = option.outHeight
+
+ option.inSampleSize = this.getBestScale(height)
+ option.inJustDecodeBounds = false;
+ this.mBitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size, option)
+
+ this.mProgressBar.setVisibility(View.GONE)
+ this.mImageView.setVisibility(View.VISIBLE)
+ this.mImageView.setImageBitmap(this.mBitmap)
+
+ if (width % height != 0) {
+ return
+ }
+
+ var lp: ViewGroup.LayoutParams = this.mImageView.getLayoutParams()
+ if (lp != null) {
+ if (this.loadingHeight > 0) {
+ lp.height = (this.loadingHeight * this.density).toInt()
+ lp.width = (this.loadingHeight * this.density).toInt()
+ } else {
+ lp.width = this.mBitmap!!.getHeight()
+ lp.height = this.mBitmap!!.getHeight()
+ }
+ this.mImageView.setLayoutParams(lp)
+ }
+ }
+ }
+
+ getBestScale(height: Int): Int {
+ let sampleSize: Int = 1;
+ let maxEdge = Math.min(this.screenWidth, this.ScreenHeight) - 10 * 2 * this.density
+ if (maxEdge > 0 && height > maxEdge) {
+ sampleSize = (height / maxEdge).toInt()
+ }
+ return sampleSize
+ }
+
+ inputStreamToArray(inputStream: InputStream): ByteArray | null {
+ try {
+ let bos: ByteArrayOutputStream = new ByteArrayOutputStream()
+ let bytes: ByteArray = new ByteArray(1024)
+
+ do {
+ let length = inputStream.read(bytes)
+ if (length != -1) {
+ bos.write(bytes, 0, length)
+ } else {
+ break
+ }
+ } while (true)
+ bos.close()
+ return bos.toByteArray()
+ } catch (e: Throwable) {
+ return null;
+ }
+ }
+}
+
+class MainThreadRunnable implements Runnable {
+
+ pop: PopupWindow
+
+ constructor(pop: PopupWindow) {
+ this.pop = pop
+ }
+
+ override run() {
+ this.pop.dismiss()
+ }
+}
+
+class WaitingDismissListener implements PopupWindow.OnDismissListener {
+ override onDismiss() {
+ }
+}
+
+class TouchInterceptorListener implements View.OnTouchListener {
+
+ interceptor: boolean
+
+ constructor(interceptor: boolean) {
+ this.interceptor = interceptor
+ }
+
+ override onTouch(v: View, event: MotionEvent): boolean {
+ return this.interceptor
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/assets/uniapperror_icon.png b/uni_modules/uni-prompt/utssdk/app-android/assets/uniapperror_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4743b25e1284270fee6ba8fefdb5265f6c451a93
Binary files /dev/null and b/uni_modules/uni-prompt/utssdk/app-android/assets/uniapperror_icon.png differ
diff --git a/uni_modules/uni-prompt/utssdk/app-android/assets/uniappsuccess_icon.png b/uni_modules/uni-prompt/utssdk/app-android/assets/uniappsuccess_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f5bd7c5293dcc37284f30b215ff2a3779c316f
Binary files /dev/null and b/uni_modules/uni-prompt/utssdk/app-android/assets/uniappsuccess_icon.png differ
diff --git a/uni_modules/uni-prompt/utssdk/app-android/config.json b/uni_modules/uni-prompt/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..79042414cf5dc44a269529c97f1667bc88b10274
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/config.json
@@ -0,0 +1,7 @@
+{
+ "dependencies": [
+ "androidx.recyclerview:recyclerview:1.0.0",
+ "androidx.appcompat:appcompat:1.0.0"
+ ]
+}
+
diff --git a/uni_modules/uni-prompt/utssdk/app-android/index.uts b/uni_modules/uni-prompt/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..819c790b20041c8b1d071ccd9dff296ca1481058
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/index.uts
@@ -0,0 +1,52 @@
+import { ShowLoadingOptions,ShowLoading,HideLoading} from "../interface.uts"
+import { ShowToastOptions,ShowToast,HideToast} from "../interface.uts"
+import { ShowActionSheetOptions,ShowActionSheet} from "../interface.uts"
+import { ShowModalOptions,ShowModal} from "../interface.uts"
+
+import * as ToastModule from "./showToast.uts"
+import * as ModalModule from "./showModal.uts"
+import * as ActionSheetModule from "./showActionSheet.uts"
+
+import UTSAndroid from 'io.dcloud.uts.UTSAndroid';
+
+export const showToast : ShowToast = function (options : ShowToastOptions) {
+
+ // 指定在ui线程执行
+ UTSAndroid.dispatchAsync('main',function(res){
+ ToastModule.showToastImpl(options)
+ },null)
+
+}
+
+export const hideToast : HideToast = function () {
+ UTSAndroid.dispatchAsync('main',function(res){
+ ToastModule.hideToastImpl()
+ },null)
+
+}
+
+export const showLoading : ShowLoading = function (options : ShowLoadingOptions) {
+ UTSAndroid.dispatchAsync('main',function(res){
+ ToastModule.showLoadingImpl(options)
+ },null)
+}
+
+export const hideLoading : HideLoading = function () {
+ UTSAndroid.dispatchAsync('main',function(res){
+ ToastModule.hideLoadingImpl()
+ },null)
+}
+
+export const showModal : ShowModal = function (options : ShowModalOptions) {
+ UTSAndroid.dispatchAsync('main',function(res){
+ ModalModule.showModalImpl(options)
+ },null)
+}
+
+export const showActionSheet : ShowActionSheet = function (options : ShowActionSheetOptions) {
+ UTSAndroid.dispatchAsync('main',function(res){
+ ActionSheetModule.actionSheetImpl(options)
+ },null)
+}
+
+
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_in_bottom.xml b/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_in_bottom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60d98e1994c248fbc3a79a5fee7248a18575eb17
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_in_bottom.xml
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_out_top.xml b/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_out_top.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d359072a26b37fe0f0aef0ededc6f3e1fbd1380e
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/anim/uts_as_slide_out_top.xml
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded.xml
new file mode 100644
index 0000000000000000000000000000000000000000..461906f7ecb36acd8fac0ba03001a6ac5fb47977
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded_night.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59485433ee69390d3ca07f7b23277e7914040236
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_bg_rounded_night.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total.xml
new file mode 100644
index 0000000000000000000000000000000000000000..82291bd858cb02da96b555967bd4cdbae89fdb82
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total.xml
@@ -0,0 +1,24 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa18118efc6724183b8a7a08922e1b10aca45219
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night_top.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night_top.xml
new file mode 100644
index 0000000000000000000000000000000000000000..802fb1fd153089c8024eccc608da51d2ab9a1b7d
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_night_top.xml
@@ -0,0 +1,32 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_top.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_top.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cff323ad0aa518c410681c25f61911d562187481
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/actionsheet_button_select_total_top.xml
@@ -0,0 +1,32 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dcloud_loading_bg.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dcloud_loading_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..801ee7343a61d20dc917dd2335b1330689235e39
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dcloud_loading_bg.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1a8adebf727be43dd6848f06836232bc1c6ab13
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d4859e865f4f33c273fa75b3b8c2bae31e0f02f
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_bg_rounded_night.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_button_select_left.xml b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_button_select_left.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b9c13c9a7e47cfcd44a39903e33612d26d772582
--- /dev/null
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/drawable/dialog_button_select_left.xml
@@ -0,0 +1,6 @@
+
+
+