日程同步修复

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleModel.h
index 3e028f7..9f8b7e0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleModel.h
@@ -6,6 +6,30 @@
 #include "schedule/include/ScheduleListItem.h"\r
 #include "schedule/include/ScheduleData.h"\r
 \r
+#ifdef BLE_INSTRUCT\r
+\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+\r
+#include "bleEvent.h"\r
+#include "bleInstruct.h"\r
+\r
+void ble_Schedule_init();\r
+\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+\r
+#endif\r
+\r
+\r
 \r
 namespace OHOS\r
 {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleModel.cpp
index fcfd984..b77acdc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleModel.cpp
@@ -297,3 +297,87 @@ int C_ScheduleDataWriteToFile(void)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataWriteToFile", __LINE__);\r
     return OHOS::ScheduleModel::GetInstance().ScheduleDataWriteToFile();\r
 }\r
+\r
+\r
+#ifdef BLE_INSTRUCT\r
+\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+\r
+#include "bleEvent.h"\r
+#include "bleInstruct.h"\r
+\r
+\r
+bool Ble_Set_ScheduleInfo_(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_end,char *title,char *data,bool is_end)\r
+{\r
+\r
+    // OHOS::ScheduleRevData info_;\r
+    ScheduleRevData info_;\r
+    \r
+    info_.topic.clear();\r
+    info_.content.clear();\r
+    info_.topic.append(title,strlen(title));\r
+    info_.content.append(data,strlen(data));\r
+\r
+    time_t currtime=timetamp_begin;\r
+    struct tm *timeinfo;\r
+    timeinfo = localtime(&currtime);\r
+    \r
+    int y=timeinfo->tm_year+ 1900;\r
+    int m=timeinfo->tm_mon+1;\r
+    int d=timeinfo->tm_mday;\r
+    int h=timeinfo->tm_hour;\r
+    int min=timeinfo->tm_min;\r
+    char day_buf[24]={0};\r
+    sprintf_s(day_buf,24,"%d/%d",m,d);\r
+    info_.date.clear();\r
+    info_.date.append(day_buf,strlen(day_buf));\r
+\r
+    currtime=timetamp_end;\r
+    timeinfo = localtime(&currtime);\r
+   \r
+    int h_=timeinfo->tm_hour;\r
+    int min_=timeinfo->tm_min;\r
+    char time_buf[24]={0};\r
+    sprintf_s(time_buf,24,"%02d:%02d-%02d:%02d",h,min,h_,min_);\r
+    info_.time.clear();\r
+    info_.time.append(time_buf,strlen(time_buf));\r
+\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"///////////////////日程数据////////////////////\r\n");\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"date:%s\r\n",info_.date.c_str());\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"time:%s\r\n",info_.time.c_str());\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"titel:%s\r\n",info_.topic.c_str());\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"content:%s\r\n",info_.content.c_str());\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"//////////////////////////////////////////////\r\n");\r
+    //  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"delete_before_file now day%d %d %d\r\n ",y,m,d);\r
+\r
+    // OHOS::C_ScheduleSetByApp(&info_, id - 1, is_end);\r
+    C_ScheduleSetByApp(&info_, id-1, is_end);\r
+\r
+    if(is_end)\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"////////////////////结束///////////////////\r\n");\r
+    return true;\r
+}\r
+\r
+\r
+\r
+extern bleInstruct_t_ bleInstruct_t;\r
+\r
+void ble_Schedule_init()\r
+{\r
+    bleInstruct_t.Ble_Set_ScheduleInfo_cb=Ble_Set_ScheduleInfo_;\r
+}\r
+\r
+\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+\r
+#endif\r

diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp
index b92fcd0..8751029 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp
+++ b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp
@@ -1253,6 +1253,7 @@ cJSON* ble_app_list(void)
 
 cJSON* ble_get_watch_msg(void)
 {
+    
     return bleInstruct_t.ble_get_watch_msg();
 }
 
@@ -1264,3 +1265,5 @@ cJSON* ble_get_watch_msg(void)
 }
 #endif /* __cplusplus */
 #endif /* __cplusplus */
+
+

diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
index 690c28b..70ab3e5 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
+++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp
@@ -15,6 +15,8 @@
 
 void ble_instruct_init(void)
 {
+    ble_Schedule_init();
+    
     ble_dial_init();
 
     ble_alarm_init();