From 4bdb71fdf4e93cefd509e71c2c0bde4d97b2f8eb Mon Sep 17 00:00:00 2001
From: kfl_614 <kfl_614@163.com>
Date: Sat, 11 Apr 2020 17:18:50 +0800
Subject: [PATCH] =?utf8?q?1.=E5=8F=96=E6=B6=88=E9=9B=B6=E7=82=B9=E6=B8=85?=
 =?utf8?q?=E7=A9=BA=E5=A4=A9=E6=B0=94=E5=88=97=E8=A1=A8=EF=BC=8C=E6=94=B9?=
 =?utf8?q?=E6=88=90=E6=AF=8F=E6=AC=A1=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?=
 =?utf8?q?=E5=80=99=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E5=BD=93?=
 =?utf8?q?=E5=A4=A9=E6=9F=A5=E8=AF=A2=E7=9A=84=E3=80=82=E5=A6=82=E6=9E=9C?=
 =?utf8?q?=E4=B8=8D=E6=98=AF=E5=88=99=E5=8E=BB=E6=9F=A5=E8=AF=A2=E5=A4=A9?=
 =?utf8?q?=E6=B0=94=E5=B9=B6=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?utf8?q?=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ic/work/MainActivity.java   | 23 +++-------
 .../main/java/com/ic/work/WorkService.java    |  1 -
 .../ic/work/hardware/BeforeDawnRunnable.java  |  8 +---
 .../com/ic/work/weather/WeatherDBRun.java     | 43 +++++++++++--------
 app/version_code.properties                   |  4 +-
 5 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/ic/work/MainActivity.java b/app/src/main/java/com/ic/work/MainActivity.java
index 26d5ca0..aaf58f7 100644
--- a/app/src/main/java/com/ic/work/MainActivity.java
+++ b/app/src/main/java/com/ic/work/MainActivity.java
@@ -8,10 +8,12 @@ import android.os.Handler;
 import android.widget.Button;
 
 import com.ic.work.hardware.BeforeDawnRunnable;
+import com.ic.work.utils.IcLog;
 import com.ic.work.utils.ServiceUtil;
 import com.ic.work.weather.LocationState;
 import com.ic.work.weather.WeatherHelper;
 
+import org.threeten.bp.Duration;
 import org.threeten.bp.OffsetDateTime;
 import org.threeten.bp.ZoneId;
 import org.threeten.bp.format.DateTimeFormatter;
@@ -39,22 +41,11 @@ public class MainActivity extends AppCompatActivity {
         context = this;
         app =(WorkServiceApp) getApplication();
 
-        /**OffsetDateTime time = OffsetDateTime.now(ZoneId.systemDefault()).plusDays(1);
-
-        ThreadPoolManager.getInstance().execute(new BeforeDawnRunnable(
-                app.getApplicationContext(),
-                app.getRepository(),
-                app.getWeatherRepository(),
-                11000));
-
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                WeatherHelper  weather = new WeatherHelper();
-                LocationState  state = new LocationState(null,true,"深圳市");
-                weather.queryWeatherServerInfo(app.getWeatherRepository(),state);
-            }
-        },10000);**/
+        OffsetDateTime now = OffsetDateTime.now(ZoneId.systemDefault());
+        OffsetDateTime old = OffsetDateTime.parse("2020-04-11T10:19:16.341+08:00");
+
+        Duration interval = Duration.between(old,now);
+        IcLog.i(TAG,"interval： "+interval.toDays());
     }
 
 
diff --git a/app/src/main/java/com/ic/work/WorkService.java b/app/src/main/java/com/ic/work/WorkService.java
index e111994..6d35a9b 100644
--- a/app/src/main/java/com/ic/work/WorkService.java
+++ b/app/src/main/java/com/ic/work/WorkService.java
@@ -283,7 +283,6 @@ public class WorkService extends Service {
         ThreadPoolManager.getInstance().execute(new BeforeDawnRunnable(
                 mApp.getApplicationContext(),
                 mApp.getRepository(),
-                mApp.getWeatherRepository(),
                 intent.getIntExtra(PED_TOTAL_KEY, 0)));
     }
 }
diff --git a/app/src/main/java/com/ic/work/hardware/BeforeDawnRunnable.java b/app/src/main/java/com/ic/work/hardware/BeforeDawnRunnable.java
index 818afdb..c80e92d 100644
--- a/app/src/main/java/com/ic/work/hardware/BeforeDawnRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/BeforeDawnRunnable.java
@@ -11,21 +11,15 @@ public class BeforeDawnRunnable extends PedBaseRunnable implements Runnable {
     private static final String TAG = "BeforeDawnRunnable";
 
     private int mTotalPed;
-    private WeatherInjection weatherInjection;
 
-    public BeforeDawnRunnable(Context context, PedInjection pedInjection, WeatherInjection weatherInjection, int totalPed) {
+    public BeforeDawnRunnable(Context context, PedInjection pedInjection, int totalPed) {
         super(context, pedInjection);
         this.mTotalPed = totalPed;
-        this.weatherInjection = weatherInjection;
     }
 
     @Override
     public void run() {
 
-        if(weatherInjection != null){
-            weatherInjection.deleteDBWeatherDate();
-        }
-
         IcLog.i(TAG, "Before Ped Count" + mTotalPed);
 
         updateCountDB(mTotalPed, getFrontOffsetDateTime());
diff --git a/app/src/main/java/com/ic/work/weather/WeatherDBRun.java b/app/src/main/java/com/ic/work/weather/WeatherDBRun.java
index 5db44d5..fe03e57 100644
--- a/app/src/main/java/com/ic/work/weather/WeatherDBRun.java
+++ b/app/src/main/java/com/ic/work/weather/WeatherDBRun.java
@@ -7,8 +7,9 @@ import com.ic.work.event.WeatherAgainEvent;
 import com.ic.work.event.WeatherResultEvent;
 
 import org.greenrobot.eventbus.EventBus;
-import org.threeten.bp.LocalDate;
+import org.threeten.bp.Duration;
 import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.ZoneId;
 import org.threeten.bp.format.DateTimeFormatter;
 
 import java.util.ArrayList;
@@ -33,23 +34,31 @@ public class WeatherDBRun implements Runnable {
             EventBus.getDefault().post(new WeatherAgainEvent());
         }else {
             List<WeatherParcelable> wpList = new ArrayList<>(weatherList.size());
-            for (int i=0; i<weatherList.size(); i++){
-                WeatherEntity entity = weatherList.get(i);
-
-                WeatherParcelable parcelable = new WeatherParcelable();
-                parcelable.setCity(entity.getCity());
-                parcelable.setFigureDay(entity.getFigureDay());
-                parcelable.setFigureNight(entity.getFigureNight());
-                parcelable.setStatusDay(entity.getStatusDay());
-                parcelable.setStatusNight(entity.getStatusNight());
-                parcelable.setTemperatureDay(entity.getTemperatureDay());
-                parcelable.setTemperatureNight(entity.getTemperatureNight());
-                parcelable.setUpdateTime(entity.getUpdateTime());
-                wpList.add(parcelable);
-            }
 
-            //通知主线程 更新UI
-            EventBus.getDefault().post(new WeatherResultEvent(wpList));
+            //判断当天是否有昨天的数据，如果有则不是最新数据，要请求数据库
+            OffsetDateTime now = OffsetDateTime.now(ZoneId.systemDefault());
+            Duration interval = Duration.between(weatherList.get(0).getQueryTime(),now);
+            if(interval.toDays() != 0){
+                EventBus.getDefault().post(new WeatherAgainEvent());
+            }else{
+                for (int i=0; i<weatherList.size(); i++){
+                    WeatherEntity entity = weatherList.get(i);
+
+                    WeatherParcelable parcelable = new WeatherParcelable();
+                    parcelable.setCity(entity.getCity());
+                    parcelable.setFigureDay(entity.getFigureDay());
+                    parcelable.setFigureNight(entity.getFigureNight());
+                    parcelable.setStatusDay(entity.getStatusDay());
+                    parcelable.setStatusNight(entity.getStatusNight());
+                    parcelable.setTemperatureDay(entity.getTemperatureDay());
+                    parcelable.setTemperatureNight(entity.getTemperatureNight());
+                    parcelable.setUpdateTime(entity.getUpdateTime());
+                    wpList.add(parcelable);
+                }
+
+                //通知主线程 更新UI
+                EventBus.getDefault().post(new WeatherResultEvent(wpList));
+            }
         }
     }
 }
diff --git a/app/version_code.properties b/app/version_code.properties
index 0f89718..b7b3bbf 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 10 13:53:45 CST 2020
-VERSION_CODE=29
+#Sat Apr 11 17:08:31 CST 2020
+VERSION_CODE=32
-- 
2.17.1