修改星历有效期的获取方法

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
index d3caf08..7862d62 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
@@ -16,7 +16,6 @@ REGIST_SLICE(VIEW_EPHEMERIS_DOWNLOAD, EphemerisDownloadView,
              EphemerisDownloadPresenter);
 
 EphemerisDownloadPresenter::EphemerisDownloadPresenter() {
-  Attach(&EphemerisDownloadModel::GetInstance());
 }
 
 EphemerisDownloadPresenter::~EphemerisDownloadPresenter() {}
@@ -89,6 +88,14 @@ void EphemerisDownloadPresenter::Notify() {
             std::string progress = "下载中,正在下载"+std::to_string(EphemerisDownloadModel::GetInstance().GetEphemerisDownloadProgress())+"%";
             EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText(progress.c_str());
         }
+        else if(EphemerisDownloadModel::GetInstance().GetEphemerisDownloadProgress() == 10)
+        {
+            //更新有效期
+            if(EphemerisDownloadView::GetInstance()->GetValidityPeriodLabel()) {
+              EphemerisDownloadView::GetInstance()->GetValidityPeriodLabel()->SetText(
+                  EphemerisDownloadModel::GetInstance().GetEphemerisValidityPeriod().c_str());
+            }
+        }
       }
     }
     break;
@@ -117,11 +124,6 @@ void EphemerisDownloadPresenter::Notify() {
     }
     break;
   }
-  //更新有效期
-  if(EphemerisDownloadView::GetInstance()->GetValidityPeriodLabel()) {
-    EphemerisDownloadView::GetInstance()->GetValidityPeriodLabel()->SetText(
-        EphemerisDownloadModel::GetInstance().GetEphemerisValidityPeriod().c_str());
-  }
 }
 
 } // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
index 56d9da9..b4a3538 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
@@ -141,6 +141,11 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     labelNote_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
     AddViewToRootContainer(labelNote_);
 
+    //更新有效期
+    EphemerisDownloadView::GetInstance()->GetValidityPeriodLabel()->SetText(
+        EphemerisDownloadModel::GetInstance().GetEphemerisValidityPeriod().c_str());
+  
+
     return true;
 }