diff --git a/changelog.md b/changelog.md index f01ba2882d8952d6c9657f05166f684450d82d9e..633a7924683dfdd99ea0dfdbd4bd81fa9e32b87c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,23 +1,20 @@ -## 1.1.10 -* update 4.29.2024093009 +## 1.0.29 +* update 4.36.2024112612-alpha -## 1.1.9 -* update 4.28.2024092502 +## 1.0.28 +* update 4.35.2024112402-alpha -## 1.0.23 -* update 4.28.2024092105-alpha +## 1.0.27 +* update 4.34.2024112020-alpha -## 1.0.22 -* update 4.27.2024091308-alpha +## 1.0.26 +* update 4.33.2024111702-alpha -## 1.0.21 -* update 4.26.2024082213-alpha +## 1.0.25 +* update 4.32.2024110103-alpha -## 1.0.20 -* update 4.25.2024081703-alpha - -## 1.0.19 -* update 4.23.2024070309-alpha +## 1.0.24 +* update 4.31.2024102414-alpha ## 1.0.17 * update 4.22.2024062415-alpha diff --git a/index.html b/index.html index c3ff205f658fda3bafb49b1b8d13a02d0093b954..68275bef2492e0548e458733d42801a8bee4b619 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,6 @@
- + diff --git a/nativeResources/android/google-services.json b/nativeResources/android/google-services.json new file mode 100644 index 0000000000000000000000000000000000000000..efd261bf79519c997d1c2ac4154798d551f022dd --- /dev/null +++ b/nativeResources/android/google-services.json @@ -0,0 +1 @@ +demo \ No newline at end of file diff --git a/package.json b/package.json index 847c2f416fe708170da2f828e7fe9a3a79d9a0dc..6402ecbf79fe5d5a7f7455f63499c0c0a3ac735c 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "id": "hello-uts", - "name": "hello-uts", - "displayName": "hello-uts", - "version": "1.1.10", + "id": "hello-uts-alpha", + "name": "hello-uts-alpha", + "displayName": "hello-uts-alpha", + "version": "1.0.29", "description": "UTS插件示例项目", "repository": "https://gitcode.net/dcloud/hello-uts", "keywords": [ diff --git a/pages.json b/pages.json index d2c14511549dccdb821c5e510d327b545b893adb..a6c8e53faca0d32767479bc2efbee214e6a479a5 100644 --- a/pages.json +++ b/pages.json @@ -164,10 +164,17 @@ "enablePullDownRefresh": false } - } + }, + // { + // "path": "pages/SyntaxCase/defaultValueTest", + // "style": { + // "navigationBarTitleText": "", + // "enablePullDownRefresh": false + // } + // }, + // #endif // #ifdef APP - , { "path": "pages/SyntaxCase/utsAndroid", "style": { diff --git a/pages/SyntaxCase/MixNativeCode.uvue b/pages/SyntaxCase/MixNativeCode.uvue index 5f43504912ca2bed69637781a96117a4ffa38dc3..755d2334c2633de6b63518cd06d129d7ae0f0b29 100644 --- a/pages/SyntaxCase/MixNativeCode.uvue +++ b/pages/SyntaxCase/MixNativeCode.uvue @@ -5,19 +5,24 @@ // #ifdef APP-ANDROID && UNI-APP-X + + + + {{memInfo}} // #endif + + diff --git a/pages/SyntaxCase/index.uvue b/pages/SyntaxCase/index.uvue index e3322dbee6764b3658ff5af35ac07a9108cf85e6..8857a339149a6a092139c0916a9923bea3cda3ef 100644 --- a/pages/SyntaxCase/index.uvue +++ b/pages/SyntaxCase/index.uvue @@ -52,8 +52,12 @@ 测试complete：{{ format(testUtsClassInstanceResult['complete']) }} 测试callback：{{ format(testUtsClassInstanceResult['callback']) }} - 测试setter：{{ format(testUtsClassSetterResult) }} - + 测试setter：{{ format(testUtsClassSetterResult) }} + 测试promise返回值：{{ format(testUtsReturnPromiseResult) }} + + + + @@ -71,8 +75,14 @@ testAsyncParam3, Test, request, - SetterTest, + SetterTest, + PromiseReturnDemo, } from "../../uni_modules/uts-syntaxcase"; + // #endif + // #ifdef APP-IOS + import { + testPromiseStaticMethod + } from "@/uni_modules/uts-syntaxcase" // #endif let test:Test|null = null let id = 0 @@ -135,7 +145,8 @@ complete: null, callback: null }, - testUtsClassSetterResult: null, + testUtsClassSetterResult: null, + testUtsReturnPromiseResult: null, } }, methods: { @@ -161,7 +172,8 @@ this.testUtsClassSyncWithCallback(); this.testUtsClassAsync(); this.testUtsClassInstance(); - this.testUtsClassSetter(); + this.testUtsClassSetter(); + this.testUtsReturnPromise(); }, testUtsSync() { this.testUtsSyncResult = false; @@ -441,7 +453,26 @@ } catch (e) { console.error("testUtsClassSetter", e); } - }, + }, + + testUtsReturnPromise() { + this.testUtsReturnPromiseResult = false; + try { + let demo = new PromiseReturnDemo(); + demo.test1(); + demo.test2(); + if (demo.recordRet == 2) { + this.testUtsReturnPromiseResult = true; + } + } catch (e) { + console.error("testUtsClassSetter", e); + } + }, + // #ifdef APP-IOS + testPromiseStaticMethod() { + testPromiseStaticMethod() + } + // #endif } } \ No newline at end of file diff --git a/pages/SyntaxCase/index.vue b/pages/SyntaxCase/index.vue index 19404648542fe84742d75e31f5003a62832ab72b..f3aa5b083aa76647dba541500446cee715e96407 100644 --- a/pages/SyntaxCase/index.vue +++ b/pages/SyntaxCase/index.vue @@ -51,7 +51,8 @@ 测试complete：{{ format(testUtsClassInstanceResult.complete) }} 测试callback：{{ format(testUtsClassInstanceResult.callback) }} - 测试setter：{{ format(testUtsClassSetterResult) }} + 测试setter：{{ format(testUtsClassSetterResult) }} + 测试promise返回值：{{ format(testUtsReturnPromiseResult) }} @@ -65,7 +66,8 @@ testAsyncParam3, Test, request, - SetterTest, + SetterTest, + PromiseReturnDemo, } from "../../uni_modules/uts-syntaxcase"; // #endif let test @@ -129,7 +131,8 @@ complete: null, callback: null }, - testUtsClassSetterResult: null, + testUtsClassSetterResult: null, + testUtsReturnPromiseResult: null, } }, methods: { @@ -149,7 +152,8 @@ this.testUtsClassSyncWithCallback(); this.testUtsClassAsync(); this.testUtsClassInstance(); - this.testUtsClassSetter(); + this.testUtsClassSetter(); + this.testUtsReturnPromise(); }, testUtsSync() { this.testUtsSyncResult = false; @@ -422,6 +426,20 @@ } catch (e) { console.error("testUtsClassSetter", e); } + + }, + testUtsReturnPromise() { + this.testUtsReturnPromiseResult = false; + try { + let demo = new PromiseReturnDemo(); + demo.test1(); + demo.test2(); + if (demo.recordRet == 2) { + this.testUtsReturnPromiseResult = true; + } + } catch (e) { + console.error("testUtsClassSetter", e); + } }, } } diff --git a/pages/SyntaxCase/instanceTest.vue b/pages/SyntaxCase/instanceTest.vue index 07c115e61bde222122ace9e97cbec9c1876d83e2..7997790e9f03eae66aa2744ec8715fdb2e8a75c9 100644 --- a/pages/SyntaxCase/instanceTest.vue +++ b/pages/SyntaxCase/instanceTest.vue @@ -2,6 +2,7 @@
{{ret}} +
@@ -11,7 +12,12 @@ User } from '@/uni_modules/uts-advance' - + import { + Scan, + Scan1, + Scan2, + myClass + } from "@/uni_modules/uts-syntaxcase"; export default { data() { @@ -21,6 +27,34 @@ }, methods: { + defaultValueTest() { + const myClassInit = new myClass(); + // 默认值测试 + if(Scan() != 60000){ + this.ret = "测试失败1" + } + if(Scan(100) != 100){ + this.ret = "测试失败2" + } + if(Scan1() != null){ + this.ret = "测试失败3" + } + if(Scan1(100) != 100){ + this.ret = "测试失败4" + } + let ret5 = Scan2() + if(ret5 != "null"){ + console.log(ret5) + this.ret = "测试失败5" + } + if(Scan2(100) != 100){ + this.ret = "测试失败6" + } + if(myClassInit.to('123') != 123){ + this.ret = "测试失败7" + } + }, + instanceCreate() { const user1 = new User("张三", 20); diff --git a/pages/SystemAPI/SystemAPI.uvue b/pages/SystemAPI/SystemAPI.uvue index a331d379fe12182fc7847800363b04c4ddf404d9..1fe277c8d4658aafa42b97fc7c671465eda56147 100644 --- a/pages/SystemAPI/SystemAPI.uvue +++ b/pages/SystemAPI/SystemAPI.uvue @@ -18,7 +18,7 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index e5fbc488a35a8d274a124ba0e28c8702dbcef903..da135aa1266da2bd13c7ffff3424787c22b88b01 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -6,12 +6,13 @@ +