From 40115c96beb97cbabde6cd503566be327b786a12 Mon Sep 17 00:00:00 2001
From: Ryan Dam <py.ryan.dam@gmail.com>
Date: Sat, 25 Apr 2020 14:48:24 +0700
Subject: [PATCH] Fix weather data not update properly

---
 source/HuwaiiView.mc | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/source/HuwaiiView.mc b/source/HuwaiiView.mc
index 5fb4718..89d43a8 100644
--- a/source/HuwaiiView.mc
+++ b/source/HuwaiiView.mc
@@ -95,9 +95,7 @@ class HuwaiiView extends WatchUi.WatchFace {
     	restore_from_resume = true;
     	last_resume_mili = System.getTimer();
     	
-    	if (HuwaiiApp has :checkPendingWebRequests) { // checkPendingWebRequests() can be excluded to save memory.
-			App.getApp().checkPendingWebRequests(); // Depends on mDataFields.hasField().
-		}
+		checkBackgroundRequest();
     }
 
     // Update the view
@@ -148,6 +146,7 @@ class HuwaiiView extends WatchUi.WatchFace {
 //    	System.println("update");
 //    	System.println("" + clockTime.min + ":" + clockTime.sec);
     	
+    	// Calculate battery consumtion in days
     	var time_now = Time.now();
     	if (last_battery_hour == null) {
     		last_battery_hour = time_now;
@@ -223,6 +222,7 @@ class HuwaiiView extends WatchUi.WatchFace {
 					restore_from_resume = false;
 				}
 				// in resume time
+				checkBackgroundRequest();
 				mainDrawComponents(dc);
 				force_render_component = false;
     		} else {
@@ -231,6 +231,7 @@ class HuwaiiView extends WatchUi.WatchFace {
 	    			// continue
 	    			last_draw_minute = current_minute;
 	    			// minute turn
+	    			checkBackgroundRequest();
 	    			mainDrawComponents(dc);
 	    		} else {
 	    			// only draw spatial
@@ -238,7 +239,6 @@ class HuwaiiView extends WatchUi.WatchFace {
 	    		}
     		}
     	} else {
-    		last_draw_minute = -1;
     		// normal power mode
     		if (restore_from_resume) {
     			var current_mili = current_tick;
@@ -249,7 +249,12 @@ class HuwaiiView extends WatchUi.WatchFace {
 				}
 			}
 			force_render_component = true;
+			if (clockTime.min != last_draw_minute) {
+				// Only check background web request every 1 minute
+				checkBackgroundRequest();
+			}
     		mainDrawComponents(dc);
+    		last_draw_minute = clockTime.min;
     		force_render_component = false;
     	}
     	force_render_component = false;
@@ -258,6 +263,7 @@ class HuwaiiView extends WatchUi.WatchFace {
     }
 
 	function mainDrawComponents(dc) {
+	
 		checkTheme();
 		
 		if (force_render_component) {
@@ -375,9 +381,7 @@ class HuwaiiView extends WatchUi.WatchFace {
 		var dialDisplay = View.findDrawableById("analog");
 		dialDisplay.enableSecondHand();
     	
-    	if (HuwaiiApp has :checkPendingWebRequests) { // checkPendingWebRequests() can be excluded to save memory.
-			App.getApp().checkPendingWebRequests(); // Depends on mDataFields.hasField().
-		}
+    	checkBackgroundRequest();
     }
 
     // Terminate any active timers and prepare for slow updates.
@@ -401,5 +405,11 @@ class HuwaiiView extends WatchUi.WatchFace {
 			gbar_color_1 = theme[7];
 		}
 	}
+	
+	function checkBackgroundRequest() {
+		if (HuwaiiApp has :checkPendingWebRequests) { // checkPendingWebRequests() can be excluded to save memory.
+			App.getApp().checkPendingWebRequests(); // Depends on mDataFields.hasField().
+		}
+	}
 
 }