error

diff --git a/2.sdk/gui/lv_watch/CMakeLists.txt b/2.sdk/gui/lv_watch/CMakeLists.txt
index 72c598e..d0d1696 100644 (file)
--- a/2.sdk/gui/lv_watch/CMakeLists.txt
+++ b/2.sdk/gui/lv_watch/CMakeLists.txt
@@ -198,6 +198,7 @@ set(lv_watch_sources
 #CHENG_MODIFY
        mmi_protocol/mmi_protocol_api.c
        mmi_protocol/mmi_protocol_fzd.c
+       mmi_location/mmi_location.c
 #wechat
        lv_apps/wechat/wechat_ui.c
 #primary menu data

diff --git a/2.sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/gui/lv_watch/framework/language/lang_en.c
index 142cece..c6a1854 100644 (file)
--- a/2.sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/gui/lv_watch/framework/language/lang_en.c
@@ -844,8 +844,8 @@ const void * lang_text_en[] = {
     "Wrist temperature",
     "SPO2",
     "Temperature",
-    "℃", // WATCH_TEXT_ID_TEMPERATURE_UNIT
-    
+    "C", // WATCH_TEXT_ID_TEMPERATURE_UNIT ℃
+
     //CHENG_MODIFY
 
 

diff --git a/2.sdk/gui/lv_watch/lv_watch.h b/2.sdk/gui/lv_watch/lv_watch.h
index 4d05543..15911ea 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_watch.h
+++ b/2.sdk/gui/lv_watch/lv_watch.h
@@ -167,6 +167,7 @@ extern "C" {
 
 #ifdef __MMI_ZHSX_SUPPORT__
 
+#include "mmi_location/mmi_location.h"
 #include "mmi_protocol/mmi_protocol_api.h"
 #include "mmi_protocol/mmi_protocol_fzd.h"
 #ifdef __MMI_WECHAT_SUPPORT__

diff --git a/2.sdk/gui/lv_watch/mmi_location/mmi_location.c b/2.sdk/gui/lv_watch/mmi_location/mmi_location.c
index bfd3545..5380241 100644 (file)
--- a/2.sdk/gui/lv_watch/mmi_location/mmi_location.c
+++ b/2.sdk/gui/lv_watch/mmi_location/mmi_location.c
@@ -5,6 +5,12 @@
 
 #ifdef __MMI_ZHSX_SUPPORT__
 
+#if USE_GPS
+#include "../../../../product/craneg_modem/hal/gps_device/inc/gpsnmeaapi.h"
+#endif
+#include "../../modem/mmi_modem_tcp/wifi_scan_task.h"
+
+
 static uint8_t s_watch_location_state = 0; // 0-init; 1-locating
 static MMI_WATCH_LOCATION_STATE_E s_watch_location_gps_state = 0, s_watch_location_cell_state = 0, s_watch_location_wifi_state = 0;
 static MMI_WATCH_LOCATION_DATA_T s_watch_location_data = {0};
@@ -100,13 +106,13 @@ void mmi_watch_location_gps_finsh_cb(void *param)
        if(NULL != param)
        {
                double gpsLon = 0, gpsLat = 0;
-               gpsNmeaDataT *gpsNmeaData = (gpsNmeaDataT *)param;
+               gpsNmeaDataT * gpsNmeaData = (gpsNmeaDataT * )param;
                
                if('A' == gpsNmeaData->NmeaRmcData.Status) 
                {
                        gps2wgs84(gpsNmeaData->NmeaRmcData.Latitude, gpsNmeaData->NmeaRmcData.Longitude, &gpsLat, &gpsLon);
 
-                       s_watch_location_data.gps_data.status = 'A';
+                       s_watch_location_data.gps_data.state = 'A';
                        s_watch_location_data.gps_data.latitude = gpsLat;
                        s_watch_location_data.gps_data.ns = gpsNmeaData->NmeaRmcData.NSIndicator;
                        s_watch_location_data.gps_data.longitude = gpsLon;
@@ -221,7 +227,7 @@ void mmi_watch_location_mission_stop(void)
        s_watch_location_state = 0;
        if(NULL != s_watch_location_timer_id)
        {
-               Hal_Timer_Stop(s_watch_location_timer_id)
+               Hal_Timer_Stop(s_watch_location_timer_id);
                s_watch_location_timer_id = NULL;
        }