关于手表增加cat1信息

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
index 9d93740..d9a79b8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
@@ -94,7 +94,10 @@ namespace OHOS
         gsenson_t t;
         get_gsonsen_xyz(&t);
         char buf[124]={0};
-        sprintf(buf,"X:%d\nY:%d\nZ:%d",t.x,t.y,t.z);
+        float x_t=t.x/1024.0;
+        float y_t=t.y/1024.0;
+        float z_t=t.z/1024.0;
+        sprintf(buf,"X:%3f\nY:%3f\nZ:%3f",x_t,y_t,z_t);
         x->SetText(buf);
         RootView::GetInstance()->Invalidate();
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
index 09b40ef..6521e90 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
@@ -47,6 +47,13 @@ namespace OHOS
         UILabel *LANAddress = nullptr;\r
         UILabel *FONTTitle = nullptr;\r
         UILabel *FONT = nullptr;\r
+\r
+        UILabel *CAT1Title = nullptr;\r
+        UILabel *CAT1mode = nullptr;\r
+\r
+        UILabel *pyTitle = nullptr;\r
+        UILabel *pymode = nullptr;\r
+\r
         bool initViewStatus{false};\r
     };\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index 0642e93..56cfa2b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -2,6 +2,7 @@
 #include "system/include/SystemPresenter.h"\r
 #include "wearable_log.h"\r
 #include "custom_utils.h"\r
+#include "config/include/ConfigModel.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -56,9 +57,16 @@ namespace OHOS
             delete FONTTitle;\r
             FONTTitle = nullptr;\r
             delete FONT;\r
-            FONT = nullptr;\r
+            delete CAT1Title;\r
+            CAT1Title = nullptr;\r
+            delete CAT1mode;\r
+            CAT1mode = nullptr;\r
+            delete pyTitle;\r
+            pyTitle = nullptr;\r
+            delete pymode;\r
+            pymode = nullptr;\r
             delete SystemAboutTheWatchScrollView;\r
-            SystemAboutTheWatchScrollView = nullptr;\r
+            SystemAboutTheWatchScrollView = nullptr; \r
         }\r
     }\r
 \r
@@ -366,6 +374,83 @@ namespace OHOS
         }\r
         LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
         SystemAboutTheWatchScrollView->Add(LANAddress);\r
+\r
+        Config = {\r
+            .left = 173,\r
+            .top = 885+145,\r
+            .width = 120,\r
+            .height = 35,\r
+            .fontSize = 30,\r
+            .lineHeigh = 35,\r
+            .text = "CAT1mode",\r
+            .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
+        };\r
+        CAT1Title = InitLabel(Config);\r
+        if (CAT1Title == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FONTTitle new fail!");\r
+            return nullptr;\r
+        }\r
+        SystemAboutTheWatchScrollView->Add(CAT1Title);\r
+        /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = 37,\r
+            .top = 941+145,\r
+            .width = 400,\r
+            .height = 30,\r
+            .fontSize = 26,\r
+            .lineHeigh = 30,\r
+            .text = "HarmonyOS Sans",\r
+            .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
+        };\r
+        Config.text=ConfigModel::GetInstance()->GetmoderVer();\r
+        CAT1mode = InitLabel(Config);\r
+        if (CAT1mode == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!");\r
+            return nullptr;\r
+        }\r
+        CAT1mode->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
+        SystemAboutTheWatchScrollView->Add(CAT1mode);\r
+\r
+         Config = {\r
+            .left = 173,\r
+            .top = 885+145*2,\r
+            .width = 120,\r
+            .height = 35,\r
+            .fontSize = 30,\r
+            .lineHeigh = 35,\r
+            .text = "pyVer",\r
+            .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
+        };\r
+        pyTitle = InitLabel(Config);\r
+        if (pyTitle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FONTTitle new fail!");\r
+            return nullptr;\r
+        }\r
+        SystemAboutTheWatchScrollView->Add(pyTitle);\r
+        /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = 37,\r
+            .top = 941+145*2,\r
+            .width = 400,\r
+            .height = 30,\r
+            .fontSize = 26,\r
+            .lineHeigh = 30,\r
+            .text = "HarmonyOS Sans",\r
+            .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
+        };\r
+        Config.text=ConfigModel::GetInstance()->GetpyVer();\r
+        pymode = InitLabel(Config);\r
+        if (CAT1mode == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!");\r
+            return nullptr;\r
+        }\r
+        pymode->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
+        SystemAboutTheWatchScrollView->Add(pymode);\r
+\r
         initViewStatus = true;\r
         return SystemAboutTheWatchScrollView;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
index a6b0dd5..2588b8d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
@@ -32,7 +32,7 @@ namespace OHOS
 
     static char *Path_ota_package= "/user/update.fwpkg";
     static uint8_t uri_ota_package[124] ={0};
-    #define UP_TEST
+    //#define UP_TEST
     static void upgrade_task(void  *arg)
     {
      
@@ -61,7 +61,8 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui");
         if(root!=NULL)
         {
-            bool falg=cJSON_GetObjectItem(root, "UptoDate")->valueint;
+            
+            int falg=cJSON_GetObjectItem(root, "UptoDate")->valueint;
             char *uri = cJSON_GetObjectItem(root, "url")->valuestring;
             sprintf((char *)uri_ota_package,"%s",uri);
             char *OtaPackageVersion = cJSON_GetObjectItem(root, "OtaPackageVersion")->valuestring;
@@ -74,7 +75,7 @@ namespace OHOS
             #ifdef UP_TEST
                 SystemupgradeView::GetInstance()->set_string_value(buf,true);
             #else
-            if(falg)
+            if(falg==0)
             {
                 SystemupgradeView::GetInstance()->set_string_value(buf,true);
             }