merge alpha handle

App.vue

@@ -19,4 +19,5 @@
 	/* #ifdef APP-VUE */
 	@import './common/uni.css';
 	/* #endif */
+
 </style>

pages.json

@@ -35,6 +35,14 @@
 		    }
 		    
 		},
+		{
+		    "path" : "pages/component/helloView",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		},
 		{
 		    "path" : "pages/SDKIntegration/SDKIntegration",
 		    "style" :                                                                                    
@@ -54,7 +62,7 @@
 		    
 		},
 		{
-		    "path" : "pages/SDKIntegration/TencentMap/TencentMap",
+		    "path" : "pages/SDKIntegration/Lottie/index",
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "",

pages/SDKIntegration/Lottie/index.nvue

+<template>
+    <div>
+        <button @tap="changeUrl">播放本地动画资源</button>
+		<button @tap="changeServerUrl">播放远程动画资源</button>
+		
+        <button @tap="changeAutoPlay">测试AutoPlay</button>
+        <button @tap="changeLoop">测试Loop</button>
+        <button @tap="changeAction(1)">测试action play</button>
+        <button @tap="changeAction(2)">测试action pause</button>
+        <button @tap="changeAction(3)">测试action stop</button>
+        <uts-animation-view ref="animView" :path="animUrl" :autoplay="autoplay" :loop="loop" :action="action"
+            :hidden="hidden" @bindended="testAnimEnd" @click="lottieClickTest" @longpress="lottieLongpressTest"
+            :style="{width:widthNum+'rpx',height:heightNum+'px',background:yanse}">
+        </uts-animation-view>
+        
+    </div>
+</template>
+
+<script>
+  
+    export default {
+        data() {
+            return {
+                hidden: false,
+                autoplay: false,
+                action: "play",
+                loop: false,
+                yanse: "red",
+                widthNum: 750,
+                heightNum: 200,
+                comShow: true,
+                animUrl: "/static/anim_a.json"
+            }
+        },
+        
+        methods: {
+
+            changeAutoPlay: function() {
+                this.autoplay = !this.autoplay
+            },
+            changeUrl: function() {
+                if (this.animUrl == "/static/anim_a.json") {
+                    this.animUrl = "/static/anim_b.json"
+                } else {
+                    this.animUrl = "/static/anim_a.json"
+                }
+            },
+
+			changeServerUrl: function() {
+                this.animUrl = "https://b.bdstatic.com/miniapp/images/lottie_example_one.json"
+            },
+            changeAction: function(type) {
+                if (type == 1) {
+                    this.action = "play"
+                } else if (type == 2) {
+                    this.action = "pause"
+                } else if (type == 3) {
+                    this.action = "stop"
+                }
+            },
+            changeLoop: function() {
+                this.loop = !this.loop
+            },
+            testAnimEnd: function(res) {
+                console.log("testAnimEnd");
+                console.log(res);
+            },
+
+            changeRepeat: function(res) {
+                this.$refs["animView"].updateRepeatConfig("RESTART");
+            },
+            lottieClickTest: function(res) {
+                console.log("lottieClickTest");
+                console.log(res);
+            },
+            lottieLongpressTest: function(res) {
+                console.log("lottieClickTest");
+                console.log(res);
+            },
+        }
+    }
+</script>

pages/SDKIntegration/SDKIntegration.vue

@@ -4,6 +4,7 @@
 		<uni-list>
 			<uni-list-item @tap="gotoTencentLocation" title="腾讯定位sdk集成示例" class="itemButton" :clickable="true" link/>
 			<uni-list-item @tap="gotoToast" title="Toast示例" class="itemButton" :clickable="true" link/>
+			<uni-list-item @tap="gotoLottie" title="Lottie动画示例" class="itemButton" :clickable="true" link/>
 		</uni-list>
 	</view>
 </template>
@@ -14,6 +15,10 @@
 	 	checkHasIntegration
 	 } from "@/uni_modules/uts-tencentgeolocation";
 	 
+	 import {
+	 	checkHasLottieIntegration
+	 } from "@/uni_modules/uts-animation-view";
+	 
 	export default {
 		data() {
 			return {
@@ -27,6 +32,19 @@
 					url:'/pages/SDKIntegration/Toast/Toast'
 				})
 			},
+			gotoLottie:function(e){
+				if(checkHasLottieIntegration()){
+					uni.navigateTo({
+						url:'/pages/SDKIntegration/Lottie/index'
+					})
+				}else{
+					uni.showToast({
+						icon:'none',
+						title:'需要在自定义基座中运行'
+					})
+				}
+				
+			},
 			gotoTencentLocation:function(e){
 				
 				let ret = checkHasIntegration();

pages/SDKIntegration/TencentMap/TencentMap.vue

-<template>
-	<view>
-		<button @tap="testTencentMap"> 选择地图信息</button>
-	</view>
-	
-</template>
-
-<script>
-	import { gotoTencentMapActivity } from "@/uni_modules/uts-tencentmap";
-	export default {
-		data() {
-			return {
-				title: '',
-			}
-		},
-		methods: {
-			
-			testTencentMap:function(e){
-				
-			},
-		}
-	}
-</script>
-
-<style>
-</style>
\ No newline at end of file

pages/SystemAPI/Alert/alert.vue

 <template>
-	<page-head :title="title"></page-head>
-	<view class="uni-padding-wrap uni-common-mt">
-		<button @tap="testShowAlert">确认框</button>
-		<button @tap="testShowPrompt">输入框</button>
+	<view>
+		<page-head :title="title"></page-head>
+		<view class="uni-padding-wrap uni-common-mt">
+			<button @tap="testShowAlert">确认框</button>
+			<button @tap="testShowPrompt">输入框</button>
+		</view>
 	</view>
+
 </template>
 
 <script>

pages/advance/advance.vue

@@ -5,7 +5,6 @@
 
 		<uni-collapse accordion>
 			<uni-collapse-item title="延迟任务" :border="false">
-
 				<uni-list>
 					<uni-list-item @tap="testTimer" title="开启延迟任务"  :clickable="true">
 					</uni-list-item>
@@ -33,6 +32,15 @@
 					</uni-list-item>
 				</uni-list>
 			</uni-collapse-item>
+			<uni-collapse-item title="组件开发示例" :border="false">
+			
+				<uni-list>
+					<uni-list-item @tap="testHelloUTSComponent" title="Hello UTS Component" :clickable="true" link />
+			
+				</uni-list>
+			
+			</uni-collapse-item>
+			
 			<uni-collapse-item title="android平台示例" :border="false">
 
 				<uni-list>
@@ -162,6 +170,11 @@
 					url: '/pages/lifecycle/lifecycle'
 				})
 			},
+			testHelloUTSComponent: function() {
+				uni.navigateTo({
+					url: '/pages/component/helloView'
+				})
+			},
 			testSyntax: function() {
 				uni.navigateTo({
 					url: '/pages/SyntaxCase/index'

pages/component/helloView.nvue

+<template>
+	<div>
+		<uts-hello-view buttonText="点击按钮内容" style="width:375px;height: 375px;background-color: aqua;"></uts-hello-view>
+		<uts-hello-container>
+			<text>文本组件</text>
+			<image src="../../static/logo.png" mode="aspectFit"></image>
+		</uts-hello-container>
+	</div>
+	
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file

uni_modules/uni-usercapturescreen/changelog.md

+## 1.0.1（2022-10-27）
+修改插件描述
+## 1.0.0（2022-10-26）
+支持安卓、iOS、微信小程序平台

uni_modules/uni-usercapturescreen/index.d.ts

+type OnUserCaptureScreenCallback = (res?: { errMsg: string }) => void
+
+declare class Uni {
+  /**
+   * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件。
+   *
+   * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen)
+   */
+  onUserCaptureScreen(callback: OnUserCaptureScreenCallback): void;
+  /**
+   * 用户主动截屏事件。取消事件监听。
+   *
+   * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen)
+   */
+  offUserCaptureScreen(callback: OnUserCaptureScreenCallback): void;
+}

uni_modules/uni-usercapturescreen/package.json

+{
+	"id": "uni-usercapturescreen",
+	"displayName": "uni-usercapturescreen",
+	"version": "1.0.1",
+	"description": "用户主动截屏事件监听",
+	"keywords": [
+        "截屏"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.6.0"
+	},
+	"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": {
+				"onUserCaptureScreen": "onUserCaptureScreen",
+				"offUserCaptureScreen": "offUserCaptureScreen"
+			}
+		},
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "n",
+					"vue3": "y"
+				},
+				"App": {
+					"app-android": "y",
+					"app-ios": "y"
+				},
+				"H5-mobile": {
+					"Safari": "n",
+					"Android Browser": "n",
+					"微信浏览器(Android)": "n",
+					"QQ浏览器(Android)": "n"
+				},
+				"H5-pc": {
+					"Chrome": "n",
+					"IE": "n",
+					"Edge": "n",
+					"Firefox": "n",
+					"Safari": "n"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "n",
+					"百度": "n",
+					"字节跳动": "n",
+					"QQ": "n",
+					"钉钉": "n",
+					"快手": "n",
+					"飞书": "n",
+					"京东": "n"
+				},
+				"快应用": {
+					"华为": "n",
+					"联盟": "n"
+				}
+			}
+		}
+	}
+}

uni_modules/uni-usercapturescreen/readme.md

+# uni-usercapturescreen
+
+用户主动截屏事件监听
+
+### uni.onUserCaptureScreen
+
+监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件。
+
+> 使用文档：[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen)
+
+### uni.offUserCaptureScreen
+
+用户主动截屏事件。取消事件监听。
+
+> 使用文档：[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen)

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

+
+
+import {
+	getUniActivity
+} from "io.dcloud.uts.android";
+
+
+
+import ActivityCompat from "androidx.core.app.ActivityCompat";
+import Manifest from "android.Manifest";
+import PackageManager from "android.content.pm.PackageManager";
+import Build from "android.os.Build";
+import FileObserver from "android.os.FileObserver";
+import File from "java.io.File";
+import Environment from "android.os.Environment";
+import System from 'java.lang.System';
+
+
+
+/**
+ * 文件监听器
+ */
+let screenOB: ScreenFileObserver | null = null;
+/**
+ * 记录文件监听器上次监听的时间戳，避免重复监听
+ */
+let lastFileObserverTime: number = 0;
+/**
+ * 图片被捕获的实现
+ */
+let imageChange: UTSCallback | null = null;
+
+
+
+
+/**
+ * android 文件监听实现
+ */
+
+class ScreenFileObserver extends FileObserver {
+
+	/**
+	 * 所有截屏文件的存放目录
+	 */
+	allScreen: File;
+
+	
+	constructor(screenFile: string) {
+		super(screenFile)
+		this.allScreen = new File(screenFile);
+	}
+
+
+	override onEvent(event: Int, path?: string): void {
+		
+		// 只监听文件新增事件
+		if (event == FileObserver.CREATE) {
+			
+			let newPath: string = new File(this.allScreen, path!).getPath();
+			let currentTime = System.currentTimeMillis();
+
+			if ((currentTime - lastFileObserverTime) < 1000) {
+				// 本地截屏行为比上一次超过1000ms,才认为是一个有效的时间
+				return;
+			}
+			
+			lastFileObserverTime = System.currentTimeMillis()
+			let ret = {
+				errCode:1,
+				image:newPath
+			}
+			
+			imageChange!(ret);
+		}
+	}
+}
+
+
+
+
+
+
+
+
+/**
+ * 开启截图监听
+ */
+export function onUserCaptureScreen(callback: (res:UTSJSONObject) => void) {
+	
+	// 检查相关权限是否已经具备
+	if (ActivityCompat.checkSelfPermission(getUniActivity()!, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+		// 不具备权限，申请权限，并且告知用户监听失败
+		ActivityCompat.requestPermissions(getUniActivity()!, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1001)
+		
+		// 因权限缺失导致监听失败
+		let ret = {
+			errCode:-1
+		}
+		callback(ret);
+		return ;
+	}
+	
+	imageChange = callback;
+
+	let directory_screenshot: File;
+	// 找到设备存放截屏文件的目录
+	let directory_pictures = new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_PICTURES);
+	let directory_dcim = new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DCIM);
+	
+	if (Build.MANUFACTURER.lowercase() === "xiaomi") {
+		directory_screenshot = new File(directory_dcim, "Screenshots");
+	} else {
+		directory_screenshot = new File(directory_pictures, "Screenshots");
+	}
+	
+	if (screenOB != null) {
+		screenOB!.stopWatching()
+	}
+	//开始监听
+	screenOB = new ScreenFileObserver(directory_screenshot.path)
+	screenOB!.startWatching()
+
+	// 监听成功
+	let ret = {
+		errCode:0
+	}
+	callback(ret);
+	
+}
+
+
+/**
+ * 关闭截屏监听
+ */
+export function offUserCaptureScreen(success: (res: any) => void) {
+
+	// android 10以上，关闭监听通过移除文件监听器实现
+	if (screenOB != null) {
+		screenOB!.stopWatching()
+		screenOB = null
+	}
+	lastFileObserverTime = 0;
+	
+	success({});
+}
+
+
+

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

+import { NotificationCenter} from 'Foundation';
+import { UIApplication } from "UIKit"
+
+/**
+ * 定义监听截屏事件工具类
+ */
+class CaptureScreenTool {
+	static listener?: UTSCallback;
+	
+	// 监听截屏
+	static listenCaptureScreen(callback?: UTSCallback) {
+		this.listener = callback
+		
+		// 注册监听截屏事件及回调方法
+		// target-action 回调方法需要通过 Selector("方法名") 构建
+		const method = Selector("userDidTakeScreenshot")
+		NotificationCenter.default.addObserver(this, selector = method, name = UIApplication.userDidTakeScreenshotNotification, object = null)
+	}
+	
+	// 捕获截屏回调的方法
+	// target-action 的方法前需要添加 @objc 前缀
+	@objc static userDidTakeScreenshot() {
+		const obj = new UTSJSONObject()
+		// 回调
+		this.listener?.(obj)
+	}
+	
+	// 移除监听事件
+	static removeListen(callback?: UTSCallback) {
+		this.listener = null
+		NotificationCenter.default.removeObserver(this)
+		const obj = new UTSJSONObject()
+		callback?.(obj)
+	}
+}
+
+/**
+ * 开启截图监听
+ */
+export function onUserCaptureScreen(callback?: UTSCallback) {
+	CaptureScreenTool.listenCaptureScreen(callback)
+}
+
+/**
+ * 关闭截屏监听
+ */
+export function offUserCaptureScreen(callback?: UTSCallback) {
+	CaptureScreenTool.removeListen(callback)
+}

uni_modules/uni-usercapturescreen/utssdk/mp-weixin/index.js

+export function onUserCaptureScreen (callback) {
+  return wx.onUserCaptureScreen(callback)
+}
+
+export function offUserCaptureScreen (callback) {
+  return wx.offUserCaptureScreen(callback)
+}

uni_modules/uts-alert/utssdk/app-android/index.uts

@@ -8,13 +8,14 @@ import AlertDialog from 'android.app.AlertDialog';
 import DialogInterface from 'android.content.DialogInterface';
 import EditText from 'android.widget.EditText';
 
+@Suppress("UNUSED_PARAMETER")
 export function showAlert(_title: string|null, _message: string|null, _result: (index: Number) => void) {
 	// todo
 	let uiRunable = new DialogUIRunnable(null,_title!,_message!,"",false);
 	UTSAndroid.getUniActivity()!.runOnUiThread(uiRunable)
 }
 
-
+@Suppress("UNUSED_PARAMETER")
 export function showPrompt(_title: string|null,_message: string|null,_placeholder: string|null, success: (content: string)=>void) {
 	let uiRunable = new DialogUIRunnable(success,_title!,_message!,_placeholder!,true);
 	UTSAndroid.getUniActivity()!.runOnUiThread(uiRunable)

uni_modules/uts-animation-view/package.json

+{
+  "id": "uts-animation-view",
+  "displayName": "uts-animation-view",
+  "version": "1.0.0",
+  "description": "uts-animation-view",
+  "keywords": [
+    "animation-view","uts-animation-view","lottie"
+],
+  "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": [],
+    "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

uni_modules/uts-tencentmap/readme.md → uni_modules/uts-animation-view/readme.md

-# uts-tencentmap
+# animation-view
 ### 开发文档
 [UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
 [UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)

uni_modules/uts-animation-view/utssdk/app-android/config.json

+{
+	"dependencies": [
+		"com.airbnb.android:lottie:3.4.0"
+	],
+	"minSdkVersion": 21
+}
+

uni_modules/uts-animation-view/utssdk/app-android/index.uts

+
+/**
+ * 判断当前的基座是否已经集成了sdk, 即是否是自定义基座
+ */
+export function checkHasLottieIntegration():boolean{
+	
+	let hasIntegration =  true
+	try{
+		let xClass = Class.forName("com.airbnb.lottie.LottieDrawable")
+		console.log(xClass);
+	}catch(e:Exception){
+		hasIntegration = false;
+	}
+	
+	if(!hasIntegration){
+		return false;
+	}
+	
+	return true
+}

uni_modules/uts-animation-view/utssdk/app-android/index.vue

+<template>
+    <view class="defaultStyles">
+
+    </view>
+</template>
+<script lang="uts">
+    import Animator from 'android.animation.Animator'
+    import TextUtils from 'android.text.TextUtils'
+    import View from 'android.view.View'
+    import LottieAnimationView from 'com.airbnb.lottie.LottieAnimationView'
+    import LottieDrawable from 'com.airbnb.lottie.LottieDrawable'
+	import FileInputStream from 'java.io.FileInputStream'
+	import { UTSAndroid } from "io.dcloud.uts";
+
+    class CustomAnimListener extends Animator.AnimatorListener {
+
+        comp: UTSComponent < LottieAnimationView >
+            constructor(com: UTSComponent < LottieAnimationView > ) {
+                super();
+                this.comp = com
+            }
+
+        override onAnimationStart(animation: Animator | null) {}
+
+        override onAnimationEnd(animation: Animator | null, isReverse: Boolean) {
+            this.comp.$emit("bindended")
+        }
+
+        override onAnimationEnd(animation: Animator | null) {}
+
+        override onAnimationCancel(animation: Animator | null) {}
+
+        override onAnimationRepeat(animation: Animator | null) {}
+    }
+
+    //原生提供以下属性或方法的实现  
+    export default {
+        name: "uts-animation-view",
+        /**
+         * 当播放到末尾时触发 ended 事件（自然播放结束会触发回调，循环播放结束及手动停止动画不会触发）
+         */
+        emits: ['bindended'],
+        props: {
+            /**
+             * 动画资源地址，目前只支持绝对路径
+             */
+            "path": {
+                type: String,
+                default: ""
+            },
+            /**
+             * 动画是否自动播放
+             */
+            "autoplay": {
+                type: Boolean,
+                default: false
+            },
+            /**
+			 * 动画是否循环播放
+             */
+            "loop": {
+                type: Boolean,
+                default: false
+            },
+            /**
+             * 是否隐藏动画
+             */
+            "hidden": {
+                type: Boolean,
+                default: false
+            },
+            /**
+             * 动画操作，可取值 play、pause、stop
+             */
+            "action": {
+                type: String,
+                default: "stop"
+            }
+
+        },
+        data() {
+            return {
+
+            }
+        },
+        watch: {
+            "path": {
+                handler(newPath: string) {
+
+					if(this.$el != null){
+						let lottieAnimationView = this.$el!
+						if (!TextUtils.isEmpty(newPath)) {
+							
+						    if (newPath.startsWith("http://") || newPath.startsWith("https://")) {
+						        lottieAnimationView.setAnimationFromUrl(newPath)
+						    } else {
+						        // 默认是static了
+								var realJsonPath = UTSAndroid.getResourcePath(newPath)
+						        lottieAnimationView.setAnimation(new FileInputStream(realJsonPath),newPath)
+						    }
+						}
+						if (this.autoplay) {
+						    lottieAnimationView.playAnimation()
+						}
+					}
+                },
+                immediate: false
+            },
+            "loop": {
+                handler(newLoop: Boolean) {
+					if(this.$el != null){
+						if (newLoop) {
+						    this.$el!.repeatCount = Int.MAX_VALUE
+						} else {
+						    // 不循环则设置成1次
+						    this.$el!.repeatCount = 0
+						}
+						
+						if (this.autoplay) {
+						    this.$el!.playAnimation()
+						}
+					}
+                    
+                },
+                immediate: false
+            },
+
+            "autoplay": {
+                handler(newValue: boolean) {
+					if(this.$el != null){
+						if (newValue) {
+						    this.$el!.playAnimation()
+						}
+					}
+                    
+                },
+                immediate: false
+            },
+
+            "action": {
+                handler(newAction: string) {
+
+                    if (newAction == "play" || newAction == "pause" || newAction == "stop") {
+
+						if(this.$el != null){
+							if (this.action == "play") {
+							    this.$el!.playAnimation()
+							} else if (this.action == "pause") {
+							    this.$el!.pauseAnimation()
+							} else if (this.action == "stop") {
+							    this.$el!.cancelAnimation()
+							    this.$el!.clearAnimation()
+							}
+						}
+
+                    } else {
+                        // 非法入参，不管
+                    }
+                },
+                immediate: false
+            },
+
+            "hidden": {
+                handler(newValue: boolean) {
+					if(this.$el != null){
+						if (newValue) {
+						    this.$el!.visibility = View.GONE
+						} else {
+						    this.$el!.visibility = View.VISIBLE
+						}
+					}
+                },
+                immediate: false
+            },
+
+        },
+        methods: {
+            setRepeatMode(repeat: string) {
+				if(this.$el != null){
+					if ("RESTART" == repeat) {
+					    this.$el!.repeatMode = LottieDrawable.RESTART
+					} else if ("REVERSE" == repeat) {
+					    this.$el!.repeatMode = LottieDrawable.RESTART
+					}
+				}
+            },
+        },
+        
+        NVLoad(): LottieAnimationView { 
+            let lottieAnimationView = new LottieAnimationView($androidContext)
+            return lottieAnimationView
+        },
+		
+        NVLoaded() { 
+			if(this.$el != null){
+				this.$el!.repeatMode = LottieDrawable.RESTART;
+				this.$el!.visibility = View.GONE
+				this.$el!.repeatCount = 0
+				this.$el!.addAnimatorListener(new CustomAnimListener(this))
+			}
+        }
+        
+    }
+</script>
+<style>
+    /* 定义默认样式值, 组件使用者没有配置时使用 */
+    .defaultStyles {
+        width: 750rpx;
+        height: 240rpx;
+    }
+</style>

uni_modules/uts-animation-view/utssdk/app-ios/Frameworks/Lottie.framework/Modules/module.modulemap

+framework module Lottie {
+  header "Lottie-Swift.h"
+  requires objc
+}

uni_modules/uts-animation-view/utssdk/app-ios/config.json

+{
+	"deploymentTarget": "11.0",
+	"validArchitectures": [
+		"arm64",
+		"x86_64"
+	]
+}

uni_modules/uts-animation-view/utssdk/app-ios/index.uts

+
+/**
+ * 判断当前的基座是否已经集成了sdk, 即是否是自定义基座
+ */
+export function checkHasLottieIntegration():boolean{	
+	return true
+}

uni_modules/uts-animation-view/utssdk/app-ios/index.vue

+<template>
+	<view class="defaultStyles">
+
+	</view>
+</template>
+<script lang="uts">
+	import {
+		LottieAnimationView,
+		LottieAnimation,
+		LottieLoopMode
+	} from 'Lottie'
+	import {
+		URL
+	} from 'Foundation'
+	import {
+		UTSiOS
+	} from "DCloudUTSFoundation"
+
+
+	//原生提供以下属性或方法的实现  
+	export default {
+		/**
+		 * 组件名称，也就是开发者使用的标签
+		 */
+		name: "uts-animation-view",
+		/**
+		 * 组件涉及的事件声明，只有声明过的事件，才能被正常发送
+		 */
+		emits: ['bindended'], // 当播放到末尾时触发 ended 事件（自然播放结束会触发回调，循环播放结束及手动停止动画不会触发）
+		/**
+		 * 属性声明，组件的使用者会传递这些属性值到组件
+		 */
+		props: {
+			/**
+			 * 动画资源地址，支持远程 URL 地址和本地绝对路径
+			 */
+			"path": {
+				type: String,
+				default: ""
+			},
+			/**
+			 * 动画是否循环播放
+			 */
+			"autoplay": {
+				type: Boolean,
+				default: false
+			},
+			/**
+			 * 动画是否自动播放
+			 */
+			"loop": {
+				type: Boolean,
+				default: false
+			},
+			/**
+			 * 是否隐藏动画
+			 */
+			"hidden": {
+				type: Boolean,
+				default: false
+			},
+			/**
+			 * 动画操作，可取值 play、pause、stop
+			 */
+			"action": {
+				type: String,
+				default: "stop"
+			}
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		watch: {
+			"path": {
+				handler(newValue: string, oldValue: string) {
+					if (this.autoplay) {
+						this.playAnimation()
+					}
+				},
+				immediate: false //创建时是否通过此方法更新属性，默认值为false  
+			},
+			"loop": {
+				handler(newValue: boolean, oldValue: boolean) {
+					if (newValue) {
+						this.$el.loopMode = LottieLoopMode.loop
+					} else {
+						this.$el.loopMode = LottieLoopMode.playOnce
+					}
+				},
+				immediate: false //创建时是否通过此方法更新属性，默认值为false  
+			},
+			"autoplay": {
+				handler(newValue: boolean, oldValue: boolean) {
+					if (newValue) {
+						this.playAnimation()
+					}
+				},
+				immediate: false //创建时是否通过此方法更新属性，默认值为false  
+			},
+			"action": {
+				handler(newValue: string, oldValue: string) {
+					const action = newValue
+					if (action == "play" || action == "pause" || action == "stop") {
+						switch (action) {
+							case "play":
+								this.playAnimation()
+								break;
+							case "pause":
+								this.$el.pause()
+								break;
+							case "stop":
+								this.$el.stop()
+								break;
+							default:
+								break;
+						}
+					} else {
+						// 非法入参，不管
+					}
+				},
+				immediate: false //创建时是否通过此方法更新属性，默认值为false  
+			},
+
+			"hidden": {
+				handler(newValue: boolean, oldValue: boolean) {
+					this.$el.isHidden = this.hidden
+				},
+				immediate: false //创建时是否通过此方法更新属性，默认值为false  
+			},
+
+		},
+		expose: ['setRepeatMode'],
+		methods: {
+			// 需要对外暴露的方法
+			// 设置 RepeatMode 
+			setRepeatMode(repeatMode: string) {
+				if (repeatMode == "RESTART") {
+					if (this.loop) {
+						this.$el.loopMode = LottieLoopMode.loop
+					} else {
+						this.$el.loopMode = LottieLoopMode.playOnce
+					}
+				} else if (repeatMode == "REVERSE") {
+					if (this.loop) {
+						this.$el.loopMode = LottieLoopMode.autoReverse
+					} else {
+						this.$el.loopMode = LottieLoopMode.repeatBackwards(1)
+					}
+				}
+			},
+			// 不对外暴露的方法
+			// 播放动画 
+			playAnimation() {
+				// 构建动画资源 url
+				var animationUrl: URL | null
+
+				if (this.path.hasPrefix("http")) {
+					animationUrl = new URL(string = this.path)
+				} else {
+					const filePath = UTSiOS.getResourcePath(this.path)
+					animationUrl = new URL(fileURLWithPath = filePath)
+				}
+
+				if (animationUrl != null) {
+					// 加载动画 LottieAnimation
+					LottieAnimation.loadedFrom(url = animationUrl!, closure = (animation: LottieAnimation | null):
+						void => {
+							if (animation != null) {
+								// 加载成功开始播放
+								this.$el.animation = animation
+								this.$el.play(completion = (isFinish: boolean): void => {
+									if (isFinish) {
+										// 播放完成回调事件
+										this.fireEvent("bindended")
+									}
+								})
+							}
+						})
+				} else {
+					console.log("url 构建失败，请检查 path 是否正确")
+				}
+			}
+		},
+		created() { //创建组件，替换created  
+
+		},
+		NVBeforeLoad() { //组件将要创建，对应前端beforeMount  
+			//可选实现，这里可以提前做一些操作  
+		},
+		NVLoad(): LottieAnimationView { //创建原生View，必须定义返回值类型（Android需要明确知道View类型，需特殊校验）  
+			// 初始化 Lottie$el
+			const animationView = new LottieAnimationView()
+			// 默认只播放一次动画
+			animationView.loopMode = LottieLoopMode.playOnce
+			return animationView
+		},
+		NVLoaded() { //原生View已创建  
+
+			/// 更新 props 中定义的属性值
+
+			if (this.loop) {
+				this.$el.loopMode = LottieLoopMode.loop
+			}
+
+			this.$el.isHidden = this.hidden
+
+			if (this.autoplay) {
+				this.playAnimation()
+			}
+		},
+
+		NVLayouted() { //原生View布局完成  
+			//可选实现，这里可以做布局后续操作  
+		},
+
+		NVBeforeUnload() { //原生View将释放  
+			//可选实现，这里可以做释放View之前的操作  
+		},
+		NVUnloaded() { //原生View已释放  
+			//可选实现，这里可以做释放View之后的操作  
+		},
+		unmounted() { //组件销毁  
+			//可选实现  
+		}
+	}
+</script>
+<style>
+	//定义默认样式值, 组件使用者没有配置时使用  
+	.defaultStyles {
+		width: 750rpx;
+		height: 240rpx;
+	}
+</style>
\ No newline at end of file

uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts

@@ -19,7 +19,9 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
             BatteryManager.BATTERY_PROPERTY_CAPACITY
         );
         const res = {
-            errMsg: 'getBatteryInfo:ok',
+            errCode: 0,
+            errSubject: "uni-getBatteryInfo",
+            errMsg: "getBatteryInfo:ok",
             level,
             isCharging: manager.isCharging()
         }
@@ -27,6 +29,8 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
         options.complete?.(res)
     } else {
         const res = {
+			errCode: 1001,
+			errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:fail getAppContext is null'
         }
         options.fail?.(res)

uni_modules/uts-getbatteryinfo/utssdk/interface.uts

+type GetBatteryInfoResult = {
+	/**
+	 * 错误码
+	 * 0:成功
+	 * 1001:getAppContext is null
+	 * 1002:navigator.getBattery is unsupported
+	 */
+	errCode: number,
+	/**
+	 * 调用API的名称
+	 */
+	errSubject: string,
+	/**
+	 * 错误的详细信息
+	 */
+	errMsg: string,
+	/**
+	 * 设备电量，范围1 - 100
+	 */
+	level: number,
+	/**
+	 * 是否正在充电中
+	 */
+	isCharging: boolean
+}
+
+interface UniError<T> {
+	/**
+	 * 错误码
+	 */
+	errCode:number,
+	/**
+	 * 调用API的名称
+	 */
+	errSubject:string,
+	/**
+	 * 错误的详细信息
+	 */
+	errMsg:string,
+	/**
+	 * 错误来源
+	 */
+	cause:any
+}
+
+
+
+export type GetBatteryInfoOptions = {
+	/**
+	 * 接口调用结束的回调函数（调用成功、失败都会执行）
+	 */
+    success?: (res: GetBatteryInfoResult) => void
+	/**
+	 * 接口调用失败的回调函数
+	 */
+    fail?: (res: UniError) => void
+	/**
+	 * 接口调用成功的回调
+	 */
+    complete?: (res: object) => void
+}
+
+/**
+ * 获取电量信息
+ * @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 default function getBatteryInfo(options: GetBatteryInfoOptions): void
+

uni_modules/uts-getbatteryinfo/utssdk/web/index.js

@@ -11,6 +11,8 @@ export default function getBatteryInfo(options) {
         })
     } else {
         const res = {
+			errCode: 1002,
+			errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:fail navigator.getBattery is unsupported'
         }
         options.fail && options.fail(res)

uni_modules/uts-tencentmap/package.json → uni_modules/uts-hello-component/package.json

 {
-  "id": "uts-tencentmap",
-  "displayName": "uts-tencentmap",
+  "id": "uts-hello-component",
+  "displayName": "uts-hello-component",
   "version": "1.0.0",
-  "description": "uts-tencentmap",
+  "description": "uts-hello-component",
   "keywords": [
-    "uts-tencentmap"
+    "uts-hello-component"
 ],
   "repository": "",
   "engines": {

uni_modules/uts-hello-component/readme.md

+# uts-hello-component
+### 开发文档
+[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

uni_modules/uts-hello-component/utssdk/app-android/container.vue

+<template>
+	<view >
+		<slot></slot>
+	</view>
+</template>
+<script lang="uts">
+
+	import LinearLayout from 'android.widget.LinearLayout'
+
+	//原生提供以下属性或方法的实现  
+	export default {
+		name: "uts-hello-container",
+		
+		NVLoad(): LinearLayout {
+			let contentLayout = new LinearLayout($androidContext)
+			return contentLayout
+		}
+		
+	}
+</script>
+

uni_modules/uts-hello-component/utssdk/app-android/index.vue

+<template>
+	<view class="defaultStyles">
+
+	</view>
+</template>
+<script lang="uts">
+	import TextUtils from 'android.text.TextUtils'
+	import Button from 'android.widget.Button'
+	import LinearLayout from 'android.widget.LinearLayout'
+	import Color from 'android.graphics.Color'
+	import View from 'android.view.View'
+
+	class ButtonClickListsner extends View.OnClickListener {
+		constructor() {}
+		override onClick(v ? : View) {
+			console.log(v)
+		}
+	}
+
+	//原生提供以下属性或方法的实现  
+	export default {
+		
+		name: "uts-hello-view",
+		
+		props: {
+
+			"buttonText": {
+				type: String,
+				default: "点击触发"
+			}
+		},
+		
+		data() {
+			return {}
+		},
+		
+		watch: {
+			"buttonText": {
+				/**
+				 * 这里监听属性变化，并进行组件内部更新
+				 */
+				handler(newButtonText: string) {
+					if (this.$el != null) {
+						let button = this.$el!.findViewWithTag("centerButton") as Button
+						if (!TextUtils.isEmpty(newButtonText)) {
+							button.setText(newButtonText)
+						}
+					}
+				},
+				immediate: false
+			},
+		},
+
+		NVLoad(): LinearLayout {
+			//必须实现  
+			let contentLayout = new LinearLayout($androidContext)
+			let button = new Button($androidContext)
+			button.setText("点击触发");
+			button.setTag("centerButton");
+			contentLayout.addView(button, LinearLayout.LayoutParams(500, 500));
+			button.setOnClickListener(new ButtonClickListsner())
+			return contentLayout
+		}
+	}
+</script>
+<style>
+	/* 定义默认样式值, 组件使用者没有配置时使用 */
+	.defaultStyles {
+		width: 750rpx;
+		height: 240rpx;
+	}
+</style>

uni_modules/uts-hello-component/utssdk/app-ios/container.vue

+<template>
+	<view>
+		<slot></slot>
+	</view>
+</template>
+<script lang="uts">
+	import {
+		UIView
+	} from 'UIKit'
+	//原生提供以下属性或方法的实现  
+	export default {
+		name: "uts-hello-container",
+		NVLoad(): UIView {
+			let view = new UIView()
+			return view
+		}
+
+	}
+</script>

uni_modules/uts-nativepage/package.json

-// HBuilder X 版本要求: 3.6.11+
 {
   "id": "uts-nativepage",
   "displayName": "uts-nativepage",