From c002798313ab12edbb0b0884f3598c4f8c5d6e3b Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Thu, 11 Jan 2024 15:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20vue2=20web=20=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SDKIntegration/SDKIntegration.vue       | 41 +++++++++++--------
 .../TencentLocation/TencentLocation.vue       |  5 ++-
 pages/SDKIntegration/Toast/Toast.vue          |  3 +-
 pages/SyntaxCase/index.vue                    |  5 ++-
 pages/SyntaxCase/utsAndroid.vue               |  5 ++-
 pages/SyntaxCase/utsiOS.vue                   |  4 +-
 pages/SystemAPI/Alert/alert.uvue              |  2 +
 pages/SystemAPI/Alert/alert.vue               |  2 +
 pages/SystemAPI/ScreenListen/screenlisten.vue |  3 +-
 pages/SystemAPI/SystemAPI.vue                 | 12 ++++--
 pages/index/basicTest.uvue                    |  7 ++--
 pages/index/basicTest.vue                     |  6 ++-
 uni_modules/uts-advance/utssdk/web/index.uts  |  5 +++
 13 files changed, 64 insertions(+), 36 deletions(-)
 create mode 100644 uni_modules/uts-advance/utssdk/web/index.uts

diff --git a/pages/SDKIntegration/SDKIntegration.vue b/pages/SDKIntegration/SDKIntegration.vue
index 4b55e1c..29b9507 100644
--- a/pages/SDKIntegration/SDKIntegration.vue
+++ b/pages/SDKIntegration/SDKIntegration.vue
@@ -11,13 +11,15 @@
     </view>
 </template>
 <script>
-    import {
-        checkHasIntegration
-    } from "@/uni_modules/uts-tencentgeolocation";
-
-    import {
-        checkHasLottieIntegration
-    } from "@/uni_modules/uts-animation-view";
+    // #ifndef H5
+    import {
+        checkHasIntegration
+    } from "@/uni_modules/uts-tencentgeolocation";
+    import {
+        checkHasLottieIntegration
+    } from "@/uni_modules/uts-animation-view";
+    // #endif
+    
 
     export default {
         data() {
@@ -50,17 +52,20 @@
                     url: `/pages/${e.url}`
                 })
             },
-            gotoLottie: function(e) {
-                if (checkHasLottieIntegration()) {
-                    uni.navigateTo({
-                        url: '/pages/SDKIntegration/Lottie/index'
-                    })
-                } else {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '需要在自定义基座中运行'
-                    })
-                }
+            gotoLottie: function(e) {
+              // #ifndef H5
+              if (checkHasLottieIntegration()) {
+                  uni.navigateTo({
+                      url: '/pages/SDKIntegration/Lottie/index'
+                  })
+              } else {
+                  uni.showToast({
+                      icon: 'none',
+                      title: '需要在自定义基座中运行'
+                  })
+              }
+              // #endif
+                
 
             },
             gotoTencentLocation: function(e) {
diff --git a/pages/SDKIntegration/TencentLocation/TencentLocation.vue b/pages/SDKIntegration/TencentLocation/TencentLocation.vue
index 2bfc8b6..30ba5e0 100644
--- a/pages/SDKIntegration/TencentLocation/TencentLocation.vue
+++ b/pages/SDKIntegration/TencentLocation/TencentLocation.vue
@@ -21,7 +21,8 @@
 	</view>
 </template>
 
-<script>
+<script>
+  // #ifndef H5
 	import {
 		checkHasIntegration,
 		requestPremission,
@@ -29,7 +30,7 @@
 		watchPosition,
 		clearWatch
 	} from "@/uni_modules/uts-tencentgeolocation";
-
+  // #endif
 	export default {
 		data() {
 			return {
diff --git a/pages/SDKIntegration/Toast/Toast.vue b/pages/SDKIntegration/Toast/Toast.vue
index 5da4a53..0e0d8f5 100644
--- a/pages/SDKIntegration/Toast/Toast.vue
+++ b/pages/SDKIntegration/Toast/Toast.vue
@@ -16,8 +16,9 @@
 </template>
 
 <script>
+  // #ifdef APP-ANDROID
 	import { showToast } from '@/uni_modules/uts-toast'
-	
+	// #endif
 	
 	export default {
 		
diff --git a/pages/SyntaxCase/index.vue b/pages/SyntaxCase/index.vue
index 2a8689c..88f19b5 100644
--- a/pages/SyntaxCase/index.vue
+++ b/pages/SyntaxCase/index.vue
@@ -49,7 +49,8 @@
         <button @click="testAll">点击测试所有</button>
     </view>
 </template>
-<script>
+<script>
+    // #ifndef H5
     import {
         MAX,
         testSync,
@@ -58,7 +59,7 @@
         Test,
         request,
     } from "../../uni_modules/uts-syntaxcase";
-
+    // #endif
     let test
     let id = 0
     export default {
diff --git a/pages/SyntaxCase/utsAndroid.vue b/pages/SyntaxCase/utsAndroid.vue
index 711baf6..5088284 100644
--- a/pages/SyntaxCase/utsAndroid.vue
+++ b/pages/SyntaxCase/utsAndroid.vue
@@ -1,5 +1,6 @@
 <template>
 	<view>
+    
 		<view class="uni-padding-wrap uni-common-mt">
 			<view class="uni-hello-text">
 				逐一点击执行，观察测试反馈
@@ -39,10 +40,12 @@
 			</view>
 		</view>
 		<button @tap="getDeviceInfoClick">获取设备基础信息</button>
+    
 	</view>
 </template>
 
 <script>
+  // #ifdef APP-ANDROID
 	import {
 		getAppContextTest,
 		getUniActivityTest,
@@ -60,7 +63,7 @@
 		getDeviceInfoTest,
 		privacyStateTest
 	} from '@/uni_modules/uts-platform-api'
-
+  // #endif
 	/**
 	 * 测试在页面生命周期之外，使用api
 	 */
diff --git a/pages/SyntaxCase/utsiOS.vue b/pages/SyntaxCase/utsiOS.vue
index f517f6d..4a4bed8 100644
--- a/pages/SyntaxCase/utsiOS.vue
+++ b/pages/SyntaxCase/utsiOS.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-	
+	// #ifdef APP-IOS
 	import {
 		getCurrentVCTest,
 		getKeyWindowTest,
@@ -45,7 +45,7 @@
 		tepeofTest,
 		dataConvertTest,
 	} from "@/uni_modules/uts-platform-api"
-	
+	// #endif
 	export default {
 		data() {
 			return {
diff --git a/pages/SystemAPI/Alert/alert.uvue b/pages/SystemAPI/Alert/alert.uvue
index c89d62d..c105e64 100644
--- a/pages/SystemAPI/Alert/alert.uvue
+++ b/pages/SystemAPI/Alert/alert.uvue
@@ -10,7 +10,9 @@
 </template>
 
 <script>
+   // #ifdef APP
 	import { showAlert,showPrompt } from '@/uni_modules/uts-alert'
+  // #endif
 	export default {
 		
 		data() {
diff --git a/pages/SystemAPI/Alert/alert.vue b/pages/SystemAPI/Alert/alert.vue
index 2e460b3..b6b2bf9 100644
--- a/pages/SystemAPI/Alert/alert.vue
+++ b/pages/SystemAPI/Alert/alert.vue
@@ -10,7 +10,9 @@
 </template>
 
 <script>
+  // #ifdef APP
 	import { showAlert,showPrompt } from '@/uni_modules/uts-alert'
+  // #endif
 	export default {
 		
 		data() {
diff --git a/pages/SystemAPI/ScreenListen/screenlisten.vue b/pages/SystemAPI/ScreenListen/screenlisten.vue
index a3312fc..61146d7 100644
--- a/pages/SystemAPI/ScreenListen/screenlisten.vue
+++ b/pages/SystemAPI/ScreenListen/screenlisten.vue
@@ -11,11 +11,12 @@
 </template>
 
 <script>
+  // #ifndef H5
 	import {
 		onUserCaptureScreen,
 		offUserCaptureScreen
 	} from "@/uni_modules/uts-screenshot-listener";
-	
+	// #endif
 	export default {
 		data() {
 			return {
diff --git a/pages/SystemAPI/SystemAPI.vue b/pages/SystemAPI/SystemAPI.vue
index 0491232..6399b8f 100644
--- a/pages/SystemAPI/SystemAPI.vue
+++ b/pages/SystemAPI/SystemAPI.vue
@@ -17,8 +17,10 @@
         </view>
     </view>
 </template>·
-<script>
-    import { gotoDemoActivity } from "@/uni_modules/uts-nativepage";
+<script>
+    // #ifdef APP-ANDROID
+    import { gotoDemoActivity } from "@/uni_modules/uts-nativepage";
+    // #endif
     import { getBatteryInfo } from "@/uni_modules/uts-getbatteryinfo";
 
     export default {
@@ -95,14 +97,16 @@
                     }
                 })
             },
-            testGotoDemoActivity() {
+            testGotoDemoActivity() {
+                // #ifdef APP-ANDROID
                 let ret = gotoDemoActivity();
                 if (!ret) {
                     uni.showToast({
                         icon: 'none',
                         title: '需要在自定义基座中运行'
                     })
-                }
+                }
+                // #endif
             }
         }
     }
diff --git a/pages/index/basicTest.uvue b/pages/index/basicTest.uvue
index 8dc97bf..cc750a3 100644
--- a/pages/index/basicTest.uvue
+++ b/pages/index/basicTest.uvue
@@ -19,9 +19,10 @@
   </scroll-view>
   <!-- #endif -->
 </template>
-<script lang="ts">
-import { runTests, Result } from '../../uni_modules/uts-tests'
-
+<script lang="ts">
+// #ifdef APP
+import { runTests, Result } from '../../uni_modules/uts-tests'
+// #endif
 export default {
   data() {
     return {
diff --git a/pages/index/basicTest.vue b/pages/index/basicTest.vue
index 0381a39..ea83f79 100644
--- a/pages/index/basicTest.vue
+++ b/pages/index/basicTest.vue
@@ -16,10 +16,12 @@
         </view>
     </view>
 </template>
-<script>
+<script>
+    // #ifdef APP
     import {
         runTests
-    } from '../../uni_modules/uts-tests'
+    } from '../../uni_modules/uts-tests'
+    // #endif
     export default {
         data() {
             return {
diff --git a/uni_modules/uts-advance/utssdk/web/index.uts b/uni_modules/uts-advance/utssdk/web/index.uts
new file mode 100644
index 0000000..d9e4a70
--- /dev/null
+++ b/uni_modules/uts-advance/utssdk/web/index.uts
@@ -0,0 +1,5 @@
+export function addViewToDecorView() { }
+export function removeViewToDecorView() { }
+export function initAppLifecycle() { }
+export function getLogoPath() {}
+export function playAssetAudio(){}
-- 
GitLab