From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 25 Sep 2023 07:23:52 +0000 (+0800)
Subject: Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0aa1df316b79ee20add370414e411f8acc8baa15;p=mirrors%2FASR1603_G5.git

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

# Conflicts:
#	2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
#	2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
---

0aa1df316b79ee20add370414e411f8acc8baa15
diff --cc 2.sdk/Helios_SDK/config/autoconf.h
index 26766385,26766385..384631ad
--- a/2.sdk/Helios_SDK/config/autoconf.h
+++ b/2.sdk/Helios_SDK/config/autoconf.h
@@@ -4,7 -4,7 +4,6 @@@
   * Helios SDK Configuration
   *
   */
--#define PROJECT_NAME_G3_K01  1  //项目宏定义
  #define CONFIG_LVGL_SPAN 1
  #define CONFIG_LVGL_FS_HELIOS 1
  #define CONFIG_LVGL_GIF_DECODE 1
@@@ -27,7 -27,7 +26,7 @@@
  #define CONFIG_LVGL_JPG_DECODE 1
  #define CONFIG_LVGL_PNG_DECODE 1
  #define CONFIG_LVGL_IMGBTN 1
--//#define CONFIG_GH301x 1
++#define CONFIG_GH301x 1
  #define CONFIG_MBEDTLS 1
  #define CONFIG_SC7A20 1
  #define CONFIG_LVGL_WIN 1
@@@ -37,6 -37,6 +36,3 @@@
  #define CONFIG_LVGL_QRCODE 1
  #define CONFIG_LVGL_TILEVIEW 1
  #define CONFIG_LVGL_HANDLER_TASK_PRIORITY 80
--#define CONFIG_CAMERA 1
--#define CONFIG_JPEG 1
--#define CONFIG_CAMERA_SAVEPHOTOS 1
diff --cc 2.sdk/Helios_SDK/config/config.mk
index bf69c97c,bf69c97c..aa98ec62
--- a/2.sdk/Helios_SDK/config/config.mk
+++ b/2.sdk/Helios_SDK/config/config.mk
@@@ -2,14 -2,14 +2,14 @@@
  # Automatically generated file; DO NOT EDIT.
  # Helios SDK Configuration
  #
--PROJECT_NAME_G3_K01=y
++
  #
  # System Configuration
  #
  CONFIG_MBEDTLS=y
  
  #
--# EG810MCN_GA_VOLTE
++# EG810MCN_GA_ALIPAY
  #
  CONFIG_LVGL=y
  
@@@ -46,19 -46,19 +46,16 @@@ CONFIG_LVGL_KEYBOARD=
  CONFIG_LVGL_SPAN=y
  CONFIG_LVGL_HANDLER_TASK_PRIORITY=80
  # CONFIG_QRCODE is not set
--CONFIG_CAMERA=y
--# CONFIG_CAMERA_DECODE is not set
--CONFIG_CAMERA_SAVEPHOTOS=y
++# CONFIG_CAMERA is not set
  # CONFIG_QUECTHING is not set
  # CONFIG_SPINAND is not set
  # CONFIG_RTMP is not set
--CONFIG_JPEG=y
++# CONFIG_JPEG is not set
  # CONFIG_SPI_SDCARD is not set
  CONFIG_VIOCE_CALL=y
  # CONFIG_TTS is not set
  CONFIG_LCD=y
  # CONFIG_UART_SLIP is not set
  # CONFIG_POC is not set
--#CONFIG_GH301x=y
++CONFIG_GH301x=y
  CONFIG_SC7A20=y
--
diff --cc 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index 707aa8aa,388279e4..d8b574e2
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@@ -730,10 -687,16 +687,15 @@@ class intervManager(Abstract)
              if step != 0:
                  EventMesh.publish("set_storage_config",["old_step",step])
              date_tmp = utime.localtime()
 -            time_tmp = utime.mktime(date_tmp) 
 +            time_tmp = utime.mktime(date_tmp)
              EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
 -
+             str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_POWER_OFF_1"))
              
-             self.pwk_timer1.start(3000,0,self.power_off_audio_cb)
+             EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+             EventMesh.publish("set_led_time_arg",[1,2,4*8,led_mode.FLASH_LIGHT_RED,4,2,led_mode.OTHER_MEASURE_MODE])#
+             self.power_off = 1
+             # EventMesh.publish("set_led_time_arg",[1000,200,10,led_mode.FLASH_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#
+             self.timer.start(6000,0,self.publish_power_down_event_cb)
          elif msg == 3:
              flag = EventMesh.publish("get_call_state") 
              if flag != 0:#电话呼叫中