From 7295937cafcc82173e096f25d6cb989003cf74cf Mon Sep 17 00:00:00 2001 From: duqingquan Date: Sat, 12 Oct 2024 12:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5dev=20?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=88=B0alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 15 - index.html | 2 +- nativeResources/android/google-services.json | 1 + package.json | 2 +- pages.json | 11 +- pages/SyntaxCase/MixNativeCode.uvue | 17 +- pages/SyntaxCase/MixNativeCode.vue | 16 +- pages/SyntaxCase/defaultValueTest.vue | 65 +++ pages/SyntaxCase/index.uvue | 17 +- pages/SyntaxCase/instanceTest.vue | 36 +- pages/SystemAPI/SystemAPI.uvue | 20 +- pages/advance/advance.vue | 13 +- pages/component/helloView.nvue | 4 +- pages/component/helloView.uvue | 5 +- pages/index/basicTest.test.js | 37 +- pages/index/basicTest.uvue | 159 +------ pages/index/basicTest.vue | 163 +------ pages/index/index.uvue | 34 +- pages/index/index.vue | 17 +- .../uts-advance/utssdk/app-android/index.uts | 5 +- uni_modules/uts-helloworld/utssdk/index.uts | 21 +- .../utssdk/app-android/NativeLib.kt | 18 + .../utssdk/app-android/index.uts | 64 ++- .../libs/arm64-v8a/libnativelib.so | Bin 0 -> 218960 bytes .../libs/armeabi-v7a/libnativelib.so | Bin 0 -> 109548 bytes .../app-android/libs/x86/libnativelib.so | Bin 0 -> 198048 bytes .../app-android/libs/x86_64/libnativelib.so | Bin 0 -> 223160 bytes .../utssdk/app-android/kotlinCode.kt | 43 +- .../uts-syntaxcase/utssdk/app-ios/config.json | 2 +- uni_modules/uts-syntaxcase/utssdk/index.uts | 224 ++++++++-- uni_modules/uts-tests/utssdk/Array.uts | 3 - uni_modules/uts-tests/utssdk/ArrayBuffer.uts | 4 +- uni_modules/uts-tests/utssdk/Global.uts | 6 +- uni_modules/uts-tests/utssdk/JSON.uts | 65 ++- uni_modules/uts-tests/utssdk/JSON_large.uts | 33 +- uni_modules/uts-tests/utssdk/KeyWord.uts | 4 +- uni_modules/uts-tests/utssdk/Math.uts | 12 +- uni_modules/uts-tests/utssdk/Number.uts | 95 +++- uni_modules/uts-tests/utssdk/Promise.uts | 422 ++++++++++++++++++ .../uts-tests/utssdk/UTSJSONObject.uts | 155 +++++-- uni_modules/uts-tests/utssdk/console.uts | 4 +- uni_modules/uts-tests/utssdk/data.uts | 6 + uni_modules/uts-tests/utssdk/index.uts | 115 +---- uni_modules/uts-tests/utssdk/tests.uts | 21 +- 44 files changed, 1325 insertions(+), 631 deletions(-) create mode 100644 nativeResources/android/google-services.json create mode 100644 pages/SyntaxCase/defaultValueTest.vue create mode 100644 uni_modules/uts-nativepage/utssdk/app-android/NativeLib.kt create mode 100644 uni_modules/uts-nativepage/utssdk/app-android/libs/arm64-v8a/libnativelib.so create mode 100644 uni_modules/uts-nativepage/utssdk/app-android/libs/armeabi-v7a/libnativelib.so create mode 100644 uni_modules/uts-nativepage/utssdk/app-android/libs/x86/libnativelib.so create mode 100644 uni_modules/uts-nativepage/utssdk/app-android/libs/x86_64/libnativelib.so create mode 100644 uni_modules/uts-tests/utssdk/Promise.uts create mode 100644 uni_modules/uts-tests/utssdk/data.uts diff --git a/changelog.md b/changelog.md index ff7d11a..06890fa 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 c3ff205..68275be 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 0000000..efd261b --- /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 d8e7dbd..a475669 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 d2c1451..a6c8e53 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 5f43504..755d233 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 e3322db..8d16dba 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 07c115e..7997790 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 a331d37..1fe277c 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 e5fbc48..da135aa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -6,12 +6,13 @@ +