Merge #420 into sdk602patch0521 from refs/changes/420/head

Code review from 胡传军

* refs/changes/420/head: (13 commits squashed)

  - 修复表盘协议BUG

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

  - 低电量修改

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

  - 优化低电量关机

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

  -  更改低电量报警

  - ble扫描过滤去除，ble read属性更新

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

  - 修改步数等数据存储，从记录一小时内的增值，改为记录当前时间点总值

  - 补交

  - LCD

  - LCD补交

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/420

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
index 3c9024a..6d8ccfb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testLCD.h
@@ -23,7 +23,7 @@ namespace OHOS
 
         UIScrollView *testLCDInitIView(void);
         void ClearAll(void);
-        void set_LCD_color();
+        void set_LCD_color(int);
     private:
         bool testLCDScrollViewcrollViewinit(void);
         UIScrollView *testLCDScrollView{nullptr};

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
index f6b885d..ea29e3b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
@@ -76,17 +76,18 @@ namespace OHOS
             testLCDScrollView=nullptr;
        }
     }
-   
+     uint8_t LCD_TEST_FALG=0;
     void  colorTimerCallBack(int data)
     {
         testLCDView* t= testLCDView::GetInstance();
         if(t!=NULL)
-        t->set_LCD_color();
+        t->set_LCD_color(LCD_TEST_FALG);
+        LCD_TEST_FALG++;
     }
-    uint8_t LCD_TEST_FALG=0;
-    void testLCDView :: set_LCD_color(void)
+   
+    void testLCDView :: set_LCD_color(int color)
     {
-        switch (LCD_TEST_FALG)
+        switch (color)
         {
         case 0:
             testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full);
@@ -97,11 +98,20 @@ namespace OHOS
         case 2:
             testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Yellow().full);
             break;
+        case 3:
+            testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
+            break;
+        case 4:
+            testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+            break;
+        case 5:
+            testLCDScrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
+            break;
         default:
             break;
         }
         RootView::GetInstance()->Invalidate();
-        LCD_TEST_FALG++;
+        //LCD_TEST_FALG++;
         
     }
    
@@ -147,7 +157,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");
             return false;
         }
-       testLCDScrollView->SetOnDragListener(draglistener);
+        testLCDScrollView->SetOnDragListener(draglistener);
         testLCDScrollView->SetTouchable(true);
         testLCDScrollView->SetDraggable(true);
 
@@ -174,4 +184,26 @@ namespace OHOS
         }
         return testLCDScrollView;
     }
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+    void ble_factorytest_set_LCD_color(int color)
+    {
+        testLCDView* t= testLCDView::GetInstance();
+
+        if(t!=NULL)
+            t->set_LCD_color(color);
+    }
+
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
 }
\ No newline at end of file

diff --git a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c
index 5acf5a5..3b33728 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c
+++ b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c
@@ -263,10 +263,10 @@ int CWM_OS_dbgPrintf(const char * format,...)
     return 0;
 }
 typedef enum {
-    CYWEE_SAVE_DATA_STEP,
-    CYWEE_SAVE_DATA_DISTANCE,
-    CYWEE_SAVE_DATA_CALORIES,
-    CYWEE_SAVE_DATA_FAT,
+    CYWEE_DATA_STEP,
+    CYWEE_DATA_DISTANCE,
+    CYWEE_DATA_CALORIES,
+    CYWEE_DATA_FAT,
 } CYWEE_SAVE_DATA_TYPE;
 
 #define CWM_STEP_DATA_PATH "/user/userdata/sport/stepcount.bin"
@@ -290,16 +290,16 @@ void CWM_OS_saveData(int* data, uint32_t len,uint8_t type){
     FILE * fp=NULL;
     switch (type)
     {
-    case CYWEE_SAVE_DATA_CALORIES:
+    case CYWEE_DATA_CALORIES:
         fp  = fopen(CWM_CALORIES_DATA_PATH,"wb");
         break;
-    case CYWEE_SAVE_DATA_STEP:
+    case CYWEE_DATA_STEP:
         fp  = fopen(CWM_STEP_DATA_PATH,"wb");
         break;
-    case CYWEE_SAVE_DATA_DISTANCE:
+    case CYWEE_DATA_DISTANCE:
         fp  = fopen(CWM_DISTANCE_DATA_PATH,"wb");
         break;
-    case CYWEE_SAVE_DATA_FAT:
+    case CYWEE_DATA_FAT:
         fp  = fopen(CWM_FAT_DATA_PATH,"wb");
         break;
 
@@ -354,16 +354,16 @@ void CWM_OS_saveData_history(int* new_data,int *history ,uint32_t len,uint8_t ty
 
     switch (type)
     {
-    case CYWEE_SAVE_DATA_CALORIES:
+    case CYWEE_DATA_CALORIES:
        sprintf_s(path_,64,"%s%s.bin",CWM_HISTORY_DATA_CALORIES_PATH,timeday);
         break;
-    case CYWEE_SAVE_DATA_STEP:
+    case CYWEE_DATA_STEP:
        sprintf_s(path_,64,"%s%s.bin",CWM_HISTORY_DATA_PATH,timeday);
         break;
-    case CYWEE_SAVE_DATA_DISTANCE:
+    case CYWEE_DATA_DISTANCE:
        sprintf_s(path_,64,"%s%s.bin",CWM_HISTORY_DATA_DISTANCE_PATH,timeday);
         break;
-    case CYWEE_SAVE_DATA_FAT:
+    case CYWEE_DATA_FAT:
        sprintf_s(path_,64,"%s%s.bin",CWM_HISTORY_DATA_FAT_PATH,timeday);
         break;
 
@@ -373,15 +373,15 @@ void CWM_OS_saveData_history(int* new_data,int *history ,uint32_t len,uint8_t ty
    
     CWM_OS_dbgPrintf(" save path %s \n",path_);
 
-    int data= *new_data-*history;//新数据减去旧数据，作为这一个小时的步数值
-    if(data<=0)
-    {
-        data=0;
-        *history=0;
-        CWM_OS_dbgPrintf("异常 清除步数数据\n");
-        return;
+    // int data= *new_data-*history;//新数据减去旧数据，作为这一个小时的步数值
+    // if(data<=0)
+    // {
+    //     data=0;
+    //     *history=0;
+    //     CWM_OS_dbgPrintf("异常 清除步数数据\n");
+    //     return;
 
-    }
+    // }
 
     FILE * fp = fopen(path_,"ab+");
     if(fp==NULL)
@@ -401,14 +401,14 @@ void CWM_OS_saveData_history(int* new_data,int *history ,uint32_t len,uint8_t ty
     }
 
 
-    ret =fwrite(&data,1,len,fp);
+    ret =fwrite(new_data,1,len,fp);
     if(ret==0)
     {
         CWM_OS_dbgPrintf("fwrite failed %d\n",ret);
     }
-    CWM_OS_dbgPrintf("fwrite data %d\n",data);
+    CWM_OS_dbgPrintf("fwrite data %d\n",*new_data);
 
-    *history=*new_data;
+    //*history=*new_data;
 
     fclose(fp);
 }
@@ -476,16 +476,16 @@ void CWM_OS_restoreData(int* data, uint32_t len,uint8_t type){
     FILE * fp=NULL;
     switch (type)
     {
-    case CYWEE_SAVE_DATA_CALORIES:
+    case CYWEE_DATA_CALORIES:
         fp  = fopen(CWM_CALORIES_DATA_PATH,"rb");
         break;
-    case CYWEE_SAVE_DATA_STEP:
+    case CYWEE_DATA_STEP:
         fp  = fopen(CWM_STEP_DATA_PATH,"rb");
         break;
-    case CYWEE_SAVE_DATA_DISTANCE:
+    case CYWEE_DATA_DISTANCE:
         fp  = fopen(CWM_DISTANCE_DATA_PATH,"rb");
         break;
-    case CYWEE_SAVE_DATA_FAT:
+    case CYWEE_DATA_FAT:
         fp  = fopen(CWM_FAT_DATA_PATH,"rb");
         break;
     default:

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index b090644..ec5cb5c 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -134,7 +134,7 @@ void set_calories_data(uint32_t data)
 
 void set_distance_data(uint32_t data)
 {
-    new_fat++;
+    new_distance=data;
 }
 
 int get_distance_data(void )
@@ -144,7 +144,12 @@ int get_distance_data(void )
 
 void set_fat_time_data(void)
 {
-    new_calories++;
+    new_fat++;
+}
+
+int get_fat_time_data(void)
+{
+    return new_fat+history_fat;
 }
 
 
@@ -160,17 +165,21 @@ void stand_history_save(void)
 
 void calories_history_save(void)
 {
-    CWM_OS_saveData_history(&new_calories,&history_calories_,sizeof(int),CYWEE_SAVE_DATA_CALORIES);
+
+    int data= get_calories_data();
+    CWM_OS_saveData_history(&data,&history_calories_,sizeof(int),CYWEE_SAVE_DATA_CALORIES);
 }
 
 void distances_history_save(void)
 {
-    CWM_OS_saveData_history(&new_distance,&history_calories_,sizeof(int),CYWEE_SAVE_DATA_DISTANCE);
+    int data= get_distance_data();
+    CWM_OS_saveData_history(&data,&history_calories_,sizeof(int),CYWEE_SAVE_DATA_DISTANCE);
 }
 
 void fat_history_save(void)
 {
-    CWM_OS_saveData_history(&new_fat,&history_fat_,sizeof(int),CYWEE_SAVE_DATA_FAT);
+     int data= get_fat_time_data();
+    CWM_OS_saveData_history(&data,&history_fat_,sizeof(int),CYWEE_SAVE_DATA_FAT);
 }
 
 void cywee_goal_history_save(void)