update bubble charging

Author: GorgonMeducer

ARM.Arm-2D.pdsc

@@ -375,8 +375,8 @@
             <file category="sourceC"     name="examples/common/scenes/fan/arm_2d_scene_fan.c"   attr="template"  select="Scene Template: Fan"   version="2.1.4" />
             <file category="header"      name="examples/common/scenes/fan/arm_2d_scene_fan.h"   attr="template"  select="Scene Template: Fan"   version="2.1.4" />
 
-            <file category="sourceC"     name="examples/common/scenes/bubble_charging/arm_2d_scene_bubble_charging.c"   attr="template"  select="Scene Template: Bubble Charging"   version="1.1.2" />
-            <file category="header"      name="examples/common/scenes/bubble_charging/arm_2d_scene_bubble_charging.h"   attr="template"  select="Scene Template: Bubble Charging"   version="1.1.2" />
+            <file category="sourceC"     name="examples/common/scenes/bubble_charging/arm_2d_scene_bubble_charging.c"   attr="template"  select="Scene Template: Bubble Charging"   version="1.2.0" />
+            <file category="header"      name="examples/common/scenes/bubble_charging/arm_2d_scene_bubble_charging.h"   attr="template"  select="Scene Template: Bubble Charging"   version="1.2.0" />
 
             <file category="sourceC"     name="examples/common/scenes/animate_background/arm_2d_scene_animate_background.c"       attr="template"  select="Scene Template: Animate Background"   version="1.1.2" />
             <file category="sourceC"     name="examples/common/scenes/animate_background/arm_2d_scene_animate_background_vres.c"  attr="template"  select="Scene Template: Animate Background"   version="1.1.2" />

examples/common/scenes/bubble_charging/arm_2d_scene_bubble_charging.c

@@ -189,13 +189,6 @@ static void __on_scene_bubble_charging_frame_complete(arm_2d_scene_t *ptScene)
 
     arm_2dp_filter_iir_blur_depose(&this.tBlurOP);
 
-#if 0
-    /* switch to next scene after 30s */
-    if (arm_2d_helper_is_time_out(30000, &this.lTimestamp[0])) {
-        arm_2d_scene_player_switch_to_next_scene(ptScene->ptPlayer);
-    }
-#endif
-
 }
 
 static void __before_scene_bubble_charging_switching_out(arm_2d_scene_t *ptScene)
@@ -266,26 +259,34 @@ IMPL_PFB_ON_DRAW(__pfb_draw_scene_bubble_charging_handler)
                                     (__arm_2d_color_t) {GLCD_COLOR_WHITE},
                                     255);
 
-        }
+        
+            ARM_2D_OP_WAIT_ASYNC();
 
-        arm_2d_size_t tStringSize = arm_lcd_get_string_line_box("000", &ARM_2D_FONT_ALARM_CLOCK_32_A4);
+            arm_2d_size_t tStringSize = 
+                arm_lcd_printf_to_buffer(   (const arm_2d_font_t *)&ARM_2D_FONT_ALARM_CLOCK_32_A4, 
+                                            "%02d",
+                                            (this.iSoC / 10));
 
-        arm_2d_align_centre_open(__charging_canvas, tStringSize) {
+            arm_2d_align_centre_open(__centre_region, tStringSize) {
 
-            arm_lcd_text_set_target_framebuffer((arm_2d_tile_t *)ptTile);
-            arm_lcd_text_set_draw_region(&__centre_region);
-            arm_lcd_text_set_font((const arm_2d_font_t *)&ARM_2D_FONT_ALARM_CLOCK_32_A4);
-            arm_lcd_text_set_colour(GLCD_COLOR_WHITE, GLCD_COLOR_BLACK);
+                __arm_2d_hint_optimize_for_pfb__(__centre_region) {
+                    arm_lcd_text_set_target_framebuffer((arm_2d_tile_t *)ptTile);
+                    arm_lcd_text_set_draw_region(&__centre_region);
+                    arm_lcd_text_set_colour(GLCD_COLOR_WHITE, GLCD_COLOR_BLACK);
 
-            arm_lcd_printf("%02d", (this.iSoC / 10));
+                    arm_lcd_printf_buffer(0);
+                }
 
-            arm_lcd_text_set_font(NULL);
-            
-            __centre_region.tLocation.iX += tStringSize.iWidth + 6;
-            __centre_region.tLocation.iY += tStringSize.iHeight - 8;
-            arm_lcd_text_set_draw_region(&__centre_region);
-            arm_lcd_text_set_colour(__RGB(0, 128, 0), GLCD_COLOR_BLACK);
-            arm_lcd_printf("%%");
+                __centre_region.tLocation.iX += tStringSize.iWidth + 6;
+                __centre_region.tLocation.iY += tStringSize.iHeight - 8;
+
+                __arm_2d_hint_optimize_for_pfb__(__centre_region) {
+                    arm_lcd_text_set_font(NULL);
+                    arm_lcd_text_set_draw_region(&__centre_region);
+                    arm_lcd_text_set_colour(__RGB(0, 128, 0), GLCD_COLOR_BLACK);
+                    arm_lcd_printf("%%");
+                }
+            }
         }
     #endif