From: luozheng <1732036298@qq.com>
Date: Sat, 10 Aug 2024 11:13:58 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~681
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F668%2F3;p=mirrors%2FFD230.git

Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
---

477bdd95076bcaa3a6f1fb1fec90fb77646355b5
diff --cc code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp
index 379eadd56,aad3afe06..af5e85ba4
--- a/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp
@@@ -339,50 -299,30 +339,43 @@@ namespace OHO
      void OBUMessageView::UpdateOBUMessageViewDisplayData(void)
      {
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OBUMessageView::UpdateOBUMessageViewDisplayDate");
-         int flag = uapi_get_a5133_update_state();
-         if (flag)
-         {
-             uint8_t rxdata[80] = {0};
-             uint32_t rxdata_timestamp = 0;
-             uapi_get_a5133_rxdata(rxdata, 80);
-             rxdataStr = std::string((char *)rxdata);
-             uapi_get_a5133_rxdata_timestamp(&rxdata_timestamp);
-             char labelTime[20] = {0};
-             if (uapi_get_TIME_STR(rxdata_timestamp, labelTime, '.', ':', DATE_H_M_S) != ERRCODE_SUCC)
-             {
-                 labelTimeStr = std::string("--");
-             }
-             else
-             {
-                 labelTimeStr = std::string(labelTime);
-             }
-         }
-         if(flag == 1)
+         num1 = uapi_get_a5133_update_state();
+         num2 = uapi_get_a5133_update_state1();
+ 
+         uint8_t rxdata[80] = {0};
+         uint32_t rxdata_timestamp = 0;
+         uapi_get_a5133_rxdata(rxdata, 80);
+         rxdataStr = std::string((char *)rxdata);
+         uapi_get_a5133_rxdata_timestamp(&rxdata_timestamp);
+         char labelTime[20] = {0};
+         if (uapi_get_TIME_STR(rxdata_timestamp, labelTime, '.', ':', DATE_H_M_S) != ERRCODE_SUCC)
          {
-             num1++;
-             obuMessageLabel1->SetText(rxdataStr.c_str());     /*数据更新*/
-             MessageNumLabel1->SetText(std::to_string(num1).c_str());  
+             labelTimeStr = std::string("--");
          }
-         else if(flag == 2)
+         else
          {
-             num2++;
-             obuMessageLabel2->SetText(rxdataStr.c_str());  
-             MessageNumLabel2->SetText(std::to_string(num2).c_str());
+             labelTimeStr = std::string(labelTime);
          }
+    
+         // obuMessageLabel1->SetText(rxdataStr.c_str());     /*数据更新*/
+         obuMessageLabel1->SetText("您已进入北斗收费路段");     /*数据更新*/
+         MessageNumLabel1->SetText(std::to_string(num1).c_str());  
+         obuMessageLabel2->SetText("您已超速，请减速慢行！");  
+         MessageNumLabel2->SetText(std::to_string(num2).c_str());
          displayTimeLabel->SetText(labelTimeStr.c_str()); /*时间更新：时:分:秒*/
  
 +        /*
 +        OBUItem item;
 +        item.index = count++;
 +        item.text = rxdataStr;
 +        if (count >= 50)
 +        {
 +            count = 0;
 +            obuAdapter->ClearData();
 +        }
 +        obuAdapter->AddListItem(item);
 +        obuList->RefreshList();
 +        obuList->SetStartIndex(count);
 +        */
      }
  }