diff --git a/README.en.md b/README.en.md index e61b1a7a55a0033018eb8d51e9ad5ba8c9104d9b..8e038de94aacc0b6d4b2dba80225dc9460b1b833 100644 --- a/README.en.md +++ b/README.en.md @@ -4,7 +4,7 @@ Learn how to customize a prize wheel based on the canvas component. Example: -![image](screenshots/device/canvas_en.gif) + ### Concepts @@ -26,6 +26,6 @@ N/A ### Constraints 1. The sample is only supported on Huawei phones with standard systems. -2. HarmonyOS: HarmonyOS NEXT Developer Beta1 or later. -3. DevEco Studio: DevEco Studio NEXT Developer Beta1 or later. -4. HarmonyOS SDK: HarmonyOS NEXT Developer Beta1 SDK or later. \ No newline at end of file +2. HarmonyOS: HarmonyOS 5.0.0 Release or later. +3. DevEco Studio: DevEco Studio 5.0.0 Release or later. +4. HarmonyOS SDK: HarmonyOS 5.0.0 Release SDK or later. \ No newline at end of file diff --git a/README.md b/README.md index 46cfdd4f3c5c520732c59e08bd5121c381849cb6..849cf6e390371ce04f12f23b7fe51f32cc8920ae 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 基于画布组件，实现自定义抽奖转盘功能。效果如图所示： -![image](screenshots/device/canvas.gif) + ### 相关概念 @@ -26,6 +26,6 @@ ### 约束与限制 1. 本示例仅支持标准系统上运行，支持设备：华为手机。 -2. HarmonyOS系统：HarmonyOS NEXT Developer Beta1及以上。 -3. DevEco Studio版本：DevEco Studio NEXT Developer Beta1及以上。 -4. HarmonyOS SDK版本：HarmonyOS NEXT Developer Beta1 SDK及以上。 +2. HarmonyOS系统：HarmonyOS 5.0.0 Release及以上。 +3. DevEco Studio版本：DevEco Studio 5.0.0 Release及以上。 +4. HarmonyOS SDK版本：HarmonyOS 5.0.0 Release SDK及以上。 diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets index 5e4cb13622b5e4b6924a72affd1f2147c2b8243c..8ef9642a13d3a9207f2673385607c7746d8266a2 100644 --- a/entry/src/main/ets/common/constants/CommonConstants.ets +++ b/entry/src/main/ets/common/constants/CommonConstants.ets @@ -32,11 +32,6 @@ export default class CommonConstants { */ static readonly CAKE_IMAGE_URL: string = 'resources/base/media/ic_cake.png'; - /** - * Beer image url. - */ - static readonly BEER_IMAGE_URL: string = 'resources/base/media/ic_beer.png'; - /** * Smile image url. */ diff --git a/entry/src/main/ets/viewmodel/DrawModel.ets b/entry/src/main/ets/viewmodel/DrawModel.ets index 30ba0b41c2fea166bad721fad890860ecca0c8b7..e24475a8dfbcd5dc358db3c7452016ff143eee85 100644 --- a/entry/src/main/ets/viewmodel/DrawModel.ets +++ b/entry/src/main/ets/viewmodel/DrawModel.ets @@ -171,7 +171,7 @@ export default class DrawModel { $r('app.string.text_hamburger'), $r('app.string.text_cake'), $r('app.string.text_smile'), - $r('app.string.text_beer'), + $r('app.string.text_hamburger'), $r('app.string.text_watermelon') ]; let arcTextStartAngle = CommonConstants.ARC_START_ANGLE; @@ -255,7 +255,7 @@ export default class DrawModel { drawImage() { let beginAngle = this.startAngle; let imageSrc = [ - CommonConstants.WATERMELON_IMAGE_URL, CommonConstants.BEER_IMAGE_URL, + CommonConstants.WATERMELON_IMAGE_URL, CommonConstants.HAMBURG_IMAGE_URL, CommonConstants.SMILE_IMAGE_URL, CommonConstants.CAKE_IMAGE_URL, CommonConstants.HAMBURG_IMAGE_URL, CommonConstants.SMILE_IMAGE_URL ]; @@ -297,10 +297,6 @@ export default class DrawModel { prizeData.message = $r('app.string.prize_text_watermelon'); prizeData.imageSrc = CommonConstants.WATERMELON_IMAGE_URL; break; - case EnumeratedValue.TWO: - prizeData.message = $r('app.string.prize_text_beer'); - prizeData.imageSrc = CommonConstants.BEER_IMAGE_URL; - break; case EnumeratedValue.THREE: prizeData.message = $r('app.string.prize_text_smile'); prizeData.imageSrc = CommonConstants.SMILE_IMAGE_URL; @@ -309,6 +305,7 @@ export default class DrawModel { prizeData.message = $r('app.string.prize_text_cake'); prizeData.imageSrc = CommonConstants.CAKE_IMAGE_URL; break; + case EnumeratedValue.TWO: case EnumeratedValue.FIVE: prizeData.message = $r('app.string.prize_text_hamburger'); prizeData.imageSrc = CommonConstants.HAMBURG_IMAGE_URL; diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index c51979bd45f7fc986449bf729b6644074c386923..bdd35d6d6cf9384aea9d4d6b07312c055d3de1e2 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -28,10 +28,6 @@ "name": "text_cake", "value": "Cake" }, - { - "name": "text_beer", - "value": "Beer" - }, { "name": "text_watermelon", "value": "Watermelon" @@ -48,10 +44,7 @@ "name": "prize_text_cake", "value": "Congratulations, you won the prize cake" }, - { - "name": "prize_text_beer", - "value": "Congratulations, you won the prize beer" - }, + { "name": "prize_text_watermelon", "value": "Congratulations, you won the prize watermelon" diff --git a/entry/src/main/resources/base/media/ic_beer.png b/entry/src/main/resources/base/media/ic_beer.png deleted file mode 100644 index 58c50e1b8c69303f362c5b55654591a15f9f2c1c..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/ic_beer.png and /dev/null differ diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 1540bf640ff78c399d533958ffb33b1b887d65ad..da56199ae457048b1f7016aae88d72912517a18a 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -28,10 +28,6 @@ "name": "text_cake", "value": "Cake" }, - { - "name": "text_beer", - "value": "Beer" - }, { "name": "text_watermelon", "value": "Melon" @@ -48,10 +44,6 @@ "name": "prize_text_cake", "value": "Congratulations, you won the prize cake" }, - { - "name": "prize_text_beer", - "value": "Congratulations, you won the prize beer" - }, { "name": "prize_text_watermelon", "value": "Congratulations, you won the prize watermelon" diff --git a/entry/src/main/resources/en_US/media/ic_center.png b/entry/src/main/resources/en_US/media/ic_center.png new file mode 100644 index 0000000000000000000000000000000000000000..bd8ec77af9401339feb089c80fbfe1e55d9d82f3 Binary files /dev/null and b/entry/src/main/resources/en_US/media/ic_center.png differ diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 2d538054545743d845325a78b72ca270708166ea..ba0c5f4114073f88394339af0a60d9d2088e2747 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -28,10 +28,6 @@ "name": "text_cake", "value": "蛋糕" }, - { - "name": "text_beer", - "value": "啤酒" - }, { "name": "text_watermelon", "value": "西瓜" @@ -48,10 +44,6 @@ "name": "prize_text_cake", "value": "恭喜您，抽中奖品蛋糕" }, - { - "name": "prize_text_beer", - "value": "恭喜您，抽中奖品啤酒" - }, { "name": "prize_text_watermelon", "value": "恭喜您，抽中奖品西瓜" diff --git a/entry/src/main/resources/zh_CN/media/ic_center.png b/entry/src/main/resources/zh_CN/media/ic_center.png new file mode 100644 index 0000000000000000000000000000000000000000..bce4ee2932839ccb0be0eec31830ef1bfdf1e7d8 Binary files /dev/null and b/entry/src/main/resources/zh_CN/media/ic_center.png differ diff --git a/screenshots/device/canvas.gif b/screenshots/device/canvas.gif index 54d614a5c1e70677b0136faba5348fd875ef125f..a5c0da625cd44979674f10723f6d068ffb3f0d7b 100644 Binary files a/screenshots/device/canvas.gif and b/screenshots/device/canvas.gif differ diff --git a/screenshots/device/canvas_en.gif b/screenshots/device/canvas_en.gif index a388d5e72065c11f1af2d08c44e0bfdd0893a6b2..1ca57610a9570504a8cbbddd46cd9815508fb4e7 100644 Binary files a/screenshots/device/canvas_en.gif and b/screenshots/device/canvas_en.gif differ