Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main
* 'main' of http://192.168.1.42/developOne/harmonyPool: ref |> 更新启动页,启动广告页,登录页,关于页人民日报logo
Showing
7 changed files
with
7 additions
and
7 deletions
| @@ -61,9 +61,9 @@ export struct AboutPageUI { | @@ -61,9 +61,9 @@ export struct AboutPageUI { | ||
| 61 | CustomTitleUI({titleName:'关于',percent:this.percent}) | 61 | CustomTitleUI({titleName:'关于',percent:this.percent}) |
| 62 | 62 | ||
| 63 | Image($r('app.media.setting_about_logo')) | 63 | Image($r('app.media.setting_about_logo')) |
| 64 | - .width(`${this.calcHeight(278)}lpx`) | ||
| 65 | - .height(`${this.calcHeight(154)}lpx`) | ||
| 66 | - .margin({ top: `${this.calcHeight2(173)}lpx`, bottom: `${this.calcHeight2(154)}lpx` }) | 64 | + .width(`${this.calcHeight(376)}lpx`) |
| 65 | + .height(`${this.calcHeight(160)}lpx`) | ||
| 66 | + .margin({ top: `${this.calcHeight2(180)}lpx`, bottom: `${this.calcHeight2(160)}lpx` }) | ||
| 67 | .gesture( | 67 | .gesture( |
| 68 | TapGesture({ count: 2 }) | 68 | TapGesture({ count: 2 }) |
| 69 | .onAction((event: GestureEvent) => { | 69 | .onAction((event: GestureEvent) => { |
| @@ -151,7 +151,7 @@ struct LoginPage { | @@ -151,7 +151,7 @@ struct LoginPage { | ||
| 151 | //注册内容 | 151 | //注册内容 |
| 152 | Column() { | 152 | Column() { |
| 153 | Image($r("app.media.login_logo")) | 153 | Image($r("app.media.login_logo")) |
| 154 | - .width(120) | 154 | + .width(155) |
| 155 | .height(66) | 155 | .height(66) |
| 156 | .margin({ top: 78 + px2vp(this.topSafeHeight) }) | 156 | .margin({ top: 78 + px2vp(this.topSafeHeight) }) |
| 157 | .align(Alignment.Center) | 157 | .align(Alignment.Center) |
| @@ -91,7 +91,7 @@ struct OneKeyLoginPage { | @@ -91,7 +91,7 @@ struct OneKeyLoginPage { | ||
| 91 | this.CloseRow() | 91 | this.CloseRow() |
| 92 | 92 | ||
| 93 | Image($r("app.media.login_logo")) | 93 | Image($r("app.media.login_logo")) |
| 94 | - .width(120) | 94 | + .width(155) |
| 95 | .height(66) | 95 | .height(66) |
| 96 | .margin({ top: 34, bottom: 64}) | 96 | .margin({ top: 34, bottom: 64}) |
| 97 | .align(Alignment.Center) | 97 | .align(Alignment.Center) |
| @@ -166,8 +166,8 @@ struct LaunchPage { | @@ -166,8 +166,8 @@ struct LaunchPage { | ||
| 166 | 166 | ||
| 167 | Stack({alignContent:Alignment.Bottom}){ | 167 | Stack({alignContent:Alignment.Bottom}){ |
| 168 | Image($r('app.media.LaunchPage_logo')) | 168 | Image($r('app.media.LaunchPage_logo')) |
| 169 | - .width(150) | ||
| 170 | - .height(72) | 169 | + .width(188) |
| 170 | + .height(80) | ||
| 171 | .objectFit(ImageFit.Auto) | 171 | .objectFit(ImageFit.Auto) |
| 172 | .margin({ | 172 | .margin({ |
| 173 | bottom:24 | 173 | bottom:24 |
-
Please register or login to post a comment