diff --git a/.hvigor/dependencyMap/dependencyMap.json5 b/.hvigor/dependencyMap/dependencyMap.json5 index cfca4a6..cecd734 100644 --- a/.hvigor/dependencyMap/dependencyMap.json5 +++ b/.hvigor/dependencyMap/dependencyMap.json5 @@ -1 +1 @@ -{"basePath":"/Users/gandanxiangzhao/Downloads/Expert/harmony/.hvigor/dependencyMap/dependencyMap.json5","rootDependency":"./oh-package.json5","dependencyMap":{"default":"./default/oh-package.json5","uicomponents":"./uicomponents/oh-package.json5","utils":"./utils/oh-package.json5","mypage":"./mypage/oh-package.json5","basic":"./basic/oh-package.json5","Home":"./Home/oh-package.json5","register":"./register/oh-package.json5"},"modules":[{"name":"default","srcPath":"../../../products/expert"},{"name":"uicomponents","srcPath":"../../../commons/uicomponents"},{"name":"utils","srcPath":"../../../commons/utils"},{"name":"mypage","srcPath":"../../../features/mypage"},{"name":"basic","srcPath":"../../../commons/basic"},{"name":"Home","srcPath":"../../../features/Home"},{"name":"register","srcPath":"../../../features/register"}]} \ No newline at end of file +{"basePath":"D:\\202076work\\hongmeng\\newExpert\\harmony\\.hvigor\\dependencyMap\\dependencyMap.json5","rootDependency":"./oh-package.json5","dependencyMap":{"default":"./default/oh-package.json5","mypage":"./mypage/oh-package.json5","basic":"./basic/oh-package.json5","Home":"./Home/oh-package.json5","register":"./register/oh-package.json5","polyv":"./polyv/oh-package.json5","scene_single_video":"./scene_single_video/oh-package.json5"},"modules":[{"name":"default","srcPath":"..\\..\\..\\products\\expert"},{"name":"mypage","srcPath":"..\\..\\..\\features\\mypage"},{"name":"basic","srcPath":"..\\..\\..\\commons\\basic"},{"name":"Home","srcPath":"..\\..\\..\\features\\Home"},{"name":"register","srcPath":"..\\..\\..\\features\\register"},{"name":"polyv","srcPath":"..\\..\\..\\polyv"},{"name":"scene_single_video","srcPath":"..\\..\\..\\scene_single_video"}]} \ No newline at end of file diff --git a/.hvigor/outputs/sync/fileCache.json b/.hvigor/outputs/sync/fileCache.json index 8b928b0..78d83a4 100644 --- a/.hvigor/outputs/sync/fileCache.json +++ b/.hvigor/outputs/sync/fileCache.json @@ -1 +1 @@ -{"CACHE_SYNC_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigor\\hvigor-config.json5":"8c08ee0f24b3bde6e5daf07583a52b16a776211c8ef979740c7cb510d9a2ece0","D:\\202076work\\hongmeng\\newExpert\\harmony\\build-profile.json5":"d137640c1252f14c4f44989ee31b2ff90a36186af27be75915f61dbfaedfb7f7","D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigorfile.ts":"f3e6a062a64506385e9721c8de44c7d1c1af18225dcd32c2ab7e3701c4617b40","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\build-profile.json5":"704719530bbd2192ef5ef92ba4f7e6931b914e13a909c14085ab04ffb12b4df0","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\hvigorfile.ts":"19db430578e1a2df7a73512a83ccc22b9a00440e2ea59f5c9c5f98a78545a773","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\build-profile.json5":"ad0e039354bc174f61ba5462242716b66ac5d78e5e4183e957395528ebf5fccb","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\hvigorfile.ts":"9c35845f36b3549dbe2146e7bf6c286f40b5408c0764ce1daae9391a11b5cb1b","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\build-profile.json5":"4ad092f86b93f5f07f0e758b9e73a8ce8483949b4685d788f86577d680e606d4","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\hvigorfile.ts":"8153a257dbbb1efc24ca1d4c86c354605b93c045015ee1ddd52d7e5cb33e8b68","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\build-profile.json5":"328c5ac0f19df15f4015d4225f8ddb1cc6a6fefda29c5caba4f7051a6759333d","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\hvigorfile.ts":"56d68a370a1a0e2bd9b21d69c57ebf04563ffb0faf16ea6d0152ac89de642a36","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\build-profile.json5":"73144acf2aeacd82e9a2e881e6dc6730c9df1495299667bd3a68e07222542199","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\hvigorfile.ts":"070af3667a94a5ddf27b287b1b054d972af9e9be43f5171edbb5cb3e9c3a4cf0","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\.hvigor\\outputs\\sync\\output.json":"b59b761cfb36082ba06fe8dd9d9ec1b6c774d3107fc937ab5dc99e4647265780","SDK_LOCATION":"D:/Program Files/Huawei/DevEco Studioss/sdk"},"OHPM_INSTALL_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules\\.ohpm\\lock.json5":"70277c504cbfbaace88b1e94c4e365dcdc338c98b12d78496316893b30fd2f56","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh_modules":false,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh_modules":true}} \ No newline at end of file +{"CACHE_SYNC_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigor\\hvigor-config.json5":"8c08ee0f24b3bde6e5daf07583a52b16a776211c8ef979740c7cb510d9a2ece0","D:\\202076work\\hongmeng\\newExpert\\harmony\\build-profile.json5":"0a4b2bb7dc67ec691430bb78ca36514d3c4eb8a4a6f47c0aad4a829af8e193e1","D:\\202076work\\hongmeng\\newExpert\\harmony\\hvigorfile.ts":"f3e6a062a64506385e9721c8de44c7d1c1af18225dcd32c2ab7e3701c4617b40","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\build-profile.json5":"704719530bbd2192ef5ef92ba4f7e6931b914e13a909c14085ab04ffb12b4df0","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\hvigorfile.ts":"19db430578e1a2df7a73512a83ccc22b9a00440e2ea59f5c9c5f98a78545a773","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\build-profile.json5":"ad0e039354bc174f61ba5462242716b66ac5d78e5e4183e957395528ebf5fccb","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\hvigorfile.ts":"9c35845f36b3549dbe2146e7bf6c286f40b5408c0764ce1daae9391a11b5cb1b","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\build-profile.json5":"4ad092f86b93f5f07f0e758b9e73a8ce8483949b4685d788f86577d680e606d4","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\hvigorfile.ts":"8153a257dbbb1efc24ca1d4c86c354605b93c045015ee1ddd52d7e5cb33e8b68","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\build-profile.json5":"328c5ac0f19df15f4015d4225f8ddb1cc6a6fefda29c5caba4f7051a6759333d","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\hvigorfile.ts":"56d68a370a1a0e2bd9b21d69c57ebf04563ffb0faf16ea6d0152ac89de642a36","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\build-profile.json5":"73144acf2aeacd82e9a2e881e6dc6730c9df1495299667bd3a68e07222542199","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\hvigorfile.ts":"070af3667a94a5ddf27b287b1b054d972af9e9be43f5171edbb5cb3e9c3a4cf0","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\build-profile.json5":"a789d1c4e43f06af0b537b87d6ed7cfcfb8664507ccd535c8a4d120d48c1adc4","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\hvigorfile.ts":"632872fe264bc4c236cdf4bed16394194182511c1a548df87463fa468306339f","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\.hvigor\\outputs\\sync\\output.json":"0c8f1bf091aa10cf4b77fde5b8c49fd48579c86c9ec112cdaab970ee3b221649","SDK_LOCATION":"D:/Program Files/Huawei/DevEco Studioss/sdk"},"OHPM_INSTALL_FILE_HASH":{"D:\\202076work\\hongmeng\\newExpert\\harmony\\oh-package.json5":"58ad34ca7896987e4fef09cfaac06ec0928d9ee0c0f465a292c3cb53f6434be4","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules\\.ohpm\\lock.json5":"70f60e80bd2909831f07e68ab7313ea1d281d6dfd3239350cca3ff40d64557ef","D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh-package.json5":"7b598f231d908ec4eb676ae1e5bffda7258bcca6512874b3d4474e9af4c53329","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh-package.json5":"1b63830b9d0b722767c8104e582d5c4d901f812819959b2416152cc7ab93f282","D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh-package.json5":"63512be78258dfb0589672d6d27974cc8096acaf1c664fa55b30f72439a47e56","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh-package.json5":"790ec685dbf6c5b605ccffdd376e1340941da929ff98319fcf475c7c73b70360","D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh-package.json5":"fbc5c35f94db76fda06ea5d42d04d1ddfe939c8dfe949196a9bd48e5727e723e","D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh-package.json5":"246424d6aad103ba35c4c52b6cdde49d498da68c2d9c50abd99566ea771de04d","D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh-package.json5":"b90edb0e178bbd30c06ab00cdb99af849fe5a567cc2f3f0cfed6da4bafe45e58","D:\\202076work\\hongmeng\\newExpert\\harmony\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\products\\expert\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\mypage\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\commons\\basic\\oh_modules":false,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\Home\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\features\\register\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\polyv\\oh_modules":true,"D:\\202076work\\hongmeng\\newExpert\\harmony\\scene_single_video\\oh_modules":true}} \ No newline at end of file diff --git a/commons/basic/src/main/ets/constants/BasicConstant.ets b/commons/basic/src/main/ets/constants/BasicConstant.ets index 3a14a90..7d32c54 100644 --- a/commons/basic/src/main/ets/constants/BasicConstant.ets +++ b/commons/basic/src/main/ets/constants/BasicConstant.ets @@ -51,7 +51,7 @@ export class BasicConstant { ,'内蒙古自治区','辽宁省','吉林省','黑龙江省','上海市','江苏省','浙江省' ,'安徽省','福建省','江西省','山东省','河南省','湖北省','湖南省','广东省', '广西壮族自治区','海南省','重庆市','四川省','贵州省','云南省','西藏自治区', - '陕西省','甘肃省','宁夏回族自治区','新疆维吾尔自治区','台湾省','香港特别行政区','澳门特别行政区'] + '陕西省','甘肃省','青海省','宁夏回族自治区','新疆维吾尔自治区','台湾省','香港特别行政区','澳门特别行政区'] //通知事件ID static readonly notification_back_refreshData = 250529;//返回上页通知刷新数据 diff --git a/commons/basic/src/main/ets/utils/ChangeUtil.ets b/commons/basic/src/main/ets/utils/ChangeUtil.ets index 32a3b0e..c2ed989 100644 --- a/commons/basic/src/main/ets/utils/ChangeUtil.ets +++ b/commons/basic/src/main/ets/utils/ChangeUtil.ets @@ -7,6 +7,7 @@ import fs from '@ohos.file.fs'; import { fileIo } from '@kit.CoreFileKit'; import util from '@ohos.util'; import { i18n } from '@kit.LocalizationKit'; +import { connection } from '@kit.NetworkKit'; export class ChangeUtil { /** * 将HashMap转成JsonString @@ -167,5 +168,8 @@ export class ChangeUtil { if (str.length === 0) return false; return i18n.Unicode.isDigit(str.charAt(0)); } - + //判断是否有网络 + static isOnline(): boolean { + return connection.hasDefaultNetSync(); + } } \ No newline at end of file diff --git a/commons/basic/src/main/ets/utils/request.ets b/commons/basic/src/main/ets/utils/request.ets index a491b67..20a723f 100644 --- a/commons/basic/src/main/ets/utils/request.ets +++ b/commons/basic/src/main/ets/utils/request.ets @@ -7,7 +7,7 @@ import { HashMap } from '@kit.ArkTS'; import { CryptoJS } from '@ohos/crypto-js' import { Base64Util } from './Base64Util'; import { ChangeUtil } from './ChangeUtil' - +import { bundleManager} from '@kit.AbilityKit'; interface HdRequestOptions { baseURL?: string } @@ -24,6 +24,7 @@ export interface TimestampBean { } + class HdHttp { baseURL: string @@ -146,14 +147,14 @@ class HdHttp { } }); // 处理响应结果。 - return promise.then((data) => { + return promise.then(async (data) => { if (data.responseCode === http.ResponseCode.OK) { logger.info('Response httpReq:' + data.result); let json:TimestampBean = JSON.parse(data.result.toString()) as TimestampBean; let tp = json.timestamp; datas.set("user_uuid", authStore.getUser().uuid?authStore.getUser().uuid:''); - datas.set("client_type", 'A'); - datas.set("version",'4.0.0' ); + datas.set("client_type", 'H'); + datas.set("version", await this.getVersion() ); datas.set('timestamp',tp+''); return this.posts(url, datas); } else { @@ -221,6 +222,15 @@ class HdHttp { return ''; } } + + async getVersion() { + let res=await bundleManager.getBundleInfoForSelf( + bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION | + bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_METADATA + ) + return res.versionName + + } } export const hdHttp = new HdHttp({ baseURL: '' }) diff --git a/features/mypage/src/main/ets/view/ChangePasswordComp.ets b/features/mypage/src/main/ets/view/ChangePasswordComp.ets index 775e7ee..aafd2a6 100644 --- a/features/mypage/src/main/ets/view/ChangePasswordComp.ets +++ b/features/mypage/src/main/ets/view/ChangePasswordComp.ets @@ -98,7 +98,7 @@ export struct ChangePasswordComp { Text('确 定') } .width('90%') - .height(40) + .height(53) .position({x:'5%',y:'80%'}) .backgroundColor('#ffffff') .borderColor($r('app.color.main_color')) diff --git a/features/mypage/src/main/ets/view/ChangePhoneComp.ets b/features/mypage/src/main/ets/view/ChangePhoneComp.ets index 2dff813..8b60a3c 100644 --- a/features/mypage/src/main/ets/view/ChangePhoneComp.ets +++ b/features/mypage/src/main/ets/view/ChangePhoneComp.ets @@ -145,7 +145,7 @@ export struct ChangePhoneComp { Text('确 定') } .width('90%') - .height(48) + .height(53) .borderRadius(8) .borderWidth(1) .borderColor('#8B2316') diff --git a/features/mypage/src/main/ets/view/ForgetPasswordComp.ets b/features/mypage/src/main/ets/view/ForgetPasswordComp.ets index 4bee8e9..9aff387 100644 --- a/features/mypage/src/main/ets/view/ForgetPasswordComp.ets +++ b/features/mypage/src/main/ets/view/ForgetPasswordComp.ets @@ -196,10 +196,10 @@ export struct ForgetPasswordComp { .borderColor('#CCCCCC') Button({type:ButtonType.Normal}){ - Text('登 录') + Text('确 定') } .width('90%') - .height(48) + .height(53) .margin({ top: 40 }) .borderRadius(8) .backgroundColor($r('app.color.main_color')) diff --git a/features/register/src/main/ets/view/LoginComp.ets b/features/register/src/main/ets/view/LoginComp.ets index f20809a..7abae4a 100644 --- a/features/register/src/main/ets/view/LoginComp.ets +++ b/features/register/src/main/ets/view/LoginComp.ets @@ -3,7 +3,7 @@ import { promptAction, router } from '@kit.ArkUI' import { BusinessError } from '@kit.BasicServicesKit'; import HashMap from '@ohos.util.HashMap'; import { DataWebModel,preferenceStore ,SpecialDisease} from '@itcast/basic' - +import { deviceInfo } from '@kit.BasicServicesKit'; @Preview @Component export struct LoginComp { @@ -47,7 +47,7 @@ export struct LoginComp { autoCancel:false }) - + osFullName: string = deviceInfo.osFullName; login() { if (this.loading) return; if (!this.mobile) { @@ -84,7 +84,7 @@ export struct LoginComp { this.hashMap.set('sms',this.current_code) this.loginUrl=BasicConstant.urlExpertAPI+'umSmsLogin' } - this.hashMap.set('current_spec','hongmeng') + this.hashMap.set('current_spec',this.osFullName) hdHttp.httpReq(this.loginUrl,this.hashMap).then(async (res: HdResponse) => { this.loading = false logger.info('Response login'+res); @@ -166,9 +166,11 @@ export struct LoginComp { HdNav({ title: '登录', showRightIcon: false,showLeftIcon:false }) Image($r('app.media.icon_logo')) - .width(64) + .width(68) + .height(68) + .objectFit(ImageFit.Contain) .margin({top:45}) - .aspectRatio(1) + // .aspectRatio(1) Text('专家版') .fontSize(16) .margin({ bottom: 15,top:10 }) @@ -218,7 +220,16 @@ export struct LoginComp { .margin({right:15}) .border({ width: 1, color: $r('app.color.top_title') }) .onClick(() => { - + if (!this.mobile) { + return promptAction.showToast({ message: '手机号码不为空' }) + } + if (!ChangeUtil.isMobileNum(this.mobile)) { + return promptAction.showToast({ message: "手机号码不正确" }) + } + if(!ChangeUtil.isOnline()) + { + return promptAction.showToast({ message: "网络不可用，请链接网络再试" }) + } if(this.istime) { } diff --git a/oh_modules/.ohpm/lock.json5 b/oh_modules/.ohpm/lock.json5 index 3956b39..c70933d 100644 --- a/oh_modules/.ohpm/lock.json5 +++ b/oh_modules/.ohpm/lock.json5 @@ -14,6 +14,10 @@ "@ohos/crypto-js": { "specifier": "^2.0.4", "version": "2.0.4" + }, + "@ohos/dataorm": { + "specifier": "^2.2.6", + "version": "2.2.6" } }, "devDependencies": { @@ -36,31 +40,28 @@ "dynamicDependencies": {}, "maskedByOverrideDependencyMap": false }, - "commons/uicomponents": { - "name": "uicomponents", - "dependencies": {}, - "devDependencies": {}, - "dynamicDependencies": {}, - "maskedByOverrideDependencyMap": false - }, - "commons/utils": { - "name": "utils", - "dependencies": { - "@ohos/crypto-js": { - "specifier": "^2.0.4", - "version": "2.0.4" - } - }, - "devDependencies": {}, - "dynamicDependencies": {}, - "maskedByOverrideDependencyMap": false - }, "features/Home": { "name": "Home", "dependencies": { "@itcast/basic": { "specifier": "file:commons/basic", "version": "file:commons/basic" + }, + "@polyvharmony/media-player-sdk": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "@polyvharmony/media-player-sdk-addon-cache-down": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "scene_single_video": { + "specifier": "file:scene_single_video", + "version": "file:scene_single_video" + }, + "media-player-common": { + "specifier": "file:polyv", + "version": "file:polyv" } }, "devDependencies": {}, @@ -91,6 +92,22 @@ "dynamicDependencies": {}, "maskedByOverrideDependencyMap": false }, + "polyv": { + "name": "polyv", + "dependencies": { + "@polyvharmony/media-player-sdk": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "@polyvharmony/media-player-sdk-addon-cache-down": { + "specifier": "2.5.0", + "version": "2.5.0" + } + }, + "devDependencies": {}, + "dynamicDependencies": {}, + "maskedByOverrideDependencyMap": false + }, "products/expert": { "name": "default", "dependencies": { @@ -98,10 +115,6 @@ "specifier": "file:commons/basic", "version": "file:commons/basic" }, - "utils": { - "specifier": "file:commons/utils", - "version": "file:commons/utils" - }, "mypage": { "specifier": "file:features/mypage", "version": "file:features/mypage" @@ -113,6 +126,54 @@ "register": { "specifier": "file:features/register", "version": "file:features/register" + }, + "scene_single_video": { + "specifier": "file:scene_single_video", + "version": "file:scene_single_video" + }, + "media-player-common": { + "specifier": "file:polyv", + "version": "file:polyv" + }, + "@polyvharmony/media-player-sdk": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "@polyvharmony/media-player-core-ijk": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "@polyvharmony/media-player-sdk-addon-cache-down": { + "specifier": "2.5.0", + "version": "2.5.0" + }, + "@polyvharmony/httpdns-api": { + "specifier": "1.0.2", + "version": "1.0.2" + }, + "@polyvharmony/httpdns-impl-local": { + "specifier": "1.0.2", + "version": "1.0.2" + }, + "@polyvharmony/httpdns-impl-ali": { + "specifier": "1.0.2", + "version": "1.0.2" + } + }, + "devDependencies": {}, + "dynamicDependencies": {}, + "maskedByOverrideDependencyMap": false + }, + "scene_single_video": { + "name": "scene_single_video", + "dependencies": { + "media-player-common": { + "specifier": "file:polyv", + "version": "file:polyv" + }, + "@polyvharmony/media-player-sdk": { + "specifier": "2.5.0", + "version": "2.5.0" } }, "devDependencies": {}, @@ -130,6 +191,26 @@ "dynamic": false, "maskedByOverrideDependencyMap": false }, + "@ohos/dataorm@2.2.6": { + "integrity": "sha512-qwAQnMxfuG5Imsrq3jjikEUCC/FGqddj0YXe40zUELGdhHegEqkDaxtTp9KIq4fg1ZU/c8fxYNfApx3XZ7E6cA==", + "storePath": "oh_modules/.ohpm/@ohos+dataorm@2.2.6", + "dependencies": { + "reflect-metadata": "0.2.1" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "reflect-metadata@0.2.1": { + "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==", + "storePath": "oh_modules/.ohpm/reflect-metadata@0.2.1", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, "@ohos/hypium@1.0.21": { "integrity": "sha512-iyKGMXxE+9PpCkqEwu0VykN/7hNpb+QOeIuHwkmZnxOpI+dFZt6yhPB7k89EgV1MiSK/ieV/hMjr5Z2mWwRfMQ==", "storePath": "oh_modules/.ohpm/@ohos+hypium@1.0.21", @@ -148,6 +229,122 @@ "dynamic": false, "maskedByOverrideDependencyMap": false }, + "@polyvharmony/media-player-sdk@2.5.0": { + "integrity": "sha512-Of8xCFhAD0O8s7Q0jzwSf4potYJJcI/j+MrNvU23sgXnEAX6DG7azIehuCn+k6AMHvxgLF1LlEMp17v3pkc/XA==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-sdk@2.5.0", + "dependencies": { + "@polyvharmony/media-player-business": "2.5.0", + "@polyvharmony/media-player-core-api": "2.5.0", + "@polyvharmony/media-player-foundation": "2.5.0" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/media-player-business@2.5.0": { + "integrity": "sha512-ta9YBq8cvwNPuRwQpAopodFB0WHbAfRUhgosGqT+UDEHZtlXsajLFmplPhoqYpFb649FVe6vDjVdHgsp6bKmtQ==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-business@2.5.0", + "dependencies": { + "@polyvharmony/media-player-core-api": "2.5.0", + "@polyvharmony/media-player-foundation": "2.5.0", + "@ohos/httpclient": "2.0.2", + "@ohos/crypto-js": "2.0.4" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/media-player-core-api@2.5.0": { + "integrity": "sha512-23Z4p0nPWAGJuifAr5qfhB39b0RdU7LQnOKPJTtPX4fc3qyGDoyQ7Y4/e+WulTm/JaDgsQ7xTn+Hmq+ryNl5cA==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-core-api@2.5.0", + "dependencies": { + "@polyvharmony/media-player-foundation": "2.5.0" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/media-player-foundation@2.5.0": { + "integrity": "sha512-P1beEIZs2ySGrNGWo2RRi8/hQopZkLE6Cdi+53/UJI4iXFeciWZQMXold3KBqlMzNm369BEysaoprtCsWLMC8Q==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-foundation@2.5.0", + "dependencies": { + "@ohos/httpclient": "2.0.2", + "@ohos/crypto-js": "2.0.4", + "@polyvharmony/httpdns-api": "1.0.2" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@ohos/httpclient@2.0.2": { + "integrity": "sha512-acFEfQ9ZJti4KEYDBErCq0W85uc2khen41LIkBLVcfFXmgZAGeRKV+CPiSyG8v+5nUD7Wf2ncjBxxPxr6moqVg==", + "storePath": "oh_modules/.ohpm/@ohos+httpclient@2.0.2", + "dependencies": { + "pako": "2.1.0", + "@ohos/crypto-js": "2.0.4", + "base64-js": "1.5.1" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "pako@2.1.0": { + "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==", + "storePath": "oh_modules/.ohpm/pako@2.1.0", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "base64-js@1.5.1": { + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "storePath": "oh_modules/.ohpm/base64-js@1.5.1", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/httpdns-api@1.0.2": { + "integrity": "sha512-p3vd3i4oClAp/rf2RD3vIdKRSisabOB/+K+wYB9nHuf5ZDTw3Yv4o+dLQewm0atqf00JGF3Y0IiwURCpryJX5Q==", + "storePath": "oh_modules/.ohpm/@polyvharmony+httpdns-api@1.0.2", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/media-player-sdk-addon-cache-down@2.5.0": { + "integrity": "sha512-wN6OQaQm65GPL39nVWYx9vRyua6TflbIXddoataxHrlW2Nf7N3PJZjmFW0zaTPC5EyzsnmkRh/4zN2zHvyQDUA==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-sdk-addon-cache-down@2.5.0", + "dependencies": { + "@polyvharmony/media-player-business": "2.5.0", + "@polyvharmony/media-player-foundation": "2.5.0", + "@polyvharmony/media-player-core-ijk": "2.5.0" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/media-player-core-ijk@2.5.0": { + "integrity": "sha512-LieKq0vm8QpTNLzw+QSVRok9xoJV0fDVR4Aw1bRClnpd4Mmb99JvwuW6isCRYsrZJievsxbbNet/qSqjb+OJhw==", + "storePath": "oh_modules/.ohpm/@polyvharmony+media-player-core-ijk@2.5.0", + "dependencies": { + "@polyvharmony/media-player-core-api": "2.5.0", + "@polyvharmony/media-player-foundation": "2.5.0" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, "@itcast/basic@file:commons/basic": { "storePath": "commons/basic", "dependencies": {}, @@ -156,10 +353,22 @@ "dynamic": false, "maskedByOverrideDependencyMap": false }, - "utils@file:commons/utils": { - "storePath": "commons/utils", + "media-player-common@file:polyv": { + "storePath": "polyv", "dependencies": { - "@ohos/crypto-js": "2.0.4" + "@polyvharmony/media-player-sdk": "2.5.0", + "@polyvharmony/media-player-sdk-addon-cache-down": "2.5.0" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "scene_single_video@file:scene_single_video": { + "storePath": "scene_single_video", + "dependencies": { + "media-player-common": "polyv", + "@polyvharmony/media-player-sdk": "2.5.0" }, "dynamicDependencies": {}, "dev": false, @@ -179,7 +388,11 @@ "home@file:features/Home": { "storePath": "features/Home", "dependencies": { - "@itcast/basic": "commons/basic" + "@itcast/basic": "commons/basic", + "@polyvharmony/media-player-sdk": "2.5.0", + "@polyvharmony/media-player-sdk-addon-cache-down": "2.5.0", + "scene_single_video": "scene_single_video", + "media-player-common": "polyv" }, "dynamicDependencies": {}, "dev": false, @@ -195,6 +408,59 @@ "dev": false, "dynamic": false, "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/httpdns-impl-local@1.0.2": { + "integrity": "sha512-KKK1PUmpudmwucbi0uZ+a56Bqryw2HlEI0hiA8mc5LjhLVZ49QxPX3ARZw3Sw/IRasWBvkSXuRpNrA8AuxchKA==", + "storePath": "oh_modules/.ohpm/@polyvharmony+httpdns-impl-local@1.0.2", + "dependencies": { + "@polyvharmony/httpdns-api": "1.0.2" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@polyvharmony/httpdns-impl-ali@1.0.2": { + "integrity": "sha512-DQGPBfTHZyGxcUJRBxRhge2HoXW3aZZjkjqy7KeI9bUXCnltq4dCBwz6GCldtoZduGvJDuv+HogZL3DA8BatvA==", + "storePath": "oh_modules/.ohpm/@polyvharmony+httpdns-impl-ali@1.0.2", + "dependencies": { + "@polyvharmony/httpdns-api": "1.0.2", + "@aliyun/httpdns": "1.1.1" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@aliyun/httpdns@1.1.1": { + "integrity": "sha512-VyjxuvnlOiaijdGRXnK0q4NQO8IX5E2zETap/9JObpS2vjcBWAiok5MxprhoXl9YeAgv70pnOD0M70BqHq8++w==", + "storePath": "oh_modules/.ohpm/@aliyun+httpdns@1.1.1", + "dependencies": { + "@aliyun/logger": "1.0.2", + "@aliyun/error": "1.0.2" + }, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@aliyun/logger@1.0.2": { + "integrity": "sha512-8iRVhBv1GHy1J7swZWDdDghcUzxieOc+Bf9UVUX4n8D99EPFo6GnM97ObfbF6f6JREByQ9YSH+dsxYTFNM5e1g==", + "storePath": "oh_modules/.ohpm/@aliyun+logger@1.0.2", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false + }, + "@aliyun/error@1.0.2": { + "integrity": "sha512-hESGtOCjFmyWRAWjEwJ7izFJsOXDto1DGvOrFO3II6mPEWvpow3UMpYqeBVzLvBUcdFtFkoF/rCEPLHXOK8nmQ==", + "storePath": "oh_modules/.ohpm/@aliyun+error@1.0.2", + "dependencies": {}, + "dynamicDependencies": {}, + "dev": false, + "dynamic": false, + "maskedByOverrideDependencyMap": false } } } \ No newline at end of file diff --git a/products/expert/src/main/ets/pages/BootPage.ets b/products/expert/src/main/ets/pages/BootPage.ets index 72bfcfa..c721450 100644 --- a/products/expert/src/main/ets/pages/BootPage.ets +++ b/products/expert/src/main/ets/pages/BootPage.ets @@ -156,8 +156,9 @@ struct BootPage { } .width('100%') .height('100%') - .backgroundImage(this.photoUrl) - .backgroundImageSize(ImageSize.FILL) + .backgroundImage(this.photoUrl,ImageRepeat.NoRepeat) + .backgroundImageSize(ImageSize.Cover) // 铺满不变形 + .backgroundImagePosition(Alignment.Center) // 居中裁剪 .geometryTransition("boot") .transition(TransitionEffect.OPACITY) } diff --git a/products/expert/src/main/ets/pages/MinePage/CancelAccount.ets b/products/expert/src/main/ets/pages/MinePage/CancelAccount.ets index 81d46ab..79220b4 100644 --- a/products/expert/src/main/ets/pages/MinePage/CancelAccount.ets +++ b/products/expert/src/main/ets/pages/MinePage/CancelAccount.ets @@ -115,9 +115,9 @@ struct CancelAccount { .fontSize(13) .fontColor(Color.White) .width('90%') - .height(45) + .height(44) .backgroundColor('#8B2316') - .borderRadius(3) + .borderRadius(4) .margin(20) .border({ width:1, diff --git a/products/expert/src/main/ets/pages/MinePage/SettingPage.ets b/products/expert/src/main/ets/pages/MinePage/SettingPage.ets index e576538..b7d9e10 100644 --- a/products/expert/src/main/ets/pages/MinePage/SettingPage.ets +++ b/products/expert/src/main/ets/pages/MinePage/SettingPage.ets @@ -36,7 +36,7 @@ struct SettingPage { bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_METADATA ) .then((res) => { - this.version = 'v' + res.versionName + this.version = 'V' + res.versionName }) } @@ -83,12 +83,12 @@ struct SettingPage { if (item=='版本') { Text(this.version) .fontSize(16) - .fontColor($r('app.color.main_color')) + .fontColor(Color.Black) .margin({ right: 10 }) } else if (item == '清除缓存') { Text(this.cache) .fontSize(16) - .fontColor($r('app.color.main_color')) + .fontColor(Color.Black) .margin({ right: 10 }) Image($r('sys.media.ohos_ic_public_arrow_right')) .width(15)