From 0b467edf130823a41cdbd2846d0938bc80f9a877 Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Wed, 4 Sep 2024 18:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=AC=A1=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E7=A4=BA=E4=BE=8B=20&=E9=83=A8=E5=88=86=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=A4=BA=E4=BE=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.uvue                      | 34 ++++++++++++++-------
 pages/index/index.vue                       | 17 +++++++++--
 uni_modules/uts-helloworld/utssdk/index.uts | 21 ++++++++++++-
 uni_modules/uts-tests/utssdk/Math.uts       | 12 ++++----
 4 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/pages/index/index.uvue b/pages/index/index.uvue
index e874807..7d84da4 100644
--- a/pages/index/index.uvue
+++ b/pages/index/index.uvue
@@ -6,12 +6,13 @@
             <button type="primary" @tap="testDoSthWithCallback">uts异步方法（无参数）</button>
             <button type="primary" @tap="testDoSthWithString">uts异步方法（字符串参数）</button>
             <button type="primary" @tap="testDoSthWithJSON">uts异步方法（json参数）</button>
-			<button type="primary"  @tap="testBuildinObject">内置对象语法测试</button>
+            <button type="primary"  @tap="testCallback">多次回调示例</button>
+            <button type="primary"  @tap="testBuildinObject">内置对象语法测试</button>
         </view>
     </view>
 </template>
 <script>
-    import { callWithJSONParam, callWithStringParam, callWithoutParam, JsonParamOptions, inputJSON } from "../../uni_modules/uts-helloworld";
+    import { callWithJSONParam, callWithStringParam, callWithoutParam, JsonParamOptions, inputJSON ,onCallback} from "../../uni_modules/uts-helloworld";
 
     export default {
         data() {
@@ -72,15 +73,26 @@
                     }
                 } as JsonParamOptions);
             },
-			/**
-			 * 测试内置对象
-			 */
-			testBuildinObject: function() {
-				uni.navigateTo({
-				    url: `/pages/index/basicTest`
-				})
-			}
-
+            testCallback: function () {
+            	
+            	onCallback(
+            		function(response){
+            			uni.showToast({
+            				title:'uts插件uts-helloworld的callWithStringParam方法收到了你输入的字符串：'+response,
+            				icon:'none'
+            			});
+            		},
+            	);
+            },
+            /**
+             * 测试内置对象
+             */
+            testBuildinObject: function() {
+              uni.navigateTo({
+                  url: `/pages/index/basicTest`
+              })
+            }
+        
         }
     }
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e5fbc48..da135aa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,12 +6,13 @@
 				<button type="primary"  @tap="testDoSthWithCallback">uts异步方法（无参数）</button>
 				<button type="primary"  @tap="testDoSthWithString">uts异步方法（字符串参数）</button>
 				<button type="primary"  @tap="testDoSthWithJSON">uts异步方法（json参数）</button>
+        <button type="primary"  @tap="testCallback">多次回调示例</button>
 				<button type="primary"  @tap="testBuildinObject">内置对象语法测试</button>
 			</view>
 	</view>
 </template>
 <script>
-	import { callWithJSONParam, callWithStringParam, callWithoutParam } from "../../uni_modules/uts-helloworld";
+	import { callWithJSONParam, callWithStringParam, callWithoutParam,onCallback } from "../../uni_modules/uts-helloworld";
 	
 	export default {
 		data() {
@@ -46,7 +47,7 @@
 					this.stringParam,
 					function(response){
 						uni.showToast({
-							title:'uts插件uts-helloworld的callWithStringParam方法收到了你输入的字符串：'+response,
+							title:'uts插件uts-helloworld的onCallback方法：'+response,
 							icon:'none'
 						});
 					},
@@ -71,6 +72,18 @@
 					}
 				});
 			},
+      
+      testCallback: function () {
+				
+				onCallback(
+					function(response){
+						uni.showToast({
+							title:'uts插件uts-helloworld的callWithStringParam方法收到了你输入的字符串：'+response,
+							icon:'none'
+						});
+					},
+				);
+			},
 			/**
 			 * 测试内置对象
 			 */
diff --git a/uni_modules/uts-helloworld/utssdk/index.uts b/uni_modules/uts-helloworld/utssdk/index.uts
index dbd5266..33851b0 100644
--- a/uni_modules/uts-helloworld/utssdk/index.uts
+++ b/uni_modules/uts-helloworld/utssdk/index.uts
@@ -42,4 +42,23 @@ export function callWithJSONParam(opts: JsonParamOptions) {
 }
 
 
-
+/**
+ * 导出多次回调UTS函数
+ * @param opts
+ */
+export function onCallback(callback: (sth:string) => void) {
+  /**
+   * 模拟多次回调
+   */
+  let count = 1
+  let taskId = -1
+  taskId = setInterval(function() {
+    callback("第" + count + "次回调")
+    count++;
+	console.log("count",count)
+	if(count > 3){
+		clearInterval(taskId)
+	}
+  }, 500);
+	
+}
diff --git a/uni_modules/uts-tests/utssdk/Math.uts b/uni_modules/uts-tests/utssdk/Math.uts
index 10418ad..7a17d98 100644
--- a/uni_modules/uts-tests/utssdk/Math.uts
+++ b/uni_modules/uts-tests/utssdk/Math.uts
@@ -63,18 +63,18 @@ export function testMath(): Result {
             expect(Math.acos(-1)).toEqual(3.141592653589793);
             expect(Math.acos(0)).toEqual(1.5707963267948966);
             // 解决精度问题
-            expect(Math.acos(1)).toEqual(0.0);
+            expect(Math.acos(1)).toEqual(0);
         })
         test('acosh', () => {
             // 解决精度问题
-            expect(Math.acosh(1)).toEqual(0.0);
+            expect(Math.acosh(1)).toEqual(0);
 			expectNumber(Math.acosh(2)).toEqualDouble(1.3169578969248166);
             expectNumber(Math.acosh(2.5)).toEqualDouble(1.566799236972411);
         })
         test('asin', () => {
             expect(Math.asin(-1)).toEqual(-1.5707963267948966);
             // 解决精度问题
-            expect(Math.asin(0)).toEqual(0.0);
+            expect(Math.asin(0)).toEqual(0);
             // expect(Math.asin(0.5)).toEqual(0.5235987755982989);
             expect(Math.asin(1)).toEqual(1.5707963267948966);
         })
@@ -87,16 +87,16 @@ export function testMath(): Result {
         test('atan', () => {
             expect(Math.atan(1)).toEqual(0.7853981633974483);
             // 解决精度问题
-            expect(Math.atan(0)).toEqual(0.0);
+            expect(Math.atan(0)).toEqual(0);
         })
         test('atan2', () => {
             expect(Math.atan2(90, 15)).toEqual(1.4056476493802699);
-            expect(Math.atan2(15, 90)).toEqual(0.16514867741462683);
+            expectNumber(Math.atan2(15, 90)).toEqualDouble(0.16514867741462683);
         })
       
         test('atanh', () => {
             // 解决精度问题
-            expect(Math.atanh(0)).toEqual(0.0);
+            expect(Math.atanh(0)).toEqual(0);
             // expect(Math.atanh(0.5)).toEqual(0.5493061443340548);
         })
         test('cbrt', () => {
-- 
GitLab