diff --git a/.gitignore b/.gitignore index ae1268e..fb7e6df 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ graphify-out/.graphify_python graphify-out/.graphify_root graphify-out/.vocab.txt graphify-out/cache/ + +# hvigor 构建缓存 +.hvigor/ diff --git a/app/.build-gate.bat b/app/.build-gate.bat new file mode 100644 index 0000000..f8f38bd --- /dev/null +++ b/app/.build-gate.bat @@ -0,0 +1,10 @@ +@echo off +set "PATH=C:\Program Files\Huawei\DevEco Studio\jbr\bin;%PATH%" +set "DEVECO_SDK_HOME=C:\Program Files\Huawei\DevEco Studio\sdk" +echo [preflight] where java: +where java +echo [preflight] node spawn test: +"C:\Program Files\Huawei\DevEco Studio\tools\node\node.exe" D:\meida\app\.spawn-test.js +cd /d D:\meida\app +echo [build] start +"C:\Program Files\Huawei\DevEco Studio\tools\node\node.exe" "C:\Program Files\Huawei\DevEco Studio\tools\hvigor\bin\hvigorw.js" --mode module -p module=entry@default assembleHap --analyze=false --daemon=false diff --git a/app/AppScope/resources/base/element/string.json b/app/AppScope/resources/base/element/string.json index 198f1e7..d55f2f1 100644 --- a/app/AppScope/resources/base/element/string.json +++ b/app/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "app" + "value": "美搭" } ] } diff --git a/app/AppScope/resources/base/media/background.png b/app/AppScope/resources/base/media/background.png index 923f2b3..14caeb0 100644 Binary files a/app/AppScope/resources/base/media/background.png and b/app/AppScope/resources/base/media/background.png differ diff --git a/app/AppScope/resources/base/media/foreground.png b/app/AppScope/resources/base/media/foreground.png index eb94275..81bcaac 100644 Binary files a/app/AppScope/resources/base/media/foreground.png and b/app/AppScope/resources/base/media/foreground.png differ diff --git a/app/README.md b/app/README.md index cedf615..100097a 100644 --- a/app/README.md +++ b/app/README.md @@ -6,15 +6,23 @@ ## 命令行构建(Agent/CI 用的门禁) -```bash -cd G:/meida/app -export DEVECO_SDK_HOME="C:/Program Files/Huawei/DevEco Studio/sdk" -"C:/Program Files/Huawei/DevEco Studio/tools/node/node.exe" \ - "C:/Program Files/Huawei/DevEco Studio/tools/hvigor/bin/hvigorw.js" \ +> 工程配了真机调试签名(`.ohos/config` 下证书)后,PackageHap/SignHap 需要 java: +> PATH 里须有 DevEco 自带 JBR(`jbr/bin`),且**不能有带旧环境的 hvigor 守护进程残留** +> (守护进程会缓存启动时的 PATH,报 `spawn java ENOENT` 时先 +> `taskkill /F /PID ` 再重试)。 + +```bat +(等价于仓库根的 app/.build-gate.bat) +set "PATH=C:\Program Files\Huawei\DevEco Studio\jbr\bin;%PATH%" +set "DEVECO_SDK_HOME=C:\Program Files\Huawei\DevEco Studio\sdk" +cd /d \app +"C:\Program Files\Huawei\DevEco Studio\tools\node\node.exe" ^ + "C:\Program Files\Huawei\DevEco Studio\tools\hvigor\bin\hvigorw.js" ^ --mode module -p module=entry@default assembleHap --analyze=false --daemon=false ``` -`BUILD SUCCESSFUL` 即门禁通过(未签名 HAP 正常——签名等 AGC 证书)。运行/调试用 DevEco Studio 打开本工程点 Run(模拟器或真机,真机需先配签名)。 +`BUILD SUCCESSFUL` 即门禁通过;产物 `entry/build/default/outputs/default/entry-default-signed.hap` +(已用调试证书签名,可直接 `hdc install` 到真机)。 ## 代码约定 diff --git a/app/build-profile.json5 b/app/build-profile.json5 index 0cb46cc..00e3755 100644 --- a/app/build-profile.json5 +++ b/app/build-profile.json5 @@ -1,6 +1,20 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + { + "name": "default", + "type": "HarmonyOS", + "material": { + "certpath": "C:\\Users\\youmi\\.ohos\\config\\default_app_7oyN4SmerXoqWpORnThdj7HJQc-Uvz9AusJXlFjQgt4=.cer", + "keyAlias": "debugKey", + "keyPassword": "0000001BE20911DD8845DD093D7A01CBE5481C81764769809C9BF80D93020A1FDCEB9432FB5C08DDEF808B", + "profile": "C:\\Users\\youmi\\.ohos\\config\\default_app_7oyN4SmerXoqWpORnThdj7HJQc-Uvz9AusJXlFjQgt4=.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "C:\\Users\\youmi\\.ohos\\config\\default_app_7oyN4SmerXoqWpORnThdj7HJQc-Uvz9AusJXlFjQgt4=.p12", + "storePassword": "0000001BDD82AF3B7F4DC062470C6F6831D38E94E5BC584F4E4439362CDE8E950D873B51744CA0614B4D94" + } + } + ], "products": [ { "name": "default", diff --git a/app/entry/src/main/ets/core/AuthStore.ets b/app/entry/src/main/ets/core/AuthStore.ets index eeac208..b86d50d 100644 --- a/app/entry/src/main/ets/core/AuthStore.ets +++ b/app/entry/src/main/ets/core/AuthStore.ets @@ -32,7 +32,7 @@ interface AuthWireResp { const PREF_NAME = 'meida_auth' const KEY_TOKENS = 'tokens' const KEY_BASE_URL = 'base_url' -export const DEFAULT_BASE_URL = 'http://127.0.0.1:8000' +export const DEFAULT_BASE_URL = 'http://192.168.3.25:8666' export class AuthStore { private static tokens: TokenPair | undefined diff --git a/app/entry/src/main/resources/base/media/background.png b/app/entry/src/main/resources/base/media/background.png index 923f2b3..14caeb0 100644 Binary files a/app/entry/src/main/resources/base/media/background.png and b/app/entry/src/main/resources/base/media/background.png differ diff --git a/app/entry/src/main/resources/base/media/foreground.png b/app/entry/src/main/resources/base/media/foreground.png index 97014d3..81bcaac 100644 Binary files a/app/entry/src/main/resources/base/media/foreground.png and b/app/entry/src/main/resources/base/media/foreground.png differ diff --git a/app/entry/src/main/resources/base/media/startIcon.png b/app/entry/src/main/resources/base/media/startIcon.png index 205ad8b..81bcaac 100644 Binary files a/app/entry/src/main/resources/base/media/startIcon.png and b/app/entry/src/main/resources/base/media/startIcon.png differ