diff --git a/changelog.md b/changelog.md index ff7d11a227e3cc7304c3f6848c79cdb318110fbe..06890faa7409a516e4ee6c3052a667fd01317245 100644 --- a/changelog.md +++ b/changelog.md @@ -1,18 +1,3 @@ -## 1.0.23 -* update 4.28.2024092105-alpha - -## 1.0.22 -* update 4.27.2024091308-alpha - -## 1.0.21 -* update 4.26.2024082213-alpha - -## 1.0.20 -* update 4.25.2024081703-alpha - -## 1.0.19 -* update 4.23.2024070309-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 d8e7dbd00465c2462363c53249812411037a0700..a475669133718f2f4b94345d70fb3f5368c6da71 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "id": "hello-uts-alpha", "name": "hello-uts-alpha", "displayName": "hello-uts-alpha", - "version": "1.0.23", + "version": "1.0.18", "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..8d16dba3931955677ebc26df98b09e4e1dfe91e8 100644 --- a/pages/SyntaxCase/index.uvue +++ b/pages/SyntaxCase/index.uvue @@ -53,7 +53,10 @@ 测试callback：{{ format(testUtsClassInstanceResult['callback']) }} 测试setter：{{ format(testUtsClassSetterResult) }} - + + + + @@ -73,6 +76,11 @@ request, SetterTest, } 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 @@ -441,7 +449,12 @@ } catch (e) { console.error("testUtsClassSetter", e); } - }, + }, + // #ifdef APP-IOS + testPromiseStaticMethod() { + testPromiseStaticMethod() + } + // #endif } } \ No newline at end of file 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 @@ +