同步代码@HBuilderX4.15-补充

uni_modules/uni-exit/utssdk/interface.uts

@@ -61,14 +61,12 @@ export interface Uni {
    *        "android": {
    *            "osVer": "5.0",
    *            "uniVer": "3.8.15",
-   *            "unixVer": "3.9.0",
-	 *            "utsPlugin": "3.9.0"
+   *            "unixVer": "3.9.0"
    *        },
    *        "ios": {
    *            "osVer": "x",
    *            "uniVer": "x",
-   *            "unixVer": "x",
-	 *            "utsPlugin": "x"
+   *            "unixVer": "x"
    *   	  }
    *    },
    *  "web": {

uni_modules/uni-fileSystemManager/package.json

@@ -37,7 +37,7 @@
 			"getFileSystemManager": {
 				"name": "getFileSystemManager",
 				"app": {
-					"js": true,
+					"js": false,
 					"kotlin": true,
 					"swift": false
 				}

uni_modules/uni-fileSystemManager/utssdk/app-android/FileDescriptorUtil.uts

 import File from 'java.io.File'
 import ParcelFileDescriptor from 'android.os.ParcelFileDescriptor'
 import { OpenFileOptions, OpenFileSuccessResult, OpenFileSyncOptions } from '../interface';
-import { UniErrorSubject,FileSystemManagerFailImpl,FileSystemManagerUniErrors } from '../unierror';
+import { UniErrorSubject, UniErrors } from '../unierror';
 
 export class FileDescriptorUtil {
 	public openMap : Map<string, File> = new Map()
@@ -28,12 +28,12 @@ export class FileDescriptorUtil {
 					case 'ax': //类似于 'a'，但如果路径存在，则失败
 						{
 							if (file.exists()) {
-								let err = new FileSystemManagerFailImpl(1301005);
+								let err = new UniError(UniErrorSubject, 1301005, UniErrors.get(1301005)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
 								if (file.parentFile?.exists() == false) {
-									let err = new FileSystemManagerFailImpl(1300002);
+									let err = new UniError(UniErrorSubject, 1300002, UniErrors.get(1300002)!);
 									options.fail?.(err)
 									options.complete?.(err)
 									return
@@ -66,7 +66,7 @@ export class FileDescriptorUtil {
 					case 'ax+': //类似于 'a+'，但如果路径存在，则失败
 						{
 							if (file.exists()) {
-								let err = new FileSystemManagerFailImpl(1301005);
+								let err = new UniError(UniErrorSubject, 1301005, UniErrors.get(1301005)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
@@ -84,7 +84,7 @@ export class FileDescriptorUtil {
 					case 'r': //打开文件用于读取。 如果文件不存在，则会发生异常
 						{
 							if (!file.exists()) {
-								let err = new FileSystemManagerFailImpl(1300002);
+								let err = new UniError(UniErrorSubject, 1300002, UniErrors.get(1300002)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
@@ -104,7 +104,7 @@ export class FileDescriptorUtil {
 					case 'r+': //打开文件用于读取和写入。 如果文件不存在，则会发生异常
 						{
 							if (!file.exists()) {
-								let err = new FileSystemManagerFailImpl(1300002);
+								let err = new UniError(UniErrorSubject, 1300002, UniErrors.get(1300002)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
@@ -136,7 +136,7 @@ export class FileDescriptorUtil {
 					case 'wx'://类似于 'w'，但如果路径存在，则失败
 						{
 							if (file.exists()) {
-								let err = new FileSystemManagerFailImpl(1301005);
+								let err = new UniError(UniErrorSubject, 1301005, UniErrors.get(1301005)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
@@ -168,7 +168,7 @@ export class FileDescriptorUtil {
 					case 'wx+': //	类似于 'w+'，但如果路径存在，则失败
 						{
 							if (file.exists()) {
-								let err = new FileSystemManagerFailImpl(1301005);
+								let err = new UniError(UniErrorSubject, 1301005, UniErrors.get(1301005)!);
 								options.fail?.(err)
 								options.complete?.(err)
 							} else {
@@ -187,7 +187,7 @@ export class FileDescriptorUtil {
 						}
 				}
 			} catch (e) {
-				let err = new FileSystemManagerFailImpl(1300201);
+				let err = new UniError(UniErrorSubject, 1300201, UniErrors.get(1300201)! + ":" + e + "  " + options.filePath);
 				options.fail?.(err)
 				options.complete?.(err)
 			}
@@ -206,10 +206,10 @@ export class FileDescriptorUtil {
 			case 'ax': //类似于 'a'，但如果路径存在，则失败
 				{
 					if (file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1301005]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1301005]}`)
 					} else {
 						if (file.parentFile?.exists() == false) {
-							throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1300002]}`)
+							throw new Error(`${msgPrefix}${UniErrors[1300002]}`)
 						} else {
 							file.createNewFile()
 							let fd = this.open_a(file)
@@ -228,7 +228,7 @@ export class FileDescriptorUtil {
 			case 'ax+': //类似于 'a+'，但如果路径存在，则失败
 				{
 					if (file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1301005]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1301005]}`)
 					} else {
 						let fd = this.open_ax(file)
 						this.openMap.set(fd, file)
@@ -238,7 +238,7 @@ export class FileDescriptorUtil {
 			case 'r': //打开文件用于读取。 如果文件不存在，则会发生异常
 				{
 					if (!file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1300002]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1300002]}`)
 					} else {
 						let mode = ParcelFileDescriptor.MODE_READ_ONLY
 						let pfd = ParcelFileDescriptor.open(file, mode);
@@ -251,7 +251,7 @@ export class FileDescriptorUtil {
 			case 'r+': //打开文件用于读取和写入。 如果文件不存在，则会发生异常
 				{
 					if (!file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1300002]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1300002]}`)
 					} else {
 						let mode = ParcelFileDescriptor.MODE_READ_WRITE
 						let pfd = ParcelFileDescriptor.open(file, mode);
@@ -270,7 +270,7 @@ export class FileDescriptorUtil {
 			case 'wx'://类似于 'w'，但如果路径存在，则失败
 				{
 					if (file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1301005]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1301005]}`)
 					} else {
 						let fd = this.open_w(file)
 						this.openMap.set(fd, file)
@@ -289,7 +289,7 @@ export class FileDescriptorUtil {
 			case 'wx+': //	类似于 'w+'，但如果路径存在，则失败
 				{
 					if (file.exists()) {
-						throw new Error(`${msgPrefix}${FileSystemManagerUniErrors[1301005]}`)
+						throw new Error(`${msgPrefix}${UniErrors[1301005]}`)
 					} else {
 						let mode = ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_READ_WRITE | ParcelFileDescriptor.MODE_TRUNCATE
 						let pfd = ParcelFileDescriptor.open(file, mode);

uni_modules/uni-fileSystemManager/utssdk/app-js/index.uts

 import { WriteFileOptions, ReadFileOptions, MkDirOptions, RmDirOptions, UnLinkOptions, ReadDirOptions, AccessOptions, RenameOptions, GetFileInfoOptions, CopyFileOptions, StatOptions } from "../interface.uts"
 import { ReadFileSuccessResult, FileManagerSuccessResult, ReadDirSuccessResult, GetFileInfoSuccessResult, StatSuccessResult, FileStats, Stats } from "../interface.uts"
 import { GetFileSystemManager, FileSystemManager } from "../interface.uts"
-import { FileSystemManagerFailImpl, FileSystemManagerUniErrorSubject, FileSystemManagerUniErrors } from "../unierror.uts"
+import { UniErrorSubject, UniErrors } from "../unierror.uts"
+export { Stats,FileStats } from '../interface.uts'
 
 class InnerStats implements Stats {
 	/**
@@ -92,7 +93,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code)
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.path);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -102,7 +103,7 @@ class JsFileSystemManager implements FileSystemManager {
 		if(options.digestAlgorithm == null || options.digestAlgorithm == undefined){
 			options.digestAlgorithm = "md5"
 		} else if (options.digestAlgorithm!.toLowerCase() != 'md5' && options.digestAlgorithm!.toLowerCase() != 'sha1') {
-			let err = new FileSystemManagerFailImpl(1300022);
+			let err = new UniError(UniErrorSubject, 1300022, UniErrors.get(1300022)! + ":invalid digestAlgorithm " + options.digestAlgorithm);
 			options.fail?.(err)
 			options.complete?.(err)
 			return
@@ -116,7 +117,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.filePath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -135,7 +136,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)!);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -154,7 +155,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)!);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -172,7 +173,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.path);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -190,7 +191,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.dirPath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -213,7 +214,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.dirPath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -228,7 +229,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.dirPath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -247,7 +248,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.filePath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -265,7 +266,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.filePath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})
@@ -285,7 +286,7 @@ class JsFileSystemManager implements FileSystemManager {
 				options.complete?.(ret)
 			},
 			function (code) {
-				let err = new FileSystemManagerFailImpl(code);
+				let err = new UniError(UniErrorSubject, code, UniErrors.get(code)! + ":" + options.filePath);
 				options.fail?.(err)
 				options.complete?.(err)
 			})

uni_modules/uni-fileSystemManager/utssdk/interface.uts

@@ -21,7 +21,7 @@ export type FileManagerSuccessCallback = (res : FileManagerSuccessResult) => voi
 /**
  * 通用的错误返回结果回调
  */
-export type FileManagerFailCallback = (res : FileSystemManagerFail) => void
+export type FileManagerFailCallback = (res : UniError) => void
 /**
  * 通用的结束返回结果回调
  */
@@ -39,7 +39,7 @@ export type ReadFileOptions = {
 	 */
 	encoding : "base64" | "utf-8",
 	/**
-	 * 文件路径，支持相对地址和绝对地址，app-android平台支持代码包文件目录
+	 * 文件路径，支持相对地址和绝对地址
 	 */
 	filePath : string.URIString,
 	/**
@@ -553,7 +553,7 @@ export type ReadCompressedFileResult = {
 export type ReadCompressedFileCallback = (res : ReadCompressedFileResult) => void
 export type ReadCompressedFileOptions = {
 	/**
-	 * 要读取的文件的路径 (本地用户文件或代码包文件)，app-android平台支持代码包文件目录
+	 * 要读取的文件的路径 (本地用户文件或代码包文件)
 	 */
 	filePath : string.URIString,
 	/**
@@ -779,7 +779,7 @@ export type ZipFileItem = {
 export type ReadZipEntryCallback = (res : EntriesResult) => void
 export type ReadZipEntryOptions = {
 	/**
-	 * 要读取的压缩包的路径 (本地路径)，app-android平台支持代码包文件目录
+	 * 要读取的压缩包的路径 (本地路径)
 	 */
 	filePath : string.URIString,
 	/**
@@ -829,8 +829,6 @@ export interface FileSystemManager {
 	readFile(options : ReadFileOptions) : void;
 	/**
 	 * FileSystemManager.readFile 的同步版本参数
-	 * @param 文件路径，支持相对地址和绝对地址，app-android平台支持代码包文件目录
-	 * @param base64 / utf-8
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -875,9 +873,6 @@ export interface FileSystemManager {
 	writeFile(options : WriteFileOptions) : void;
 	/**
 	 * FileSystemManager.writeFile 的同步版本
-	 * @param 文件路径，只支持绝对地址
-	 * @param 写入的文本内容
-	 * @param 指定写入文件的字符编码,支持:ascii base64 utf-8
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -922,7 +917,6 @@ export interface FileSystemManager {
 	unlink(options : UnLinkOptions) : void;
 	/**
 	 * FileSystemManager.unlink 的同步版本
-	 * @param 文件路径，只支持绝对地址
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -967,8 +961,6 @@ export interface FileSystemManager {
 	mkdir(options : MkDirOptions) : void;
 	/**
 	 * FileSystemManager.mkdir 的同步版本
-	 * @param 创建的目录路径 (本地路径)
-	 * @param 是否在递归创建该目录的上级目录后再创建该目录。如果对应的上级目录已经存在，则不创建该上级目录。如 dirPath 为 a/b/c/d 且 recursive 为 true，将创建 a 目录，再在 a 目录下创建 b 目录，以此类推直至创建 a/b/c 目录下的 d 目录。
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1013,8 +1005,6 @@ export interface FileSystemManager {
 	rmdir(options : RmDirOptions) : void;
 	/**
 	 * FileSystemManager.rmdir 的同步版本
-	 * @param 要删除的目录路径 (本地路径)
-	 * @param 是否递归删除目录。如果为 true，则删除该目录和该目录下的所有子目录以及文件。
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1059,7 +1049,6 @@ export interface FileSystemManager {
 	readdir(options : ReadDirOptions) : void;
 	/**
 	 * FileSystemManager.readdir 的同步版本
-	 * @param 要读取的目录路径 (本地路径)
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1104,7 +1093,6 @@ export interface FileSystemManager {
 	access(options : AccessOptions) : void;
 	/**
 	 * FileSystemManager.access 的同步版本
-	 * @param 要删除的目录路径 (本地路径)
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1149,8 +1137,6 @@ export interface FileSystemManager {
 	rename(options : RenameOptions) : void;
 	/**
 	 * FileSystemManager.rename 的同步版本
-	 * @param 源文件路径，支持本地路径
-	 * @param 新文件路径，支持本地路径
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1195,8 +1181,6 @@ export interface FileSystemManager {
 	copyFile(options : CopyFileOptions) : void;
 	/**
 	 * FileSystemManager.copyFile 的同步版本
-	 * @param 源文件路径，支持本地路径
-	 * @param 新文件路径，支持本地路径
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1263,8 +1247,6 @@ export interface FileSystemManager {
 	stat(options : StatOptions) : void;
 	/**
 	 * FileSystemManager.stat 的同步版本
-	 * @param 文件/目录路径 (本地路径)
-	 * @param 是否递归获取目录下的每个文件的 Stats 信息
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1309,9 +1291,6 @@ export interface FileSystemManager {
 	appendFile(options : AppendFileOptions) : void;
 	/**
 	 * FileSystemManager.appendFile 的同步版本
-	 * @param 要追加内容的文件路径 (本地路径)
-	 * @param 要追加的文本
-	 * @param 指定写入文件的字符编码支持:ascii base64 utf-8
 	 * @uniPlatform {
 	 *    "app": {
 	 *        "android": {
@@ -1803,25 +1782,3 @@ export interface Uni {
 	 */
 	getFileSystemManager() : FileSystemManager
 }
\ No newline at end of file
-
-/**
- * 错误码
- * - 1200002  类型错误。仅支持 base64 / utf-8
- * - 1300002  未找到文件
- * - 1300013  无权限
- * - 1300021  是目录
- * - 1300022  参数无效
- * - 1300066  目录非空
- * - 1301003  对目录的非法操作
- * - 1301005  文件已存在
- * - 1300201  系统错误
- * - 1300202  超出文件存储限制的最大尺寸
- * - 1301111  brotli解压失败
- * - 1302003  标志无效
- * - 1300009  文件描述符错误
- */
-export type FileSystemManagerErrorCode = 1200002 | 1300002 | 1300013 | 1300021 | 1300022 | 1300066 | 1301003 | 1301005 | 1300201 | 1300202 | 1301111 | 1302003 | 1300009;
-export type FileSystemManagerFail = IFileSystemManagerFail;
-export interface IFileSystemManagerFail extends IUniError {
-	errCode : FileSystemManagerErrorCode
-};

uni_modules/uni-fileSystemManager/utssdk/unierror.uts

-import { FileSystemManagerErrorCode,IFileSystemManagerFail } from "./interface.uts"
-
 /**
  * 错误主题
  */
-export const FileSystemManagerUniErrorSubject = 'uni-fileSystemManager';
+export const UniErrorSubject = 'uni-fileSystemManager';
 
 /**
  * 错误码
  * @UniError
  */
-export const FileSystemManagerUniErrors : Map<FileSystemManagerErrorCode, string> = new Map([
+export const UniErrors : Map<number, string> = new Map([
 
 	[1200002, 'type error. only support base64 / utf-8'],
 	[1300002, 'no such file or directory'],
@@ -25,11 +23,3 @@ export const FileSystemManagerUniErrors : Map<FileSystemManagerErrorCode, string
 	[1302003, 'invalid flag'],
 	[1300009, 'bad file descriptor']
 ]);
\ No newline at end of file
-export class FileSystemManagerFailImpl extends UniError implements IFileSystemManagerFail {
-	constructor(errCode : FileSystemManagerErrorCode) {
-		super();
-		this.errSubject = FileSystemManagerUniErrorSubject;
-		this.errCode = errCode;
-		this.errMsg = FileSystemManagerUniErrors.get(errCode) ?? "";
-	}
-}
\ No newline at end of file

uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts

@@ -90,21 +90,6 @@ export type GetAppAuthorizeSettingResult = {
    * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
    * - config error: Android平台：表示没有配置 `android.permission.CAMERA` 权限，[权限配置详情](https://uniapp.dcloud.net.cn/tutorial/app-nativeresource-android.html#permissions)；iOS平台没有该值
    * @type 'authorized' | 'denied' | 'not determined' | 'config error'
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "4.4",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   cameraAuthorized: 'authorized' | 'denied' | 'not determined' | 'config error',
   /**
@@ -114,21 +99,6 @@ export type GetAppAuthorizeSettingResult = {
    * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
    * - config error: Android平台：表示没有配置 `android.permission.ACCESS_COARSE_LOCATION` 权限，[权限配置详情](https://uniapp.dcloud.net.cn/tutorial/app-nativeresource-android.html#permissions)；iOS平台：表示没有在 `manifest.json -> App模块配置` 中配置 `Geolocation(定位)` 模块
    * @type 'authorized' | 'denied' | 'not determined' | 'config error'
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "4.4",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   locationAuthorized: 'authorized' | 'denied' | 'not determined' | 'config error',
   /**
@@ -137,21 +107,6 @@ export type GetAppAuthorizeSettingResult = {
    * - full: 精准定位
    * - unsupported: 不支持（包括用户拒绝定位权限和没有在 `manifest.json -> App模块配置` 中配置 `Geolocation(定位)` 模块）
    * @type 'reduced' | 'full' | 'unsupported'
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "4.4",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   locationAccuracy?: 'reduced' | 'full' | 'unsupported' | null,
   /**
@@ -181,21 +136,6 @@ export type GetAppAuthorizeSettingResult = {
    * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
    * - config error: Android平台：表示没有配置 `android.permission.RECORD_AUDIO` 权限，[权限配置详情](https://uniapp.dcloud.net.cn/tutorial/app-nativeresource-android.html#permissions)；iOS平台没有该值
    * @type 'authorized' | 'denied' | 'not determined' | 'config error'
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "4.4",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   microphoneAuthorized: 'authorized' | 'denied' | 'not determined' | 'config error',
   /**
@@ -205,21 +145,6 @@ export type GetAppAuthorizeSettingResult = {
    * - not determined: 尚未请求授权，会在App下一次调用系统相应权限时请求；（仅 iOS 会出现。此种情况下引导用户打开系统设置，不展示开关）
    * - config error: Android平台没有该值；iOS平台：表示没有在 `manifest.json -> App模块配置` 中配置 `Push(推送)` 模块
    * @type 'authorized' | 'denied' | 'not determined' | 'config error'
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "4.4",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   notificationAuthorized: 'authorized' | 'denied' | 'not determined' | 'config error',
   /**

uni_modules/uni-getAppBaseInfo/utssdk/interface.uts

@@ -8,143 +8,31 @@ export type GetAppBaseInfoOptions = {
 export type GetAppBaseInfoResult = {
   /**
    * manifest.json 中应用appid，即DCloud appid。	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   appId?: string,
   /**
    * `manifest.json` 中应用名称。
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   appName?: string,
   /**
    * `manifest.json` 中应用版本名称。
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   appVersion?: string,
   /**
    * `manifest.json` 中应用版本名号。
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   appVersionCode?: string,
   /**
    * 应用设置的语言en、zh-Hans、zh-Hant、fr、es	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   appLanguage?: string,
   /**
    * 应用设置的语言	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   language?: string,
   /**
    * 引擎版本号。已废弃，仅为了向下兼容保留
    * @deprecated 已废弃，仅为了向下兼容保留
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   version?: string,
   /**
@@ -317,48 +205,12 @@ export type GetAppBaseInfoResult = {
   hostTheme?: string,
   /**
    * 是否uni-app x
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   isUniAppX ?: boolean,
   
   /**
    * uni 编译器版本
    * @deprecated 已废弃，仅为了向下兼容保留
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   uniCompileVersion ?: string,
   /**
@@ -379,79 +231,23 @@ export type GetAppBaseInfoResult = {
    * 		}
    * 	},
    *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
+   *     "uniVer": "√",
+   *     "unixVer": "4.0"
    *   }
    * }
    */
   uniCompilerVersion ?: string,
   /**
    * uni-app 运行平台。
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   uniPlatform ?: 'app' | 'web' | 'mp-weixin' | 'mp-alipay' | 'mp-baidu' | 'mp-toutiao' | 'mp-lark' | 'mp-qq' | 'mp-kuaishou' | 'mp-jd' | 'mp-360' | 'quickapp-webview' | 'quickapp-webview-union' | 'quickapp-webview-huawei',
   /**
    * uni 运行时版本
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   uniRuntimeVersion ?: string,
   /**
    * uni 编译器版本号
    * @deprecated 已废弃，仅为了向下兼容保留
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   uniCompileVersionCode?: number,
   /**
@@ -472,34 +268,14 @@ export type GetAppBaseInfoResult = {
    * 		}
    * 	},
    *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
+   *     "uniVer": "√",
+   *     "unixVer": "4.0"
    *   }
    * }
    */
   uniCompilerVersionCode?: number,
   /**
    * uni 运行时版本号
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   uniRuntimeVersionCode?: number,
   /**

uni_modules/uni-getDeviceInfo/utssdk/interface.uts

@@ -8,292 +8,50 @@ export type GetDeviceInfoOptions = {
 export type GetDeviceInfoResult = {
   /**
    * 设备品牌
-   * @deprecated 已废弃，仅为了向下兼容保留
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   brand?: string
   /**
    * 设备品牌
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   deviceBrand?: string,
   /**
    * 设备 id 。由 uni-app 框架生成并存储，清空 Storage 会导致改变
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   deviceId?: string,
   /**
    * 设备型号	
-   * @deprecated 已废弃，仅为了向下兼容保留
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   model?: string,
   /**
    * 设备型号	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   deviceModel?: string,
   /**
    * 设备类型phone、pad、pc	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   deviceType?: string,
   /**
    * 设备方向 竖屏 portrait、横屏 landscape	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   deviceOrientation?: string,
   /**
    * 设备像素比	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   devicePixelRatio?: string,
   /**
    * 操作系统及版本	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   system?: string,
   /**
    * 客户端平台	
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "√",
-   *     "unixVer": "4.0"
-   *   }
-   * }
    */
   platform?: string,
   /**
    * 是否root
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "x",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "x",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   isRoot?: boolean,
   /**
    * 是否是模拟器
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "x",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "x",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
-   *   }
-   * }
    */
   isSimulator?: boolean,
   /**
@@ -312,10 +70,6 @@ export type GetDeviceInfoResult = {
    * 			"uniVer": "x",
    * 			"unixVer": "x"
    * 		}
-   * 	},
-   *   "web": {
-   *     "uniVer": "x",
-   *     "unixVer": "x"
    * 	}
    * }
    */

uni_modules/uni-getLocation-system/utssdk/interface.uts

@@ -22,16 +22,16 @@ export interface Uni {
    *            "unixVer": "3.9.0"
    *        },
    *        "ios": {
-   *            "osVer": "12.0",
-   *            "uniVer": "√",
-   *            "unixVer": "4.11"
+   *            "osVer": "x",
+   *            "uniVer": "x",
+   *            "unixVer": "x"
    *        }
    *    },
    *    "web": {
    *        "uniVer": "√",
    *        "unixVer": "4.0"
    *    }
-   * }
+   * }9999
    * 
    */
   getLocation(options: GetLocationOptions):void;

uni_modules/uni-getNetworkType/utssdk/interface.uts

@@ -15,9 +15,9 @@ export interface Uni {
 	* 			"unixVer": "3.9+"
 	* 		},
 	* 		"ios": {
-	* 			"osVer": "12.0",
+	* 			"osVer": "9.0",
 	* 			"uniVer": "√",
-	* 			"unixVer": "4.11"
+	* 			"unixVer": "4.06"
 	* 		}
 	* 	},
   *   "web": {

uni_modules/uni-getSystemSetting/utssdk/interface.uts

@@ -3,122 +3,26 @@
 export type GetSystemSettingResult = {
   /**
    * 蓝牙是否开启
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   bluetoothEnabled?: boolean,
   /**
    * 蓝牙的报错信息
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   bluetoothError?: string,
   /**
    * 位置是否开启
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   locationEnabled : boolean,
   /**
    * wifi是否开启
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   wifiEnabled?: boolean,
   /**
    * wifi的报错信息
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "x",
-   * 			"uniVer": "x",
-   * 			"unixVer": "x"
-   * 		}
-   * 	}
-   * }
    */
   wifiError?: string,
   /**
    * 设备方向
-   * 
-   * @uniPlatform
-   * {
-   * 	"app": {
-   * 		"android": {
-   * 			"osVer": "5.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "3.9+"
-   * 		},
-   * 		"ios": {
-   * 			"osVer": "12.0",
-   * 			"uniVer": "√",
-   * 			"unixVer": "4.11"
-   * 		}
-   * 	}
-   * }
    */
   deviceOrientation : 'portrait' | 'landscape',
 }

uni_modules/uni-media/package.json

@@ -86,7 +86,7 @@
 					"app": {
 						"js": false,
 						"kotlin": true,
-						"swift": true
+						"swift": false
 					}
 				},
 				"saveVideoToPhotosAlbum": {
@@ -94,7 +94,7 @@
 					"app": {
 						"js": false,
 						"kotlin": true,
-						"swift": true
+						"swift": false
 					}
 				},
 				"getVideoInfo": {

uni_modules/uni-media/utssdk/ChooseImageUtils.uts

+import { ChooseImageOptions, ChooseVideoOptions } from "./interface.uts"
+import {
+	UniError_ChooseImage, UniError_ChooseVideo, MediaErrorImpl
+} 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<string> = (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 = new MediaErrorImpl(1101001, UniError_ChooseImage);
+				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<string> = (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 = new MediaErrorImpl(1101001, UniError_ChooseVideo);
+				options.fail?.(error)
+				options.complete?.(error)
+			}
+		})
+	}
+}
\ No newline at end of file

uni_modules/uni-media/utssdk/app-android/index.uts

@@ -343,7 +343,6 @@ function copyFile(fromFilePath : string, toFilePath : string) : boolean {
 			if (!fromFile.canRead()) {
 				return false;
 			}
-			fis = new FileInputStream(fromFile);
 		}
 		if (fis == null) {
 			return false
@@ -359,6 +358,7 @@ function copyFile(fromFilePath : string, toFilePath : string) : boolean {
 		toFile.createNewFile()
 	}
 	try {
+		// let fis = new FileInputStream(fromFile)
 		let fos = new FileOutputStream(toFile)
 		let byteArrays = ByteArray(1024)
 		var c = fis!!.read(byteArrays)
@@ -592,21 +592,6 @@ export const getVideoInfo : GetVideoInfo = function (options : GetVideoInfoOptio
 
 
 export const saveVideoToPhotosAlbum : SaveVideoToPhotosAlbum = function (options : SaveVideoToPhotosAlbumOptions) {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-		let requestPermissionList : Array<string> = [Manifest.permission.WRITE_EXTERNAL_STORAGE];
-		UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, requestPermissionList, (a : boolean, b : string[]) => {
-			loadFile(options);
-		}, (a : boolean, b : string[]) => {
-			let error = new MediaErrorImpl(1101005, UniError_SaveVideoToPhotosAlbum);
-			options.fail?.(error);
-			options.complete?.(error);
-		})
-	} else {
-		loadFile(options);
-	}
-}
-
-function loadFile(options : SaveVideoToPhotosAlbumOptions) {
 	if (TextUtils.isEmpty(options.filePath)) {
 		let error = new MediaErrorImpl(1101003, UniError_SaveVideoToPhotosAlbum);
 		options.fail?.(error)

uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts

@@ -8,7 +8,7 @@ import {
 	MediaErrorImpl
 } from "../../unierror.uts"
 import { getVideoMetadata } from "./MediaUtils.uts"
-import { uniChooseImage, uniChooseVideo } from "./ChooseImageUtils.uts"
+import { uniChooseImage, uniChooseVideo } from "../../ChooseImageUtils.uts"
 import { getUniActivity } from "io.dcloud.uts.android";
 import Intent from 'android.content.Intent';
 import File from 'java.io.File';

uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts

@@ -46,16 +46,18 @@ export function transcodeImage(options : CompressImageOptions) {
 	var widthStr = ""
 	var heightStr = ""
 	if (options.compressedWidth != null) {
-		widthStr = options.compressedWidth.toString();
+		compressOption.width = options.compressedWidth!
 	} else {
 		widthStr = TextUtils.isEmpty(options.width) ? "auto" : options.width!
 	}
 	if (options.compressedHeight != null) {
-		heightStr = options.compressedHeight.toString();
+		compressOption.height = options.compressedHeight!
 	} else {
 		heightStr = TextUtils.isEmpty(options.height) ? "auto" : options.height!
 	}
-	getHeightAndWidth(compressOption, widthStr, heightStr);
+	if (compressOption.width <= 0 || compressOption.height <= 0) {
+		getHeightAndWidth(compressOption, widthStr, heightStr)
+	}
 	let bitmapOptions = new BitmapFactory.Options()
 	bitmapOptions.inJustDecodeBounds = false;
 	if (srcFile.length() > 1500000) {
@@ -173,7 +175,7 @@ function str2Float(valuestr : string, realValue : number, defValue : number) : n
 	}
 	valuestr = valuestr.toLowerCase()
 	if (valuestr.endsWith("px")) {
-		valuestr = valuestr.substring(0, valuestr.length - 2);
+		valuestr == valuestr.substring(0, valuestr.length - 2);
 	}
 	try {
 		return Integer.parseInt(valuestr)
@@ -229,7 +231,8 @@ export function transcodeVideo(options : CompressVideoOptions) {
 	} else if (resolution! > 1 || resolution! <= 0) {
 		resolution = 1.0
 	}
-	let outPath = mediaCachePath + "compress_video_" + System.currentTimeMillis() + ".mp4";
+	let fileName = getFileName(inPath);
+	let outPath = mediaCachePath + (fileName == "" ? (System.currentTimeMillis() + ".mp4") : fileName)
 	let outFile = new File(outPath)
 	if (!outFile.getParentFile().exists()) {
 		outFile.getParentFile().mkdirs()
@@ -238,6 +241,14 @@ export function transcodeVideo(options : CompressVideoOptions) {
 	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

uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeResources

@@ -28,10 +28,6 @@
 		<data>
 		nghJYGVbKFhvAi/+2XYvdy408is=
 		</data>
-		<key>PrivacyInfo.xcprivacy</key>
-		<data>
-		L50owgIQfV6zTzg7T11NlSDYSZU=
-		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
@@ -90,17 +86,6 @@
 			M9nMA2y1DqhJFLOymGCa66mNVw5qDN8J1QzcxQD3H/w=
 			</data>
 		</dict>
-		<key>PrivacyInfo.xcprivacy</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			L50owgIQfV6zTzg7T11NlSDYSZU=
-			</data>
-			<key>hash2</key>
-			<data>
-			NOpzMYrYXZEAI4Xdo9XJX+tflymAvdW2UHdZwen1+iU=
-			</data>
-		</dict>
 	</dict>
 	<key>rules</key>
 	<dict>

uni_modules/uni-media/utssdk/app-ios/index.uts

@@ -3,14 +3,12 @@ import {
 	PreviewImageOptions, PreviewImage, PreviewImageSuccess,
 	ClosePreviewImage, ClosePreviewImageSuccess, ClosePreviewImageOptions,
 	SaveImageToPhotosAlbum, SaveImageToPhotosAlbumOptions, SaveImageToPhotosAlbumSuccess,
-	ChooseVideo, ChooseVideoOptions,
-	SaveVideoToPhotosAlbum, SaveVideoToPhotosAlbumOptions, SaveVideoToPhotosAlbumSuccess, ChooseVideoSuccess,
 } from "../interface.uts";
 import {
 	UniError_ChooseImage, UniError_SaveImageToPhotosAlbum,
-	MediaErrorImpl,UniError_PreviewImage, UniError_ChooseVideo, UniError_SaveVideoToPhotosAlbum
+	MediaErrorImpl,UniError_PreviewImage
 } from "../unierror.uts"
-import { uniChooseImage, uniChooseVideo } from "./ChooseImageUtils.uts";
+import { uniChooseImage, uniChooseVideo } from "../ChooseImageUtils.uts";
 
 import { UTSiOS } from "DCloudUTSFoundation";
 import { NSFileManager } from "Foundation";
@@ -25,7 +23,7 @@ export const chooseImage : ChooseImage = function (option : ChooseImageOptions)
 		if (index == 0) {
 			requestCameraPermission(function (status : number) {
 				if (status == 1) {
-					mediaPicker.openCameraForImage(option)
+					mediaPicker.openCameraForImage(option, compressed)
 				} else {
 					let error = new MediaErrorImpl(1101005, UniError_ChooseImage);
 					option.fail?.(error)
@@ -36,7 +34,7 @@ export const chooseImage : ChooseImage = function (option : ChooseImageOptions)
 		} else if (index == 1) {
 			requestAlbumPermission("readWrite", function (status : number) {
 				if (status == 1) {
-					mediaPicker.openAlbumForImage(option, count)
+					mediaPicker.openAlbumForImage(option, count, 101)
 				} else {
 					let error = new MediaErrorImpl(1101005, UniError_ChooseImage);
 					option.fail?.(error)
@@ -47,56 +45,14 @@ export const chooseImage : ChooseImage = function (option : ChooseImageOptions)
 	});
 }
 
-export const chooseVideo : ChooseVideo = function (option : ChooseVideoOptions) {
-	uniChooseVideo(option, (count : number, compressed : boolean, index : number) => {
-		if (index == 0) {
-			requestCameraPermission(function (status : number) {
-				if (status == 1) {
-					requestMicrophonePermission(function (status : number){
-						if (status == 1) {
-							mediaPicker.openCameraForVideo(option)
-						}else{
-							let error = new MediaErrorImpl(1101005, UniError_ChooseVideo);
-							option.fail?.(error)
-							option.complete?.(error)
-						}
-					})
-					
-				} else {
-					let error = new MediaErrorImpl(1101005, UniError_ChooseVideo);
-					option.fail?.(error)
-					option.complete?.(error)
-				}
-			})
-		
-		} else if (index == 1) {
-			requestAlbumPermission("readWrite", function (status : number) {
-				if (status == 1) {
-					mediaPicker.openAlbumForVideo(option)
-				} else {
-					let error = new MediaErrorImpl(1101005, UniError_ChooseVideo);
-					option.fail?.(error)
-					option.complete?.(error)
-				}
-			})
-		}
-	})
-}
-
 class DCUniMediaPicker {
 	private mediaAlbum : DCloudMediaAlbum = new DCloudMediaAlbum();
 	private mediaCamera : DCloudMediaCamera = new DCloudMediaCamera();
-	openAlbumForImage(option : ChooseImageOptions, count : number){
-		this.chooseImageWithAlbum(option,count);
-	}
-	openAlbumForVideo(option : ChooseVideoOptions){
-		this.chooseVideoWithAlbum(option);
-	}
-	openCameraForVideo(option : ChooseVideoOptions){
-		this.chooseVideoWithCamera(option);
+	openAlbumForImage(option : ChooseImageOptions, count : number, type : number){
+		this.chooseImageWithAlbum(option,count,type);
 	}
-	openCameraForImage(option : ChooseImageOptions){
-		this.chooseImageWithCamera(option);
+	openCameraForImage(option : ChooseImageOptions, compressed : boolean){
+		this.chooseImageWithCamera(option,compressed);
 	}
 	preview(options : PreviewImageOptions){
 		this.previewImageWithOptions(options);
@@ -104,44 +60,7 @@ class DCUniMediaPicker {
 	close(){
 		this.closePreview();
 	}
-	
-	private chooseVideoWithAlbum(option : ChooseVideoOptions){
-		const mediaCachePath = UTSiOS.getMediaCacheDir() + "/"
-		let fileManager = FileManager.default
-		if (fileManager.fileExists(atPath = mediaCachePath) == false) {
-			try {
-				UTSiOS.try(fileManager.createDirectory(atPath = mediaCachePath, withIntermediateDirectories = true, attributes = null))
-			} catch (e) {
-				console.log(e)
-			}
-		}
-		let options : Map<string, any> = new Map();
-		options.set('resolution', "high");
-		options.set('videoCompress', option.compressed);
-		options.set('filePath', mediaCachePath);
-		options.set('maximum', 1);
-		options.set('filter', "video");
-		DispatchQueue.main.async(execute = () : void => {
-			this.mediaAlbum.start(options, success = (response : Map<AnyHashable, any>) : void => {
-				const filePath : string = response.get('tempFilePath') as string
-				let success : ChooseVideoSuccess = {
-					tempFilePath: "file://" + filePath,
-					width: response.get('width'),
-					height: response.get('height'),
-					size: response.get('size'),
-					duration: response.get('duration'),
-				}
-				option.success?.(success)
-				option.complete?.(success)
-			}, fail = (code : number) : void => {
-				let mediaError = new MediaErrorImpl(code, UniError_ChooseVideo);
-				option.fail?.(mediaError)
-				option.complete?.(mediaError)
-			})
-		})
-	}
-	
-	private chooseImageWithAlbum(option : ChooseImageOptions, count : number){
+	private chooseImageWithAlbum(option : ChooseImageOptions, count : number, type : number){
 		const mediaCachePath = UTSiOS.getMediaCacheDir() + "/"
 		let fileManager = FileManager.default
 		if (fileManager.fileExists(atPath = mediaCachePath) == false) {
@@ -192,47 +111,7 @@ class DCUniMediaPicker {
 		})
 	}
 	
-	private chooseVideoWithCamera(option : ChooseVideoOptions){
-		const mediaCachePath = UTSiOS.getMediaCacheDir() + "/"
-		const fileManager = FileManager.default
-		if (fileManager.fileExists(atPath = mediaCachePath) == false) {
-			try {
-				UTSiOS.try(fileManager.createDirectory(atPath = mediaCachePath, withIntermediateDirectories = true, attributes = null))
-			} catch (e) {
-				console.log(e)
-			}
-		}
-		
-		const currentTime = Int(Date().timeIntervalSince1970)
-		const cameraPath = (mediaCachePath + currentTime.toString() + ".mp4")
-		
-		let options : Map<string, any> = new Map();
-		options.set('resolution', "high");
-		options.set('videoCompress', option.compressed);
-		options.set('filePath', cameraPath);
-		options.set('type', "video");
-		options.set('videoMaximumDuration', 60);
-		
-		DispatchQueue.main.async(execute = () : void => {
-			this.mediaCamera.start(options, success = (response : Map<AnyHashable, any>) : void => {
-				let success : ChooseVideoSuccess = {
-					tempFilePath: "file://" + cameraPath,
-					width: response.get('width'),
-					height: response.get('height'),
-					size: response.get('size'),
-					duration: response.get('duration'),
-				}
-				option.success?.(success)
-				option.complete?.(success)
-			}, fail = (code : number) : void => {
-				let mediaError = new MediaErrorImpl(code, UniError_ChooseVideo);
-				option.fail?.(mediaError)
-				option.complete?.(mediaError)
-			})
-		})
-	}
-	
-	private chooseImageWithCamera(option : ChooseImageOptions){
+	private chooseImageWithCamera(option : ChooseImageOptions, compressed : boolean){
 		const mediaCachePath = UTSiOS.getMediaCacheDir() + "/"
 		const fileManager = FileManager.default
 		if (fileManager.fileExists(atPath = mediaCachePath) == false) {
@@ -250,7 +129,6 @@ class DCUniMediaPicker {
 		options.set('resolution', "high");
 		options.set('sizeType', option.sizeType);
 		options.set('filePath', cameraPath);
-		options.set('type', "image");
 		if (option.crop != null) {
 			let crop : Map<string, any> = new Map();
 			if (option.crop!.width != nil) {
@@ -318,23 +196,6 @@ class DCUniMediaPicker {
 	}
 }
 
-function requestMicrophonePermission(completion : (status : number) => void) {
-	let authorized = AVCaptureDevice.authorizationStatus(for= AVMediaType.audio)
-	if (authorized == AVAuthorizationStatus.authorized) {
-		completion(1)
-	} else if (authorized == AVAuthorizationStatus.notDetermined) {
-		AVCaptureDevice.requestAccess(for=AVMediaType.audio, completionHandler = (result : Bool) : void => {
-			if (result) {
-				completion(1)
-			} else {
-				completion(0)
-			}
-		})
-	} else {
-		completion(0)
-	}
-}
-
 function requestCameraPermission(completion : (status : number) => void) {
 	let cameraAuthorized = AVCaptureDevice.authorizationStatus(for=AVMediaType.video)
 	
@@ -474,34 +335,3 @@ export const saveImageToPhotosAlbum : SaveImageToPhotosAlbum = function (options
 		}
 	})
 }
\ No newline at end of file
-
-export const saveVideoToPhotosAlbum : SaveVideoToPhotosAlbum = function (options : SaveVideoToPhotosAlbumOptions) {
-	const path = UTSiOS.getResourceAbsolutePath(options.filePath,null)
-	let url = new URL(string = path)
-	if (url == null) {
-		let error = new MediaErrorImpl(1101003, UniError_SaveVideoToPhotosAlbum);
-		options.fail?.(error)
-		options.complete?.(error)
-		return
-	}
-	requestAlbumPermission("addOnly", function (status : number) {
-		if (status == 1) {
-			try {
-				UTSiOS.try(PHPhotoLibrary.shared().performChangesAndWait(() : void => {
-					PHAssetCreationRequest.creationRequestForAssetFromVideo(atFileURL = url!)
-				}))
-				let success : SaveVideoToPhotosAlbumSuccess = {}
-				options.success?.(success)
-				options.complete?.(success)
-			} catch (e) {
-				let error = new MediaErrorImpl(1101006, UniError_SaveVideoToPhotosAlbum);
-				options.fail?.(error)
-				options.complete?.(error)
-			}
-		} else {
-			let error = new MediaErrorImpl(1101005, UniError_SaveVideoToPhotosAlbum);
-			options.fail?.(error)
-			options.complete?.(error)
-		}
-	})
-}
\ No newline at end of file

uni_modules/uni-media/utssdk/app-ios/info.plist

@@ -5,10 +5,8 @@
 		<key>NSCameraUsageDescription</key>
 		<string>APP需要您的同意，才能使用摄像头，以便于相机拍摄</string>
 		<key>NSPhotoLibraryAddUsageDescription</key>
-		<string>APP需要您的同意，才能访问相册，以便于保存图像</string>
+		<string>APP需要您的同意，才能访问相册，以便于保存图片</string>
 		<key>NSPhotoLibraryUsageDescription</key>
-		<string>APP需要您的同意，才能访问相册，以便于图像选取</string>
-		<key>NSMicrophoneUsageDescription</key>
-		<string>APP需要您的同意，才能使用麦克风，以便于录制音频</string>
+		<string>APP需要您的同意，才能访问相册，以便于图片选取</string>
 	</dict>
 </plist>
\ No newline at end of file

uni_modules/uni-media/utssdk/interface.uts

@@ -429,7 +429,6 @@ export type ChooseVideoOptions = {
 	/**
 	 * 是否压缩所选的视频源文件，默认值为true，需要压缩
 	 * @type boolean
-	 * @default true
 	 */
 	compressed ?: boolean | null,
 	/**

uni_modules/uni-network/utssdk/app-ios/index.uts

-import { Request, RequestOptions, RequestSuccess, RequestFail, RequestTask, UploadFileOptions, UploadFile, UploadTask, OnProgressUpdateResult, UploadFileSuccess, UploadFileProgressUpdateCallback, DownloadFileProgressUpdateCallback, DownloadFileOptions, OnProgressDownloadResult, DownloadFile, DownloadFileSuccess } from './interface';
+import { Request, RequestOptions, RequestSuccess, RequestFail, RequestTask, UploadFileOptions, UploadFile, UploadTask, OnProgressUpdateResult, UploadFileSuccess, UploadFileProgressUpdateCallback, DownloadFileProgressUpdateCallback, DownloadFileOptions, OnProgressDownloadResult, DownloadFile ,DownloadFileSuccess} from './interface';
 import { NetworkManager, NetworkRequestListener, NetworkUploadFileListener, NetworkDownloadFileListener } from './network/NetworkManager.uts'
 import { Data, HTTPURLResponse, NSError, NSNumber, ComparisonResult, RunLoop, Thread } from 'Foundation';
 import { StatusCode } from './network/StatusCode.uts';
 import { RequestFailImpl, UploadFileFailImpl, DownloadFileFailImpl, getErrcode } from '../unierror';
 
-class SimpleNetworkListener<T> extends NetworkRequestListener {
-	private param : RequestOptions<T> | null = null;
+class SimpleNetworkListener extends NetworkRequestListener {
+	private param : RequestOptions | null = null;
 	private headers : Map<string, any> | null = null;
 	private received : number = 0;
 	private data : Data = new Data();
-	constructor(param : RequestOptions<T>) {
+	constructor(param : RequestOptions) {
 		this.param = param;
 		super();
 	}
@@ -53,21 +53,12 @@ class SimpleNetworkListener<T> extends NetworkRequestListener {
 
 			result['data'] = this.parseData(this.data, strData, type);
 
-			if (result['data'] == null) {
-				let failResult = new RequestFailImpl(getErrcode(100001));
-				let fail = kParam?.fail;
-				let complete = kParam?.complete;
-				fail?.(failResult);
-				complete?.(failResult);
-				return
-			}
-
-			let tmp = new RequestSuccess<T>({
-				data: result['data']! as T,
+			let tmp : RequestSuccess = {
+				data: result['data']!,
 				statusCode: (new NSNumber(value = response.statusCode)),
 				header: result['header'] ?? "",
 				cookies: this.parseCookie(this.headers)
-			})
+			};
 			let success = kParam?.success;
 			let complete = kParam?.complete;
 			success?.(tmp);
@@ -117,15 +108,13 @@ class SimpleNetworkListener<T> extends NetworkRequestListener {
 		return result;
 	}
 
-	private parseData(data : Data | null, dataStr : string | null, parseType : string | null) : any | null {
-		if (`${type(of = T.self)}` == "Any.Protocol" || `${type(of = T.self)}` == "Optional<Any>.Type") {
-			if (parseType != null && parseType!.contains("json")) {
+	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 JSON.parse(dataStr!);
-			} else if (parseType == 'jsonp') {
+			return this.parseJson(dataStr!);
+		} else if (type == 'jsonp') {
 			if (dataStr == null || dataStr!.length == 0) {
 				return {};
 			}
@@ -136,7 +125,7 @@ class SimpleNetworkListener<T> extends NetworkRequestListener {
 			}
 			start += 1;
 			let tmp = dataStr!.slice(start, end);
-				return JSON.parse(tmp);
+			return this.parseJson(tmp);
 		} else {
 			//dataStr如果解码失败是空的时候，还需要继续尝试解码。极端情况，服务器不是utf8的，所以字符解码会出现乱码，所以特殊处理一下非utf8的字符。
 			if (data == null) {
@@ -152,22 +141,17 @@ class SimpleNetworkListener<T> extends NetworkRequestListener {
 			// 	}
 			// }
 
-				if (currentStr == null) {
-					currentStr = new String(data = data!, encoding = String.Encoding.utf8);
-				}
-				// utf8 如果失败了，就用ascii，虽然几率很小。
 			if (currentStr == null) {
 				currentStr = new String(data = data!, encoding = String.Encoding.ascii);
 			}
 
 			return currentStr;
 		}
-		} else {
-			if (dataStr == null || dataStr!.length == 0) {
-				return null;
-			}
-			return JSON.parse<T>(dataStr!)
 	}
+
+
+	private parseJson(str : string) : any | null {
+		return JSON.parse(str);
 	}
 
 	private parseCookie(header : Map<string, any> | null) : string[] {
@@ -309,11 +293,11 @@ class DownloadNetworkListener implements NetworkDownloadFileListener {
 		}
 	}
 
-	onFinished(response : HTTPURLResponse, filePath : string) : void {
+	onFinished(response : HTTPURLResponse, filePath: string) : void {
 		try {
 			let kParam = this.options;
 			let tmp : DownloadFileSuccess = {
-				tempFilePath: filePath,
+				tempFilePath:filePath,
 				statusCode: response.statusCode
 			};
 			let success = kParam?.success;
@@ -351,15 +335,10 @@ class DownloadNetworkListener implements NetworkDownloadFileListener {
 }
 
 
-// export const request : Request = (options : RequestOptions) : RequestTask => {
-// 	return NetworkManager.getInstance().request(options, new SimpleNetworkListener(options));
-// }
-
-export function request<T>(options : RequestOptions<T>, _t : T.Type) : RequestTask {
-	return NetworkManager.getInstance().request(options, new SimpleNetworkListener<T>(options));
+export const request : Request = (options : RequestOptions) : RequestTask => {
+	return NetworkManager.getInstance().request(options, new SimpleNetworkListener(options));
 }
 
-
 export const uploadFile : UploadFile = (options : UploadFileOptions) : UploadTask => {
 	return NetworkManager.getInstance().uploadFile(options, new UploadNetworkListener(options));
 }

uni_modules/uni-network/utssdk/app-ios/interface.uts

 
-export type Request<T> = (param: RequestOptions<T>) => RequestTask;
+export type Request = (param: RequestOptions) => RequestTask;
 
 /**
  * 网络请求参数
  */
-export type RequestOptions<T> = {
+export type RequestOptions = {
   /**
    * 开发者服务器接口地址
    */
@@ -80,7 +80,7 @@ export type RequestOptions<T> = {
    * 网络请求成功回调。
    * @defaultValue null
    */
-  success?: RequestSuccessCallback<T> | null,
+  success?: RequestSuccessCallback | null,
   /**
    * 网络请求失败回调。
    * @defaultValue null
@@ -93,12 +93,12 @@ export type RequestOptions<T> = {
   complete?: RequestCompleteCallback | null
 }
 
-export type RequestSuccess<T> = {
+export type RequestSuccess = {
   /**
    * 开发者服务器返回的数据
    * @type {RequestDataOptions}
    */
-  data: T | null,
+  data: any | null,
   /**
    * 开发者服务器返回的 HTTP 状态码
    */
@@ -138,7 +138,7 @@ export type RequestMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD"
 export type RequestErrorCode = 5 | 1000 | 100001 | 100002 | 600003 | 600009 | 602001;
 
 
-// export type RequestFail = UniError;
+export type RequestFail = UniError;
 // /**
 //  * 网络请求失败的错误回调参数
 //  */
@@ -146,7 +146,8 @@ export type RequestErrorCode = 5 | 1000 | 100001 | 100002 | 600003 | 600009 | 60
 // 	errCode: RequestErrorCode
 // };
 
-export type RequestSuccessCallback<T> = (option: RequestSuccess<T>) => void;
+
+export type RequestSuccessCallback = (option: RequestSuccess) => void;
 export type RequestFailCallback = (option: RequestFail) => void;
 export type RequestCompleteCallback = (option: any) => void;
 
@@ -230,7 +231,7 @@ export type UploadFileSuccess = {
   statusCode: number
 };
 export type UploadFileSuccessCallback = (result: UploadFileSuccess) => void;
-// export type UploadFileFail = UniError;
+export type UploadFileFail = UniError;
 // /**
 //  * 上传文件失败的错误回调参数
 //  */
@@ -386,7 +387,7 @@ export type DownloadFileSuccess = {
   statusCode: number
 };
 export type DownloadFileSuccessCallback = (result: DownloadFileSuccess) => void;
-// export type DownloadFileFail = UniError;
+export type DownloadFileFail = UniError;
 // /**
 //  * 下载文件失败的错误回调参数
 //  */
@@ -569,7 +570,7 @@ export interface Uni {
             });
      ```
     */
-  request<T>(param: RequestOptions<T>): RequestTask;
+  request: Request,
   /**
     * UploadFile()
     * @description 
@@ -606,7 +607,7 @@ export interface Uni {
             });
      ```
     */
-  uploadFile: UploadFile;
+  uploadFile: UploadFile,
   /**
     * DownloadFile()
     * @description 
@@ -638,5 +639,5 @@ export interface Uni {
               });
      ```
     */
-  downloadFile: DownloadFile;
+  downloadFile: DownloadFile
 }

uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts

@@ -60,7 +60,7 @@ class NetworkManager implements URLSessionDataDelegate {
 	}
 
 
-	public request<T>(param : RequestOptions<T>, listener : NetworkRequestListener) : RequestTask {
+	public request(param : RequestOptions, listener : NetworkRequestListener) : RequestTask {
 		let request = this.createRequest(param);
 		if (request == null) {
 			let error = new NSError(domain = "invalid URL", code = 600009);
@@ -91,7 +91,7 @@ class NetworkManager implements URLSessionDataDelegate {
 	}
 
 
-	public createRequest<T>(param : RequestOptions<T>) : URLRequest | null {
+	public createRequest(param : RequestOptions) : URLRequest | null {
 		let url = new URL(string = param.url);
 		if (url == null) {
 			return null

uni_modules/uni-payment-alipay/utssdk/app-android/Alipay.uts

 import PayTask from 'com.alipay.sdk.app.PayTask';
 import string from 'android.R.string';
-const defaultErrorCode : number = 700000
+const defaultErrorCode : number = 700716
 const errorCodeMap : Map<number, number> = new Map([
-	[8000, 700600],
-	[4000, 701100],
-	[5000, 701110],
-	[6001, 700601],
-	[6002, 700602],
-	[6004, 700603]
+	[8000, 700710],
+	[4000, 700711],
+	[5000, 700712],
+	[6001, 700713],
+	[6002, 700714],
+	[6004, 700715]
 ])
 export class Alipay {
 	public requestPayment(options : RequestPaymentOptions) {

uni_modules/uni-payment-alipay/utssdk/app-ios/Alipay.uts

+import { UTSiOSHookProxy } from "DCloudUniappRuntime";
+import { UIApplication } from "UIKit"
+import { AlipaySDK } from "AlipaySDK"
+import { URL, NSUserActivity, NSUserActivityTypeBrowsingWeb } from "Foundation"
+
+
+const defaultErrorCode : number = 700716;
+
+const errorCodeMap : Map<string, number> = new Map([
+	['8000', 700710],
+	['4000', 700711],
+	['5000', 700712],
+	['6001', 700713],
+	['6002', 700714],
+	['6004', 700715]
+]);
+
+export class Alipay implements UTSiOSHookProxy {
+
+	options ?: RequestPaymentOptions
+
+	// 通过 url scheme 方式唤起 app 时的回调函数。
+	applicationOpenURLOptions(app : UIApplication | null, url : URL, options : Map<UIApplication.OpenURLOptionsKey, any> | null = null) : boolean {
+		if (url.host == 'safepay') {
+			AlipaySDK.defaultService().processOrder(withPaymentResult = url, standbyCallback = (resultDic ?: Map<AnyHashable, any>) : void => {
+				this.handlePaymentResult(resultDic)
+			})
+		}
+		return true
+	}
+
+	// 当应用程序接收到与用户活动相关的数据时调用此方法，例如，当用户使用 Universal Link 唤起应用时。
+	applicationContinueUserActivityRestorationHandler(application : UIApplication | null, userActivity : NSUserActivity | null, restorationHandler : ((res : [any] | null) => void) | null = null) : boolean {
+		if (userActivity?.activityType == NSUserActivityTypeBrowsingWeb) {
+			AlipaySDK.defaultService().handleOpenUniversalLink(userActivity, standbyCallback = (resultDic ?: Map<AnyHashable, any>) : void => {
+				this.handlePaymentResult(resultDic)
+			})
+		}
+		return true
+	}
+
+	requestPayment(options : RequestPaymentOptions) {
+		this.options = options
+		AlipaySDK.defaultService().payOrder(options.orderInfo, fromScheme = "uniAlipay", fromUniversalLink = "", callback = (resultDic ?: Map<AnyHashable, any>) : void => {
+			this.handlePaymentResult(resultDic)
+		})
+	}
+
+	handlePaymentResult(resultDic ?: Map<AnyHashable, any>) {
+		let resultStatus : string = ''
+		if (resultDic == null) {
+			resultStatus = defaultErrorCode.toString()
+		} else {
+			resultStatus = resultDic!.get("resultStatus") as string
+			if (resultStatus == null) {
+				resultStatus = defaultErrorCode.toString()
+			}
+		}
+		
+		if (resultStatus == "9000") {
+			let res : RequestPaymentSuccess = {
+				data: resultDic
+			}
+			this.options?.success?.(res)
+			this.options?.complete?.(res)
+		} else {
+			let code = errorCodeMap[resultStatus];
+			if (code == null) {
+				code = defaultErrorCode
+			}
+			let err = new RequestPaymentFailImpl(code!);
+			this.options?.fail?.(err)
+			this.options?.complete?.(err)
+		}
+
+	}
+}
\ No newline at end of file

uni_modules/uni-payment-wxpay/utssdk/app-android/src/WXPayEntryActivity.uts

@@ -7,10 +7,10 @@ import Bundle from 'android.os.Bundle'
 import WXAPIFactory from 'com.tencent.mm.opensdk.openapi.WXAPIFactory';
 import {Wxpay} from './Wxpay';
 import R from 'uts.sdk.modules.uniPaymentWxpay.R';
-const defaultErrorCode : number = 700000
+const defaultErrorCode : number = 700716
 const errorCodeMap : Map<number, number> = new Map([
-	[-1, 701100],
-	[-2, 700601]
+	[-1, 700711],
+	[-2, 700713]
 ])
 export class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
 	constructor() {