From: dxy15521469561 <1731678236@qq.com>
Date: Wed, 27 Sep 2023 08:43:46 +0000 (+0800)
Subject: K5：
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=9e97aa2fb4e69af4e09899dba86825215f327020;p=mirrors%2FASR1603_G5.git

K5：
天气温度显示小数点的问题
---

diff --git a/2.sdk/project/D10/audio/R_ALARM_NEW.mp3 b/2.sdk/project/D10/audio/R_ALARM_NEW.mp3
new file mode 100644
index 00000000..3fd8ed2c
Binary files /dev/null and b/2.sdk/project/D10/audio/R_ALARM_NEW.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_CALL_mp3.mp3 b/2.sdk/project/D10/audio/R_CALL_mp3.mp3
new file mode 100644
index 00000000..7c892e18
Binary files /dev/null and b/2.sdk/project/D10/audio/R_CALL_mp3.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_CHARGE_FULL.mp3 b/2.sdk/project/D10/audio/R_CHARGE_FULL.mp3
new file mode 100644
index 00000000..73dac2b8
Binary files /dev/null and b/2.sdk/project/D10/audio/R_CHARGE_FULL.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_CHARGE_IN.mp3 b/2.sdk/project/D10/audio/R_CHARGE_IN.mp3
new file mode 100644
index 00000000..59620b2d
Binary files /dev/null and b/2.sdk/project/D10/audio/R_CHARGE_IN.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_CHARGE_OUT.mp3 b/2.sdk/project/D10/audio/R_CHARGE_OUT.mp3
new file mode 100644
index 00000000..5693eff5
Binary files /dev/null and b/2.sdk/project/D10/audio/R_CHARGE_OUT.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_HSENSOR_RESULT_FAILE.mp3 b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_FAILE.mp3
new file mode 100644
index 00000000..601827a7
Binary files /dev/null and b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_FAILE.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_HSENSOR_RESULT_HR_TITLE.mp3 b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_HR_TITLE.mp3
new file mode 100644
index 00000000..0b21c968
Binary files /dev/null and b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_HR_TITLE.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_HSENSOR_RESULT_OK.mp3 b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_OK.mp3
new file mode 100644
index 00000000..76e355a9
Binary files /dev/null and b/2.sdk/project/D10/audio/R_HSENSOR_RESULT_OK.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_HSENSOR_SPO2_TITLE.mp3 b/2.sdk/project/D10/audio/R_HSENSOR_SPO2_TITLE.mp3
new file mode 100644
index 00000000..30b29df6
Binary files /dev/null and b/2.sdk/project/D10/audio/R_HSENSOR_SPO2_TITLE.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_HSENSOR_TEMP_TITLE.mp3 b/2.sdk/project/D10/audio/R_HSENSOR_TEMP_TITLE.mp3
new file mode 100644
index 00000000..fab935e2
Binary files /dev/null and b/2.sdk/project/D10/audio/R_HSENSOR_TEMP_TITLE.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_NO_SET_SOS_DIAL.mp3 b/2.sdk/project/D10/audio/R_NO_SET_SOS_DIAL.mp3
new file mode 100644
index 00000000..ecc9acdc
Binary files /dev/null and b/2.sdk/project/D10/audio/R_NO_SET_SOS_DIAL.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_NO_SIM.mp3 b/2.sdk/project/D10/audio/R_NO_SIM.mp3
new file mode 100644
index 00000000..c3dd2de8
Binary files /dev/null and b/2.sdk/project/D10/audio/R_NO_SIM.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_POWER_OFF_1.mp3 b/2.sdk/project/D10/audio/R_POWER_OFF_1.mp3
new file mode 100644
index 00000000..3ff519d1
Binary files /dev/null and b/2.sdk/project/D10/audio/R_POWER_OFF_1.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_STEP_0.mp3 b/2.sdk/project/D10/audio/R_READ_STEP_0.mp3
new file mode 100644
index 00000000..cd947eb5
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_STEP_0.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_STEP_1.mp3 b/2.sdk/project/D10/audio/R_READ_STEP_1.mp3
new file mode 100644
index 00000000..f2da3323
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_STEP_1.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_STEP_2.mp3 b/2.sdk/project/D10/audio/R_READ_STEP_2.mp3
new file mode 100644
index 00000000..f2973190
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_STEP_2.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_STEP_3.mp3 b/2.sdk/project/D10/audio/R_READ_STEP_3.mp3
new file mode 100644
index 00000000..e9aa0071
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_STEP_3.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_STEP_4.mp3 b/2.sdk/project/D10/audio/R_READ_STEP_4.mp3
new file mode 100644
index 00000000..303efb85
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_STEP_4.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_0.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_0.mp3
new file mode 100644
index 00000000..dd4d91dc
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_0.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_1.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_1.mp3
new file mode 100644
index 00000000..79bc5a29
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_1.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_2.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_2.mp3
new file mode 100644
index 00000000..7e610923
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_2.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_3.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_3.mp3
new file mode 100644
index 00000000..e91e1f35
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_3.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_4.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_4.mp3
new file mode 100644
index 00000000..699e9cf9
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_4.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_5.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_5.mp3
new file mode 100644
index 00000000..23e7e1bb
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_5.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_6.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_6.mp3
new file mode 100644
index 00000000..5b6a54b7
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_6.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_7.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_7.mp3
new file mode 100644
index 00000000..895d4e34
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_7.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_8.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_8.mp3
new file mode 100644
index 00000000..33a6c81b
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_8.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_9.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_9.mp3
new file mode 100644
index 00000000..7eaaa075
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_9.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_MIN.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_MIN.mp3
new file mode 100644
index 00000000..e163941e
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_MIN.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_READ_TIME_ZHENG.mp3 b/2.sdk/project/D10/audio/R_READ_TIME_ZHENG.mp3
new file mode 100644
index 00000000..3b56052f
Binary files /dev/null and b/2.sdk/project/D10/audio/R_READ_TIME_ZHENG.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_SIM_CONNECT.mp3 b/2.sdk/project/D10/audio/R_SIM_CONNECT.mp3
new file mode 100644
index 00000000..c3f5b3eb
Binary files /dev/null and b/2.sdk/project/D10/audio/R_SIM_CONNECT.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_SIM_FAILE.mp3 b/2.sdk/project/D10/audio/R_SIM_FAILE.mp3
new file mode 100644
index 00000000..f807a04f
Binary files /dev/null and b/2.sdk/project/D10/audio/R_SIM_FAILE.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_SOS_ALERT.mp3 b/2.sdk/project/D10/audio/R_SOS_ALERT.mp3
new file mode 100644
index 00000000..841aab32
Binary files /dev/null and b/2.sdk/project/D10/audio/R_SOS_ALERT.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_TSENSOR_RESULT_VALUE_DOT.mp3 b/2.sdk/project/D10/audio/R_TSENSOR_RESULT_VALUE_DOT.mp3
new file mode 100644
index 00000000..4fd10a0b
Binary files /dev/null and b/2.sdk/project/D10/audio/R_TSENSOR_RESULT_VALUE_DOT.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_UNREAD_WECHAT.mp3 b/2.sdk/project/D10/audio/R_UNREAD_WECHAT.mp3
new file mode 100644
index 00000000..1cdf0dc1
Binary files /dev/null and b/2.sdk/project/D10/audio/R_UNREAD_WECHAT.mp3 differ
diff --git a/2.sdk/project/D10/audio/R_WECHAT_RECV.mp3 b/2.sdk/project/D10/audio/R_WECHAT_RECV.mp3
new file mode 100644
index 00000000..3d263dbb
Binary files /dev/null and b/2.sdk/project/D10/audio/R_WECHAT_RECV.mp3 differ
diff --git a/2.sdk/project/D10/audio/audio_audio_haixiu.mp3 b/2.sdk/project/D10/audio/audio_audio_haixiu.mp3
new file mode 100644
index 00000000..5ef7a933
Binary files /dev/null and b/2.sdk/project/D10/audio/audio_audio_haixiu.mp3 differ
diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
index 63504778..55b97e97 100644
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
@@ -3915,6 +3915,7 @@ class WeatherScreen(Screen):
 
                     temp = self.weather_data[4]
                     if temp == None:
+                        no_weather_degree.set_pos(88, 15)
                         weather_tem_label.set_text("_ _")
                     else:
                         if len(temp) > 2:
@@ -3938,6 +3939,7 @@ class WeatherScreen(Screen):
                         no_connect_label.set_text("--")
                 else:#已联网未获取到天气数据
                     # no_connect_label.set_text(" ")
+                    no_weather_degree.set_pos(88, 15)
                     weather_detail_label.set_text("-/-")
                     weather_tem_label.set_text("_ _")
                     no_weather_degree.set_pos(88, 15)
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
index 71c208a0..0174a460 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -2094,7 +2094,7 @@ class LocationManager(Abstract):
                         #gnss_r_data = [0,1]
                         gnss_r_data = quecgnss.read(4096)
                         #EventMesh.txt_log("gps Datalen:{}".format(gnss_r_data[0]))
-                        print("location gnss_r_data:len{}\n{}".format(gnss_r_data[0],gnss_r_data[1].decode()))
+                        # print("location gnss_r_data:len{}\n{}".format(gnss_r_data[0],gnss_r_data[1].decode()))
                         #print("gnss_r_data len:{}".format(gnss_r_data[0]))
                         if gnss_r_data[0] > 0 : #有数据
                             tmp_ok_count = 0
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index 27fde64a..1b30e586 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -3737,8 +3737,13 @@ class WeatherScreen(Screen):
 
                     temp = self.weather_data[4]
                     if temp == None:
+                        no_weather_degree.set_pos(200, 40)
                         weather_tem_label.set_text("_ _")
                     else:
+                        if len(temp) > 2:
+                            no_weather_degree.set_pos(218, 40)
+                        else:
+                            no_weather_degree.set_pos(200, 40)
                         weather_tem_label.set_text("{}".format(temp))
 
                     date = self.weather_data[0]
@@ -3755,6 +3760,7 @@ class WeatherScreen(Screen):
                     else:
                         weather_location_label.set_text("--")
                 else:#已联网未获取到天气数据
+                    no_weather_degree.set_pos(200, 40)
                     weather_location_label.set_text(" ")
                     weather_detail_label.set_text("-/-")
                     weather_tem_label.set_text("_ _")
@@ -3763,6 +3769,7 @@ class WeatherScreen(Screen):
                     no_connect_label1.set_text("请稍候重试")
 
             else:
+                no_weather_degree.set_pos(200, 40)
                 weather_location_label.set_text(" ")
                 weather_detail_label.set_text("-/-")
                 weather_tem_label.set_text("_ _")