Merge #773 into sdk602patch0626 from refs/changes/773/head

schedule list

* refs/changes/773/head: (1 commits squashed)

  - schedule list

Signed-off-by: dingtalk_kaxuzp <2393524978@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/773

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleListItem.h b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleListItem.h
index 09f5bef..222fcba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleListItem.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleListItem.h
@@ -57,7 +57,6 @@ namespace OHOS
         #define EVEN_ITEM_TIME_COLOR (0Xffffc28b)
 
         #define IMAGE_ITEM_ARROW "/user/res/Schedule/IMAGE_ITEM_ARROW.bin"
-        // #define IMAGE_ITEM_ARROW "/user/res/settings/SETTINGS_DISPLAY_MODE.bin"
     };
 }
 #endif

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleModel.h b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleModel.h
index 9811d71..14ab886 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleModel.h
@@ -31,7 +31,7 @@ namespace OHOS
         ScheduleModel &operator=(const ScheduleModel &) = delete;\r
 \r
         void ScheduleDataItemCountSet(uint8_t count);\r
-        void ScheduleDataToInfo(void);\r
+        void ScheduleDataToInfo(uint8_t DataCount);\r
 \r
         ScheduleRevData ScheduleRevData_[SCHEDULE_DATA_COUNT_MAX] = {nullptr, nullptr, nullptr, nullptr};\r
         ScheduleListItemInfo ScheduleDataInfo_[SCHEDULE_DATA_COUNT_MAX*2] = {nullptr, nullptr, nullptr, nullptr, 0, false, 0, 0};\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/SchedulePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/SchedulePresenter.h
index 64dce38..a4e9ed1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/SchedulePresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/SchedulePresenter.h
@@ -13,7 +13,7 @@ namespace OHOS
 {\r
     class ScheduleView;\r
     class ScheduleModel;\r
-    class SchedulePresenter : public Presenter<ScheduleView, ScheduleModel>,\r
+    class SchedulePresenter : public Presenter<ScheduleView>,\r
                              public UIView::OnClickListener,\r
                              public UIView::OnDragListener,\r
                              public RootView::OnKeyActListener\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
index 145b4a6..1ed145c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp
@@ -74,22 +74,20 @@ namespace OHOS
 \r
         if(true == is_finish)\r
         {\r
-            ScheduleDataToInfo();\r
+            uint8_t DataCount = index + 1;\r
+            ScheduleDataToInfo(DataCount);\r
         }\r
     }\r
 \r
-    void ScheduleModel::ScheduleDataToInfo(void)\r
+    void ScheduleModel::ScheduleDataToInfo(uint8_t DataCount)\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleDataToInfo");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleDataToInfo,%d", DataCount);\r
         uint8_t i = 0;\r
         uint8_t j = 0;\r
-        uint8_t count = 0;\r
 \r
         memset(ScheduleDataInfo_, 0x0, sizeof(ScheduleListItemInfo) * SCHEDULE_DATA_COUNT_MAX*2);\r
 \r
-        count = 1;\r
-\r
-        for(i = 0, j = 0; i < count; i++)\r
+        for(i = 0, j = 0; i < DataCount; i++)\r
         {\r
             if(0 == i)\r
             {\r
@@ -121,6 +119,7 @@ namespace OHOS
                 }\r
                 else\r
                 {\r
+                    j++;\r
                     ScheduleDataInfo_[j].DateStr.assign(ScheduleRevData_[i].date);\r
                     ScheduleDataInfo_[j].index = j;\r
                     ScheduleDataInfo_[j].is_date_item = true;\r
@@ -135,18 +134,19 @@ namespace OHOS
                     ScheduleDataInfo_[j].child_index = 0;\r
                 }\r
             }\r
-                    \r
+        \r
             if((SCHEDULE_DATA_COUNT_MAX * 2) <= j)\r
             {\r
                 break;\r
             }\r
         }\r
 \r
-        ScheduleDataItemCountSet(j + 1);\r
+        uint8_t ItemCount = j + 1;\r
+        ScheduleDataItemCountSet(ItemCount);\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleDataToInfo,%d,%s", j, ScheduleDataInfo_[0].DateStr.c_str());\r
     }\r
 \r
-\r
+    // c func\r
     void C_ScheduleSetByApp(ScheduleRevData * data, uint8_t index, bool is_finish)\r
     {\r
         ScheduleModel::GetInstance().ScheduleSetByApp(data, index, is_finish);\r
@@ -154,11 +154,16 @@ namespace OHOS
 \r
     int C_ScheduleDataReadFromFile()\r
     {\r
+\r
+\r
         return 0;\r
     }\r
 \r
     int C_ScheduleDataWriteToFile()\r
     {\r
+\r
+\r
         return 0;\r
     }\r
+\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
index a904095..82370ed 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
@@ -38,14 +38,14 @@ namespace OHOS
     void SchedulePresenter::OnStart()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnStart");\r
-        Presenter<ScheduleView, ScheduleModel>::OnStart();\r
+        Presenter<ScheduleView>::OnStart();\r
     }\r
 \r
     // 页面已经展示后的调用逻辑\r
     void SchedulePresenter::OnResume(void)\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnResume");\r
-        Presenter<ScheduleView, ScheduleModel>::OnResume();\r
+        Presenter<ScheduleView>::OnResume();\r
         if (nullptr == view_)\r
         {\r
             return;\r
@@ -62,21 +62,21 @@ namespace OHOS
     void SchedulePresenter::OnPause(void)\r
     {\r
         // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnPause");\r
-        Presenter<ScheduleView, ScheduleModel>::OnPause();\r
+        Presenter<ScheduleView>::OnPause();\r
     }\r
 \r
     // 页面完全置于后台时的逻辑。\r
     void SchedulePresenter::OnStop(void)\r
     {\r
         // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnStop");\r
-        Presenter<ScheduleView, ScheduleModel>::OnStop();\r
+        Presenter<ScheduleView>::OnStop();\r
     }\r
 \r
     bool SchedulePresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
         UNUSED(event);\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnClick");\r
-\r
+#if 0\r
         if (nullptr == &view) \r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__);\r
@@ -88,6 +88,7 @@ namespace OHOS
             ScheduleListItem * item = static_cast<ScheduleListItem *>(&view);\r
             view_->DisplayContentScreen(item->GetViewIndex());\r
         }\r
+#endif\r
         return true;\r
     }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
index aa22e2c..d3672cb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
@@ -113,6 +113,44 @@ namespace OHOS
                 delete DataGroup_;\r
                 DataGroup_ = nullptr;\r
             }\r
+            if(nullptr != ContentGroup_)\r
+            {\r
+                ContentGroup_->RemoveAll();\r
+                if(nullptr != ContentLabelExt0_)\r
+                {\r
+                    delete ContentLabelExt0_;\r
+                    ContentLabelExt0_ = nullptr;\r
+                }\r
+                if(nullptr != ContentLabelExt1_)\r
+                {\r
+                    delete ContentLabelExt1_;\r
+                    ContentLabelExt1_ = nullptr;\r
+                }\r
+                if(nullptr != ContentLabelExt2_)\r
+                {\r
+                    delete ContentLabelExt2_;\r
+                    ContentLabelExt2_ = nullptr;\r
+                }\r
+                if(nullptr != ContentLabelExt3_)\r
+                {\r
+                    delete ContentLabelExt3_;\r
+                    ContentLabelExt3_ = nullptr;\r
+                }\r
+                if(nullptr != ContentButton0_)\r
+                {\r
+                    delete ContentButton0_;\r
+                    ContentButton0_ = nullptr;\r
+                }\r
+                if(nullptr != ContentButton1_)\r
+                {\r
+                    delete ContentButton1_;\r
+                    ContentButton1_ = nullptr;\r
+                }\r
+                \r
+                delete ContentGroup_;\r
+                ContentGroup_ = nullptr;\r
+            }\r
+\r
             delete container_;\r
             container_ = nullptr;\r
         }\r
@@ -140,6 +178,34 @@ namespace OHOS
         }\r
     }\r
 \r
+#if 0\r
+    void ScheduleView::_DisplayMainScreen(uint8_t ScreenIndex)\r
+    {\r
+        if(ENUM_SCHEDULE_MAX_SCREEN =< ScreenIndex)\r
+        {\r
+            return;\r
+        }\r
+\r
+        uint8_t i = 0;\r
+        for(i = 0; i < ENUM_SCHEDULE_MAX_SCREEN; i++)\r
+        {\r
+            if(i == ScreenIndex)\r
+            {\r
+                GroupArray_[i]->SetVisible(true);\r
+            }\r
+            else\r
+            {\r
+                GroupArray_[i]->SetVisible(false);\r
+            }\r
+        }\r
+\r
+        if(ENUM_SCHEDULE_LIST_SCREEN == ScreenIndex)\r
+        {\r
+            GroupArray_[ENUM_SCHEDULE_LIST_SCREEN]->RefreshList();\r
+        }\r
+    }\r
+#endif\r
+\r
     void ScheduleView::DisplayContentScreen(uint8_t index)\r
     {\r
         NoDataGroup_->SetVisible(false);\r
@@ -273,7 +339,6 @@ namespace OHOS
             }\r
         }\r
         ScheduleList_->SetPosition(LIST_LEFT, LIST_TOP, LIST_WIDTH, LIST_HEIGHT);\r
-        // ScheduleList_->SetScrollBlankSize(30);\r
         // ScheduleList_->SetSelectPosition(VERTICAL_RESOLUTION / 2);\r
         ScheduleList_->SetDraggable(true);\r
         ScheduleList_->SetThrowDrag(true);\r
@@ -285,6 +350,9 @@ namespace OHOS
         ScheduleList_->SetDragACCLevel(5); // 5: drag acceleration\r
         ScheduleList_->SetYScrollBarVisible(false);\r
 \r
+        ScheduleList_->SetScrollBlankSize(40);\r
+        ScheduleList_->SetReboundSize(30);\r
+\r
         ScheduleList_->SetRotateFactor(2); // 增加表冠控制\r
         ScheduleList_->RequestFocus();\r
 \r