diff --git a/pages.json b/pages.json
index d941aefe13fcf6ede09d1a71802cac5a33911429..6162307616e2e372183bc4c182c99ff11f21e02c 100644
--- a/pages.json
+++ b/pages.json
@@ -44,6 +44,15 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/SDKIntegration/TencentMap/TencentMap",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
},
{
"path" : "pages/SDKIntegration/XToast/XToast",
diff --git a/pages/SDKIntegration/SDKIntegration.vue b/pages/SDKIntegration/SDKIntegration.vue
index 86f7f3de2df8de9c433639b2449d7be363a129dd..d319f52332694925dc17578da22d73bffa4b9069 100644
--- a/pages/SDKIntegration/SDKIntegration.vue
+++ b/pages/SDKIntegration/SDKIntegration.vue
@@ -3,6 +3,7 @@
+
@@ -27,7 +28,12 @@
uni.navigateTo({
url:'/pages/SDKIntegration/TencentLocation/TencentLocation'
})
- }
+ },
+ gotoTencentMap:function(e){
+ uni.navigateTo({
+ url:'/pages/SDKIntegration/TencentMap/TencentMap'
+ })
+ },
}
}
diff --git a/pages/SDKIntegration/TencentMap/TencentMap.vue b/pages/SDKIntegration/TencentMap/TencentMap.vue
new file mode 100644
index 0000000000000000000000000000000000000000..58061beb5a4e83dd6fdc12411879add70c9fea63
--- /dev/null
+++ b/pages/SDKIntegration/TencentMap/TencentMap.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/advance/advance.vue b/pages/advance/advance.vue
index f50785c84a3cbd3cc303b54a3ce953ece987fb30..ab9afb66c041ecb5fb199a37226f3eef123ba404 100644
--- a/pages/advance/advance.vue
+++ b/pages/advance/advance.vue
@@ -39,8 +39,8 @@
+
-
diff --git a/uni_modules/uni-getbatteryinfo/package.json b/uni_modules/uni-getbatteryinfo/package.json
index 7803781aecadce130169bc3958e1ddf21981578e..c8acbfac4480f0df18103e6b379ec8e97b00838d 100644
--- a/uni_modules/uni-getbatteryinfo/package.json
+++ b/uni_modules/uni-getbatteryinfo/package.json
@@ -8,7 +8,7 @@
],
"repository": "",
"engines": {
- "HBuilderX": "^3.6.7"
+ "HBuilderX": "^3.6.8"
},
"dcloudext": {
"type": "uts",
@@ -43,7 +43,7 @@
},
"client": {
"Vue": {
- "vue2": "n",
+ "vue2": "y",
"vue3": "y"
},
"App": {
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/config.json b/uni_modules/uni-getbatteryinfo/utssdk/app-android/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..bf9592567f563664ee930692b3282879db6d5007
--- /dev/null
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/config.json
@@ -0,0 +1,3 @@
+{
+ "minSdkVersion": "21"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
index 5f2084fb3768512a7b2ac8cf33d517d823b62bf4..92d832cc0b604551f91c671c9fd4aef724f7861a 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
@@ -4,9 +4,9 @@ import { getAppContext } from "io.dcloud.uts.android";
type GetBatteryInfoOptions = {
- success?: (res: UTSJSONObject) => void
- fail?: (res: UTSJSONObject) => void
- complete?: (res: UTSJSONObject) => void
+ success?: (res: object) => void
+ fail?: (res: object) => void
+ complete?: (res: object) => void
}
export default function getBatteryInfo(options: GetBatteryInfoOptions) {
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..721b81e0240705a87ec0761aa9eb6f4e188769cb
--- /dev/null
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/config.json
@@ -0,0 +1,3 @@
+{
+ "deploymentTarget": "9"
+}
\ No newline at end of file
diff --git a/uni_modules/uts-advance/utssdk/app-android/index.uts b/uni_modules/uts-advance/utssdk/app-android/index.uts
index b3f1f1d027cb6f1ca936bfa7cae81bc187542c63..8047b557d1ece17a2c39cd6dd38b8679a0b1e8dd 100644
--- a/uni_modules/uts-advance/utssdk/app-android/index.uts
+++ b/uni_modules/uts-advance/utssdk/app-android/index.uts
@@ -21,7 +21,6 @@ import {
onAppActivityPause,
onAppActivityResume,
onAppActivityBack,
- onAppActivityStop,
onAppActivityResult,
onAppTrimMemory,
onAppConfigChange,
diff --git a/uni_modules/uts-screenshot-listener/utssdk/app-android/index.uts b/uni_modules/uts-screenshot-listener/utssdk/app-android/index.uts
index 4855c48aa409d7578e4cb02021c202e1ae02b8da..d52c9800669881f269f964d11bf3b04186830411 100644
--- a/uni_modules/uts-screenshot-listener/utssdk/app-android/index.uts
+++ b/uni_modules/uts-screenshot-listener/utssdk/app-android/index.uts
@@ -84,7 +84,7 @@ class ScreenFileObserver extends FileObserver {
/**
* 开启截图监听
*/
-export function onUserCaptureScreen(callback: (res:UTSJSONObject) => void) {
+export function onUserCaptureScreen(callback: (res:object) => void) {
// 检查相关权限是否已经具备
if (ActivityCompat.checkSelfPermission(getUniActivity()!, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
diff --git a/uni_modules/uts-tencentmap/changelog.md b/uni_modules/uts-tencentmap/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uts-tencentmap/package.json b/uni_modules/uts-tencentmap/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..286192bae730c99dcf948de25638696944ce9379
--- /dev/null
+++ b/uni_modules/uts-tencentmap/package.json
@@ -0,0 +1,81 @@
+{
+ "id": "uts-tencentmap",
+ "displayName": "uts-tencentmap",
+ "version": "1.0.0",
+ "description": "uts-tencentmap",
+ "keywords": [
+ "uts-tencentmap"
+],
+ "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
diff --git a/uni_modules/uts-tencentmap/readme.md b/uni_modules/uts-tencentmap/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..8381857af5d332b88e9f3a5459d1044a282212f8
--- /dev/null
+++ b/uni_modules/uts-tencentmap/readme.md
@@ -0,0 +1,5 @@
+# uts-tencentmap
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS 原生插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts/-/tree/dev)
\ No newline at end of file
diff --git a/uni_modules/uts-tencentmap/utssdk/app-android/index.uts b/uni_modules/uts-tencentmap/utssdk/app-android/index.uts
new file mode 100644
index 0000000000000000000000000000000000000000..b469a47711928c8e50e6203731678966cc05d9ca
--- /dev/null
+++ b/uni_modules/uts-tencentmap/utssdk/app-android/index.uts
@@ -0,0 +1,35 @@
+
+import {
+ getUniActivity,
+} from "io.dcloud.uts.android";
+
+import Intent from 'android.content.Intent';
+import Activity from 'android.app.Activity';
+
+class TencentMapActivity extends Activity{
+
+ constructor (){
+ super();
+ }
+
+ override onCreate(savedInstanceState?: Bundle):void {
+ super.onCreate(savedInstanceState)
+ this.setContentView(R.layout.demo_activity);
+
+ let btn_start_service_front = findViewById