From c15750f0a341fa428329fb954becf6fbe72fb619 Mon Sep 17 00:00:00 2001 From: TxZgX Date: Sat, 25 Dec 2021 22:15:40 +0800 Subject: [PATCH] fix --- {MyApplication2 => MyApplication1}/.gitignore | 0 .../.idea/.gitignore | 0 .../.idea/compiler.xml | 0 .../.idea/gradle.xml | 0 .../inspectionProfiles/Project_Default.xml | 0 .../.idea/jarRepositories.xml | 0 .../.idea/misc.xml | 0 .../phone/phoneSettingConfig_MateX2.json | 0 .../phone/phoneSettingConfig_P40.json | 0 .../.idea/previewer/previewConfigV2.json | 0 .../tabletSettingConfig_MatePadPro.json | 0 .../previewer/tv/tvSettingConfig_TV.json | 0 .../wearableSettingConfig_Watch3.json | 0 .../10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 | 0 .../15c2c2374b51ddda965f123d7721b78051be2c9f | 0 .../36d48c2c0aa8cb6b91428b9d2d791dcae782d636 | 0 .../3bb84a6effd773d95ed647597ffe3ad387fdfbcf | 0 .../432f7b86a9ef0116a552dc8dd8867c619cd9f198 | 0 .../53c2f15f1da3e1de172f90feee9cf4143c3029f0 | 0 .../6288971498872deb62c5e285d192d813e22b1c1c | 0 .../b4c4e536f4084a0b6a45f8b0d2725567135b92e6 | 0 .../bded84c8d7c3dc43c805144b684b7e76d317f963 | 0 .../e76da2df200fc79b254b005f068d568bf8c2b7ec | 0 .../eb4272ef57a8e412e241acf56c46fd3c2ccd3848 | 0 .../.idea/sonarlint/issuestore/index.pb | 0 .../.idea/vcs.xml | 0 MyApplication1/agconnect-services.json | 37 ++++++++++++++++++ .../build.gradle | 6 +-- .../entry/.gitignore | 0 .../entry/build.gradle | 4 +- .../entry/package.json | 0 .../entry/proguard-rules.pro | 0 .../entry/src/main/config.json | 8 ++-- .../xcl20481/myapplication/MainAbility.java | 0 .../xcl20481/myapplication/MyApplication.java | 0 .../entry/src/main/js/default/app.js | 0 .../js/default/common/images/Wallpaper.png | Bin .../main/js/default/common/images/bg-tv.jpg | Bin .../entry/src/main/js/default/i18n/en-US.json | 0 .../entry/src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../src/main/js/default/pages/page0/page0.css | 0 .../src/main/js/default/pages/page0/page0.hml | 0 .../src/main/js/default/pages/page0/page0.js | 0 .../main/resources/base/element/string.json | 0 .../src/main/resources/base/media/icon.png | Bin .../src/main/resources/base/media/icon2.jpg | Bin .../myapplication/ExampleOhosTest.java | 0 .../entry/src/ohosTest/js/default/app.js | 0 .../src/ohosTest/js/default/i18n/en-US.json | 0 .../src/ohosTest/js/default/i18n/zh-CN.json | 0 .../ohosTest/js/default/pages/index/index.css | 0 .../ohosTest/js/default/pages/index/index.hml | 0 .../ohosTest/js/default/pages/index/index.js | 0 .../ohosTest/js/test/ExampleJsunit.test.js | 0 .../entry/src/ohosTest/js/test/List.test.js | 0 .../resources/base/element/string.json | 0 .../ohosTest/resources/base/media/icon.png | Bin .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {MyApplication2 => MyApplication1}/gradlew | 0 .../gradlew.bat | 0 .../package.json | 0 .../settings.gradle | 0 67 files changed, 46 insertions(+), 9 deletions(-) rename {MyApplication2 => MyApplication1}/.gitignore (100%) rename {MyApplication2 => MyApplication1}/.idea/.gitignore (100%) rename {MyApplication2 => MyApplication1}/.idea/compiler.xml (100%) rename {MyApplication2 => MyApplication1}/.idea/gradle.xml (100%) rename {MyApplication2 => MyApplication1}/.idea/inspectionProfiles/Project_Default.xml (100%) rename {MyApplication2 => MyApplication1}/.idea/jarRepositories.xml (100%) rename {MyApplication2 => MyApplication1}/.idea/misc.xml (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/phone/phoneSettingConfig_MateX2.json (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/phone/phoneSettingConfig_P40.json (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/previewConfigV2.json (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/tablet/tabletSettingConfig_MatePadPro.json (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/tv/tvSettingConfig_TV.json (100%) rename {MyApplication2 => MyApplication1}/.idea/previewer/wearable/wearableSettingConfig_Watch3.json (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/1/0/10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/1/5/15c2c2374b51ddda965f123d7721b78051be2c9f (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/3/b/3bb84a6effd773d95ed647597ffe3ad387fdfbcf (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/4/3/432f7b86a9ef0116a552dc8dd8867c619cd9f198 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/5/3/53c2f15f1da3e1de172f90feee9cf4143c3029f0 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/6/2/6288971498872deb62c5e285d192d813e22b1c1c (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/b/4/b4c4e536f4084a0b6a45f8b0d2725567135b92e6 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/b/d/bded84c8d7c3dc43c805144b684b7e76d317f963 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/e/7/e76da2df200fc79b254b005f068d568bf8c2b7ec (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/e/b/eb4272ef57a8e412e241acf56c46fd3c2ccd3848 (100%) rename {MyApplication2 => MyApplication1}/.idea/sonarlint/issuestore/index.pb (100%) rename {MyApplication2 => MyApplication1}/.idea/vcs.xml (100%) create mode 100644 MyApplication1/agconnect-services.json rename {MyApplication2 => MyApplication1}/build.gradle (84%) rename {MyApplication2 => MyApplication1}/entry/.gitignore (100%) rename {MyApplication2 => MyApplication1}/entry/build.gradle (84%) rename {MyApplication2 => MyApplication1}/entry/package.json (100%) rename {MyApplication2 => MyApplication1}/entry/proguard-rules.pro (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/config.json (92%) rename {MyApplication2 => MyApplication1}/entry/src/main/java/com/xcl20481/myapplication/MainAbility.java (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/java/com/xcl20481/myapplication/MyApplication.java (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/app.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/common/images/Wallpaper.png (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/common/images/bg-tv.jpg (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/i18n/en-US.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/i18n/zh-CN.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/index/index.css (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/index/index.hml (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/index/index.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/page0/page0.css (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/page0/page0.hml (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/js/default/pages/page0/page0.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/resources/base/element/string.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/resources/base/media/icon.png (100%) rename {MyApplication2 => MyApplication1}/entry/src/main/resources/base/media/icon2.jpg (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/java/com/xcl20481/myapplication/ExampleOhosTest.java (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/app.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/i18n/en-US.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/i18n/zh-CN.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/pages/index/index.css (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/pages/index/index.hml (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/default/pages/index/index.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/test/ExampleJsunit.test.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/js/test/List.test.js (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/resources/base/element/string.json (100%) rename {MyApplication2 => MyApplication1}/entry/src/ohosTest/resources/base/media/icon.png (100%) rename {MyApplication2 => MyApplication1}/gradle.properties (100%) rename {MyApplication2 => MyApplication1}/gradle/wrapper/gradle-wrapper.jar (100%) rename {MyApplication2 => MyApplication1}/gradle/wrapper/gradle-wrapper.properties (100%) rename {MyApplication2 => MyApplication1}/gradlew (100%) rename {MyApplication2 => MyApplication1}/gradlew.bat (100%) rename {MyApplication2 => MyApplication1}/package.json (100%) rename {MyApplication2 => MyApplication1}/settings.gradle (100%) diff --git a/MyApplication2/.gitignore b/MyApplication1/.gitignore similarity index 100% rename from MyApplication2/.gitignore rename to MyApplication1/.gitignore diff --git a/MyApplication2/.idea/.gitignore b/MyApplication1/.idea/.gitignore similarity index 100% rename from MyApplication2/.idea/.gitignore rename to MyApplication1/.idea/.gitignore diff --git a/MyApplication2/.idea/compiler.xml b/MyApplication1/.idea/compiler.xml similarity index 100% rename from MyApplication2/.idea/compiler.xml rename to MyApplication1/.idea/compiler.xml diff --git a/MyApplication2/.idea/gradle.xml b/MyApplication1/.idea/gradle.xml similarity index 100% rename from MyApplication2/.idea/gradle.xml rename to MyApplication1/.idea/gradle.xml diff --git a/MyApplication2/.idea/inspectionProfiles/Project_Default.xml b/MyApplication1/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from MyApplication2/.idea/inspectionProfiles/Project_Default.xml rename to MyApplication1/.idea/inspectionProfiles/Project_Default.xml diff --git a/MyApplication2/.idea/jarRepositories.xml b/MyApplication1/.idea/jarRepositories.xml similarity index 100% rename from MyApplication2/.idea/jarRepositories.xml rename to MyApplication1/.idea/jarRepositories.xml diff --git a/MyApplication2/.idea/misc.xml b/MyApplication1/.idea/misc.xml similarity index 100% rename from MyApplication2/.idea/misc.xml rename to MyApplication1/.idea/misc.xml diff --git a/MyApplication2/.idea/previewer/phone/phoneSettingConfig_MateX2.json b/MyApplication1/.idea/previewer/phone/phoneSettingConfig_MateX2.json similarity index 100% rename from MyApplication2/.idea/previewer/phone/phoneSettingConfig_MateX2.json rename to MyApplication1/.idea/previewer/phone/phoneSettingConfig_MateX2.json diff --git a/MyApplication2/.idea/previewer/phone/phoneSettingConfig_P40.json b/MyApplication1/.idea/previewer/phone/phoneSettingConfig_P40.json similarity index 100% rename from MyApplication2/.idea/previewer/phone/phoneSettingConfig_P40.json rename to MyApplication1/.idea/previewer/phone/phoneSettingConfig_P40.json diff --git a/MyApplication2/.idea/previewer/previewConfigV2.json b/MyApplication1/.idea/previewer/previewConfigV2.json similarity index 100% rename from MyApplication2/.idea/previewer/previewConfigV2.json rename to MyApplication1/.idea/previewer/previewConfigV2.json diff --git a/MyApplication2/.idea/previewer/tablet/tabletSettingConfig_MatePadPro.json b/MyApplication1/.idea/previewer/tablet/tabletSettingConfig_MatePadPro.json similarity index 100% rename from MyApplication2/.idea/previewer/tablet/tabletSettingConfig_MatePadPro.json rename to MyApplication1/.idea/previewer/tablet/tabletSettingConfig_MatePadPro.json diff --git a/MyApplication2/.idea/previewer/tv/tvSettingConfig_TV.json b/MyApplication1/.idea/previewer/tv/tvSettingConfig_TV.json similarity index 100% rename from MyApplication2/.idea/previewer/tv/tvSettingConfig_TV.json rename to MyApplication1/.idea/previewer/tv/tvSettingConfig_TV.json diff --git a/MyApplication2/.idea/previewer/wearable/wearableSettingConfig_Watch3.json b/MyApplication1/.idea/previewer/wearable/wearableSettingConfig_Watch3.json similarity index 100% rename from MyApplication2/.idea/previewer/wearable/wearableSettingConfig_Watch3.json rename to MyApplication1/.idea/previewer/wearable/wearableSettingConfig_Watch3.json diff --git a/MyApplication2/.idea/sonarlint/issuestore/1/0/10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 b/MyApplication1/.idea/sonarlint/issuestore/1/0/10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/1/0/10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 rename to MyApplication1/.idea/sonarlint/issuestore/1/0/10f965cf51fe14a5ef0ca2ebefb1bd7e4607eeb2 diff --git a/MyApplication2/.idea/sonarlint/issuestore/1/5/15c2c2374b51ddda965f123d7721b78051be2c9f b/MyApplication1/.idea/sonarlint/issuestore/1/5/15c2c2374b51ddda965f123d7721b78051be2c9f similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/1/5/15c2c2374b51ddda965f123d7721b78051be2c9f rename to MyApplication1/.idea/sonarlint/issuestore/1/5/15c2c2374b51ddda965f123d7721b78051be2c9f diff --git a/MyApplication2/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636 b/MyApplication1/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636 rename to MyApplication1/.idea/sonarlint/issuestore/3/6/36d48c2c0aa8cb6b91428b9d2d791dcae782d636 diff --git a/MyApplication2/.idea/sonarlint/issuestore/3/b/3bb84a6effd773d95ed647597ffe3ad387fdfbcf b/MyApplication1/.idea/sonarlint/issuestore/3/b/3bb84a6effd773d95ed647597ffe3ad387fdfbcf similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/3/b/3bb84a6effd773d95ed647597ffe3ad387fdfbcf rename to MyApplication1/.idea/sonarlint/issuestore/3/b/3bb84a6effd773d95ed647597ffe3ad387fdfbcf diff --git a/MyApplication2/.idea/sonarlint/issuestore/4/3/432f7b86a9ef0116a552dc8dd8867c619cd9f198 b/MyApplication1/.idea/sonarlint/issuestore/4/3/432f7b86a9ef0116a552dc8dd8867c619cd9f198 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/4/3/432f7b86a9ef0116a552dc8dd8867c619cd9f198 rename to MyApplication1/.idea/sonarlint/issuestore/4/3/432f7b86a9ef0116a552dc8dd8867c619cd9f198 diff --git a/MyApplication2/.idea/sonarlint/issuestore/5/3/53c2f15f1da3e1de172f90feee9cf4143c3029f0 b/MyApplication1/.idea/sonarlint/issuestore/5/3/53c2f15f1da3e1de172f90feee9cf4143c3029f0 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/5/3/53c2f15f1da3e1de172f90feee9cf4143c3029f0 rename to MyApplication1/.idea/sonarlint/issuestore/5/3/53c2f15f1da3e1de172f90feee9cf4143c3029f0 diff --git a/MyApplication2/.idea/sonarlint/issuestore/6/2/6288971498872deb62c5e285d192d813e22b1c1c b/MyApplication1/.idea/sonarlint/issuestore/6/2/6288971498872deb62c5e285d192d813e22b1c1c similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/6/2/6288971498872deb62c5e285d192d813e22b1c1c rename to MyApplication1/.idea/sonarlint/issuestore/6/2/6288971498872deb62c5e285d192d813e22b1c1c diff --git a/MyApplication2/.idea/sonarlint/issuestore/b/4/b4c4e536f4084a0b6a45f8b0d2725567135b92e6 b/MyApplication1/.idea/sonarlint/issuestore/b/4/b4c4e536f4084a0b6a45f8b0d2725567135b92e6 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/b/4/b4c4e536f4084a0b6a45f8b0d2725567135b92e6 rename to MyApplication1/.idea/sonarlint/issuestore/b/4/b4c4e536f4084a0b6a45f8b0d2725567135b92e6 diff --git a/MyApplication2/.idea/sonarlint/issuestore/b/d/bded84c8d7c3dc43c805144b684b7e76d317f963 b/MyApplication1/.idea/sonarlint/issuestore/b/d/bded84c8d7c3dc43c805144b684b7e76d317f963 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/b/d/bded84c8d7c3dc43c805144b684b7e76d317f963 rename to MyApplication1/.idea/sonarlint/issuestore/b/d/bded84c8d7c3dc43c805144b684b7e76d317f963 diff --git a/MyApplication2/.idea/sonarlint/issuestore/e/7/e76da2df200fc79b254b005f068d568bf8c2b7ec b/MyApplication1/.idea/sonarlint/issuestore/e/7/e76da2df200fc79b254b005f068d568bf8c2b7ec similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/e/7/e76da2df200fc79b254b005f068d568bf8c2b7ec rename to MyApplication1/.idea/sonarlint/issuestore/e/7/e76da2df200fc79b254b005f068d568bf8c2b7ec diff --git a/MyApplication2/.idea/sonarlint/issuestore/e/b/eb4272ef57a8e412e241acf56c46fd3c2ccd3848 b/MyApplication1/.idea/sonarlint/issuestore/e/b/eb4272ef57a8e412e241acf56c46fd3c2ccd3848 similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/e/b/eb4272ef57a8e412e241acf56c46fd3c2ccd3848 rename to MyApplication1/.idea/sonarlint/issuestore/e/b/eb4272ef57a8e412e241acf56c46fd3c2ccd3848 diff --git a/MyApplication2/.idea/sonarlint/issuestore/index.pb b/MyApplication1/.idea/sonarlint/issuestore/index.pb similarity index 100% rename from MyApplication2/.idea/sonarlint/issuestore/index.pb rename to MyApplication1/.idea/sonarlint/issuestore/index.pb diff --git a/MyApplication2/.idea/vcs.xml b/MyApplication1/.idea/vcs.xml similarity index 100% rename from MyApplication2/.idea/vcs.xml rename to MyApplication1/.idea/vcs.xml diff --git a/MyApplication1/agconnect-services.json b/MyApplication1/agconnect-services.json new file mode 100644 index 0000000..296eb70 --- /dev/null +++ b/MyApplication1/agconnect-services.json @@ -0,0 +1,37 @@ +{ + "agcgw_all":{ + "CN":"connect-drcn.dbankcloud.cn", + "CN_back":"connect-drcn.hispace.hicloud.com", + "DE":"connect-dre.dbankcloud.cn", + "DE_back":"connect-dre.hispace.hicloud.com", + "RU":"connect-drru.dbankcloud.cn", + "RU_back":"connect-drru.hispace.hicloud.com", + "SG":"connect-dra.dbankcloud.cn", + "SG_back":"connect-dra.hispace.hicloud.com" + }, + "client":{ + "cp_id":"56657123", + "product_id":"737518067793736787", + "client_id":"762329203499615488", + "client_secret":"[!00A00BA9DEE2EE7747F9F30DB21E2A2616FD064D36C8B4BADA99E146F8A9D30ABA14098C61FA48E600A90FA8CD63E096972CF8186C53424D840AFE50C3797974F436ABC8462E7B6865E1E16DA7B94792D05C21F5A35F341C77F28A3C4FA6F85866]", + "project_id":"737518067793736787", + "app_id":"105206265", + "api_key":"[!00854F5F9018C3E704B93E22B435C683904300122B0B318C8D07FCAD9E8EF3DC93E434EA08CA13223506BC7633ED71EF2220B0CD308A2F6755366524D8E2308480367DF9757EC20679ABD7A593DC52C8F7847EBFE12FF91D9629C4AA430F6456D9DE5DB20BD519B04D254D27B4B979ABDD876D7E481BBCF723299EBA9C5F53AC44]", + "package_name":"com.xcl20481.myapplication" + }, + "oauth_client":{ + "client_id":"105206265", + "client_type":30 + }, + "app_info":{ + "app_id":"789706653405555520", + "package_name":"com.xcl20481.myapplication" + }, + "code":{ + "code1":"5D5ADBAA2F552D1A56E15069289B06F0", + "code2":"9F517684338B58C149755A692207A16E", + "code3":"02E063FD412D97BAE350C41C8294DFDF", + "code4":"DCAD5BA6BD850402D4AEF5B150FB33DD" + }, + "configuration_version":"3.0" +} \ No newline at end of file diff --git a/MyApplication2/build.gradle b/MyApplication1/build.gradle similarity index 84% rename from MyApplication2/build.gradle rename to MyApplication1/build.gradle index a810ddf..22f682f 100644 --- a/MyApplication2/build.gradle +++ b/MyApplication1/build.gradle @@ -6,15 +6,15 @@ ohos { signingConfigs { debug { storeFile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p12') - storePassword '000000188550E520D1D35E8FA4F11D913FBD84D3F631AB50FAD45494E67F834DC8EBADEC664EB7BF' + storePassword '000000189845B89E9938FEEBFE701FAEAC25439ED8DE6F976636C812F590E90DEF8C2D7240F79BEA' keyAlias = 'debugKey' - keyPassword '000000183BB9640897FE212C7B0BBB75A795F44DC2B183C86F3420C3404261768A94E422D7582A45' + keyPassword '00000018F7C68D0AD0D2776537D282AB0031F7235FF3D835EAC2ABA317D122EE3C2FD3679146F82A' signAlg = 'SHA256withECDSA' profile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p7b') certpath file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.cer') } } - compileSdkVersion 5 + compileSdkVersion 6 } buildscript { diff --git a/MyApplication2/entry/.gitignore b/MyApplication1/entry/.gitignore similarity index 100% rename from MyApplication2/entry/.gitignore rename to MyApplication1/entry/.gitignore diff --git a/MyApplication2/entry/build.gradle b/MyApplication1/entry/build.gradle similarity index 84% rename from MyApplication2/entry/build.gradle rename to MyApplication1/entry/build.gradle index dfd0169..2b064d3 100644 --- a/MyApplication2/entry/build.gradle +++ b/MyApplication1/entry/build.gradle @@ -5,9 +5,9 @@ ohos { signingConfigs { debug { storeFile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p12') - storePassword '0000001856EA9B72DCD12C677995573A97D0C716FC9BB7125E89E37CF6A53AAF1671950486A02D87' + storePassword '000000184687F86CE825B945C63332C663B49040D417619ED0F20979ACB29ACE21EE6BB17DEA1B44' keyAlias = 'debugKey' - keyPassword '0000001864EF071721F6AA68EE1B417DC789469C2CD5E46B0BBF6CA9B91450990764CAC390EE3A7C' + keyPassword '0000001865A11CDD718E32FF669EE7AD4AAB69761F5E7492D75D7FE30C0192AF12585B4EC9F4A770' signAlg = 'SHA256withECDSA' profile file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.p7b') certpath file('C:\\Users\\lenovo\\.ohos\\config\\auto_debug_myapplication_56657123.cer') diff --git a/MyApplication2/entry/package.json b/MyApplication1/entry/package.json similarity index 100% rename from MyApplication2/entry/package.json rename to MyApplication1/entry/package.json diff --git a/MyApplication2/entry/proguard-rules.pro b/MyApplication1/entry/proguard-rules.pro similarity index 100% rename from MyApplication2/entry/proguard-rules.pro rename to MyApplication1/entry/proguard-rules.pro diff --git a/MyApplication2/entry/src/main/config.json b/MyApplication1/entry/src/main/config.json similarity index 92% rename from MyApplication2/entry/src/main/config.json rename to MyApplication1/entry/src/main/config.json index 49b15fc..5e729e9 100644 --- a/MyApplication2/entry/src/main/config.json +++ b/MyApplication1/entry/src/main/config.json @@ -1,13 +1,13 @@ { "app": { "apiVersion": { - "compatible": 3 + "compatible": 5 }, "bundleName": "com.xcl20481.myapplication", - "vendor": "xcl20481", + "vendor": "2048", "version": { "code": 1000000, - "name": "1.1.0" + "name": "1.1.2" } }, "deviceConfig": { @@ -17,7 +17,7 @@ }, "module": { "package": "com.xcl20481.myapplication", - "name": ".MyApplication", + "name": "com.xcl20481.myapplication.MyApplication", "mainAbility": "com.xcl20481.myapplication.MainAbility", "reqPermissions": [ { diff --git a/MyApplication2/entry/src/main/java/com/xcl20481/myapplication/MainAbility.java b/MyApplication1/entry/src/main/java/com/xcl20481/myapplication/MainAbility.java similarity index 100% rename from MyApplication2/entry/src/main/java/com/xcl20481/myapplication/MainAbility.java rename to MyApplication1/entry/src/main/java/com/xcl20481/myapplication/MainAbility.java diff --git a/MyApplication2/entry/src/main/java/com/xcl20481/myapplication/MyApplication.java b/MyApplication1/entry/src/main/java/com/xcl20481/myapplication/MyApplication.java similarity index 100% rename from MyApplication2/entry/src/main/java/com/xcl20481/myapplication/MyApplication.java rename to MyApplication1/entry/src/main/java/com/xcl20481/myapplication/MyApplication.java diff --git a/MyApplication2/entry/src/main/js/default/app.js b/MyApplication1/entry/src/main/js/default/app.js similarity index 100% rename from MyApplication2/entry/src/main/js/default/app.js rename to MyApplication1/entry/src/main/js/default/app.js diff --git a/MyApplication2/entry/src/main/js/default/common/images/Wallpaper.png b/MyApplication1/entry/src/main/js/default/common/images/Wallpaper.png similarity index 100% rename from MyApplication2/entry/src/main/js/default/common/images/Wallpaper.png rename to MyApplication1/entry/src/main/js/default/common/images/Wallpaper.png diff --git a/MyApplication2/entry/src/main/js/default/common/images/bg-tv.jpg b/MyApplication1/entry/src/main/js/default/common/images/bg-tv.jpg similarity index 100% rename from MyApplication2/entry/src/main/js/default/common/images/bg-tv.jpg rename to MyApplication1/entry/src/main/js/default/common/images/bg-tv.jpg diff --git a/MyApplication2/entry/src/main/js/default/i18n/en-US.json b/MyApplication1/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from MyApplication2/entry/src/main/js/default/i18n/en-US.json rename to MyApplication1/entry/src/main/js/default/i18n/en-US.json diff --git a/MyApplication2/entry/src/main/js/default/i18n/zh-CN.json b/MyApplication1/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from MyApplication2/entry/src/main/js/default/i18n/zh-CN.json rename to MyApplication1/entry/src/main/js/default/i18n/zh-CN.json diff --git a/MyApplication2/entry/src/main/js/default/pages/index/index.css b/MyApplication1/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/index/index.css rename to MyApplication1/entry/src/main/js/default/pages/index/index.css diff --git a/MyApplication2/entry/src/main/js/default/pages/index/index.hml b/MyApplication1/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/index/index.hml rename to MyApplication1/entry/src/main/js/default/pages/index/index.hml diff --git a/MyApplication2/entry/src/main/js/default/pages/index/index.js b/MyApplication1/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/index/index.js rename to MyApplication1/entry/src/main/js/default/pages/index/index.js diff --git a/MyApplication2/entry/src/main/js/default/pages/page0/page0.css b/MyApplication1/entry/src/main/js/default/pages/page0/page0.css similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/page0/page0.css rename to MyApplication1/entry/src/main/js/default/pages/page0/page0.css diff --git a/MyApplication2/entry/src/main/js/default/pages/page0/page0.hml b/MyApplication1/entry/src/main/js/default/pages/page0/page0.hml similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/page0/page0.hml rename to MyApplication1/entry/src/main/js/default/pages/page0/page0.hml diff --git a/MyApplication2/entry/src/main/js/default/pages/page0/page0.js b/MyApplication1/entry/src/main/js/default/pages/page0/page0.js similarity index 100% rename from MyApplication2/entry/src/main/js/default/pages/page0/page0.js rename to MyApplication1/entry/src/main/js/default/pages/page0/page0.js diff --git a/MyApplication2/entry/src/main/resources/base/element/string.json b/MyApplication1/entry/src/main/resources/base/element/string.json similarity index 100% rename from MyApplication2/entry/src/main/resources/base/element/string.json rename to MyApplication1/entry/src/main/resources/base/element/string.json diff --git a/MyApplication2/entry/src/main/resources/base/media/icon.png b/MyApplication1/entry/src/main/resources/base/media/icon.png similarity index 100% rename from MyApplication2/entry/src/main/resources/base/media/icon.png rename to MyApplication1/entry/src/main/resources/base/media/icon.png diff --git a/MyApplication2/entry/src/main/resources/base/media/icon2.jpg b/MyApplication1/entry/src/main/resources/base/media/icon2.jpg similarity index 100% rename from MyApplication2/entry/src/main/resources/base/media/icon2.jpg rename to MyApplication1/entry/src/main/resources/base/media/icon2.jpg diff --git a/MyApplication2/entry/src/ohosTest/java/com/xcl20481/myapplication/ExampleOhosTest.java b/MyApplication1/entry/src/ohosTest/java/com/xcl20481/myapplication/ExampleOhosTest.java similarity index 100% rename from MyApplication2/entry/src/ohosTest/java/com/xcl20481/myapplication/ExampleOhosTest.java rename to MyApplication1/entry/src/ohosTest/java/com/xcl20481/myapplication/ExampleOhosTest.java diff --git a/MyApplication2/entry/src/ohosTest/js/default/app.js b/MyApplication1/entry/src/ohosTest/js/default/app.js similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/app.js rename to MyApplication1/entry/src/ohosTest/js/default/app.js diff --git a/MyApplication2/entry/src/ohosTest/js/default/i18n/en-US.json b/MyApplication1/entry/src/ohosTest/js/default/i18n/en-US.json similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/i18n/en-US.json rename to MyApplication1/entry/src/ohosTest/js/default/i18n/en-US.json diff --git a/MyApplication2/entry/src/ohosTest/js/default/i18n/zh-CN.json b/MyApplication1/entry/src/ohosTest/js/default/i18n/zh-CN.json similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/i18n/zh-CN.json rename to MyApplication1/entry/src/ohosTest/js/default/i18n/zh-CN.json diff --git a/MyApplication2/entry/src/ohosTest/js/default/pages/index/index.css b/MyApplication1/entry/src/ohosTest/js/default/pages/index/index.css similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/pages/index/index.css rename to MyApplication1/entry/src/ohosTest/js/default/pages/index/index.css diff --git a/MyApplication2/entry/src/ohosTest/js/default/pages/index/index.hml b/MyApplication1/entry/src/ohosTest/js/default/pages/index/index.hml similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/pages/index/index.hml rename to MyApplication1/entry/src/ohosTest/js/default/pages/index/index.hml diff --git a/MyApplication2/entry/src/ohosTest/js/default/pages/index/index.js b/MyApplication1/entry/src/ohosTest/js/default/pages/index/index.js similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/default/pages/index/index.js rename to MyApplication1/entry/src/ohosTest/js/default/pages/index/index.js diff --git a/MyApplication2/entry/src/ohosTest/js/test/ExampleJsunit.test.js b/MyApplication1/entry/src/ohosTest/js/test/ExampleJsunit.test.js similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/test/ExampleJsunit.test.js rename to MyApplication1/entry/src/ohosTest/js/test/ExampleJsunit.test.js diff --git a/MyApplication2/entry/src/ohosTest/js/test/List.test.js b/MyApplication1/entry/src/ohosTest/js/test/List.test.js similarity index 100% rename from MyApplication2/entry/src/ohosTest/js/test/List.test.js rename to MyApplication1/entry/src/ohosTest/js/test/List.test.js diff --git a/MyApplication2/entry/src/ohosTest/resources/base/element/string.json b/MyApplication1/entry/src/ohosTest/resources/base/element/string.json similarity index 100% rename from MyApplication2/entry/src/ohosTest/resources/base/element/string.json rename to MyApplication1/entry/src/ohosTest/resources/base/element/string.json diff --git a/MyApplication2/entry/src/ohosTest/resources/base/media/icon.png b/MyApplication1/entry/src/ohosTest/resources/base/media/icon.png similarity index 100% rename from MyApplication2/entry/src/ohosTest/resources/base/media/icon.png rename to MyApplication1/entry/src/ohosTest/resources/base/media/icon.png diff --git a/MyApplication2/gradle.properties b/MyApplication1/gradle.properties similarity index 100% rename from MyApplication2/gradle.properties rename to MyApplication1/gradle.properties diff --git a/MyApplication2/gradle/wrapper/gradle-wrapper.jar b/MyApplication1/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from MyApplication2/gradle/wrapper/gradle-wrapper.jar rename to MyApplication1/gradle/wrapper/gradle-wrapper.jar diff --git a/MyApplication2/gradle/wrapper/gradle-wrapper.properties b/MyApplication1/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from MyApplication2/gradle/wrapper/gradle-wrapper.properties rename to MyApplication1/gradle/wrapper/gradle-wrapper.properties diff --git a/MyApplication2/gradlew b/MyApplication1/gradlew similarity index 100% rename from MyApplication2/gradlew rename to MyApplication1/gradlew diff --git a/MyApplication2/gradlew.bat b/MyApplication1/gradlew.bat similarity index 100% rename from MyApplication2/gradlew.bat rename to MyApplication1/gradlew.bat diff --git a/MyApplication2/package.json b/MyApplication1/package.json similarity index 100% rename from MyApplication2/package.json rename to MyApplication1/package.json diff --git a/MyApplication2/settings.gradle b/MyApplication1/settings.gradle similarity index 100% rename from MyApplication2/settings.gradle rename to MyApplication1/settings.gradle