Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	3.code/1.watch/2.code/ui_setting.py

diff --cc 2.sdk/Helios_SDK/services/microPython/lib/lvgl/lv_conf.h
index 4f2f63e,4f2f63e..9607f96
--- 1/2.sdk/Helios_SDK/services/microPython/lib/lvgl/lv_conf.h
--- 2/2.sdk/Helios_SDK/services/microPython/lib/lvgl/lv_conf.h
+++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/lv_conf.h
@@@ -227,7 -227,7 +227,7 @@@
  #elif defined(BOARD_EC800MCN_GA_ALIPAY) 
  #define LV_IMG_CACHE_DEF_SIZE       16
  #elif defined(BOARD_EG810MCN_GA_ALIPAY)
--#define LV_IMG_CACHE_DEF_SIZE       20
++#define LV_IMG_CACHE_DEF_SIZE       30
  #else
  #define LV_IMG_CACHE_DEF_SIZE       1
  #endif

diff --cc 3.code/1.watch/2.code/main_1.py
Simple merge

diff --cc 3.code/1.watch/2.code/ui.py
Simple merge

diff --cc 3.code/1.watch/2.code/ui_setting.py
index 9514adb,37dcc48..b4bebf3
--- 1/3.code/1.watch/2.code/ui_setting.py
--- 2/3.code/1.watch/2.code/ui_setting.py
+++ b/3.code/1.watch/2.code/ui_setting.py
@@@ -1272,10 -992,13 +992,13 @@@ class BrightnessScreen(Screen)
  
      def show_bar(self):
          if self.level == None:
 -            self.level = 5
 +            self.level = 6
-         brightness_bar.set_value((100 // 10) * self.level, lv.ANIM.OFF)
+         self.brightness_bar.set_value((100 // 10) * self.level, lv.ANIM.OFF)
  
-     
+     def Close(self):
+         self.meta.delete()
+         self.meta = None
+         
      def done_return(self):
          EventMesh.publish("load_screen", {"screen": "setting"})
  
@@@ -1498,8 -1381,60 +1381,60 @@@ class totalvolumeScreen(Screen)
          self.aud.set_pa(Pin.GPIO29)
          
      def initialization(self):
+         #-----------------------------------------Total--volum-------------------------------
+         if self.meta == None:
+             self.meta = lv.obj()
+             self.volume_adjust_volume = lv.obj(self.meta)
+             self.volume_adjust_volume.center()
+             self.volume_adjust_volume.set_size(240, 320)
+             self.volume_adjust_volume.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+ 
+             self.totalvolume_title = lv.label(self.volume_adjust_volume)
+             self.totalvolume_title.set_pos(0, 10)
+             self.totalvolume_title.set_size(240, 40)
+             self.totalvolume_title.set_text("铃声调节")
+             self.totalvolume_title.set_long_mode(lv.label.LONG.WRAP)
+             self.totalvolume_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+             self.totalvolume_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+ 
+             self.totalvolume_label1 = lv.label(self.volume_adjust_volume)
+             self.totalvolume_label1.set_pos(10, 70)
+             self.totalvolume_label1.set_size(230, 40)
+             self.totalvolume_label1.set_text("铃声:")
+             self.totalvolume_label1.set_long_mode(lv.label.LONG.WRAP)
+             self.totalvolume_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+             self.totalvolume_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+ 
+             self.totalvolume_bar = lv.bar(self.volume_adjust_volume)
+             self.totalvolume_bar.set_pos(20, 120)
+             self.totalvolume_bar.set_size(200, 15)
+             self.totalvolume_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT)
+             self.totalvolume_bar.set_mode(lv.bar.MODE.NORMAL)
+             self.totalvolume_bar.set_value(50, lv.ANIM.OFF)
+             self.totalvolume_bar.add_style(style_bar, lv.PART.MAIN | lv.STATE.DEFAULT)
+             self.totalvolume_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT)
+ 
+             self.totalvolume_reduce_imgbtn = lv.img(self.volume_adjust_volume)
+             self.totalvolume_reduce_imgbtn.set_pos(5, 150)
+             self.totalvolume_reduce_imgbtn.set_size(110, 46)
+             self.totalvolume_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+             self.totalvolume_reduce_imgbtn.set_src("E:/static/reduce_btn.png")
+             self.totalvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+ 
+ 
+             self.totalvolume_add_imgbtn = lv.img(self.volume_adjust_volume)
+             self.totalvolume_add_imgbtn.set_pos(125, 150)
+             self.totalvolume_add_imgbtn.set_size(110, 46)
+             self.totalvolume_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+             self.totalvolume_add_imgbtn.set_src("E:/static/add_btn.png")
+             self.totalvolume_add_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+             self.totalvolume_add_imgbtn.add_event_cb(lambda e: self.add_volum_size(e),
+                                      lv.EVENT.CLICKED, None)
+             self.totalvolume_reduce_imgbtn.add_event_cb(lambda e: self.reduce_volum_size(e),
+                                             lv.EVENT.CLICKED, None)
+ 
          self.read_data = EventMesh.publish("get_storage_data")
 -        print("self.read_data:{}".format(self.read_data))
 +        # print("self.read_data:{}".format(self.read_data))
          num = EventMesh.publish("get_volum_size")
          if num == None:
              self.volum_size = 8