20190828_jeffrey - silenceuncrio/diary GitHub Wiki
review
M330[develop] - testing leaflet for GPS track drawing
commit ed322c0bbfea01ada578a779e6d737be75e78040
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Wed Aug 28 09:51:24 2019 +0800
testing leaflet for GPS track drawing
- leaflet 0101 - Center map example
proscend/prosrc/www/app/feature/leaflet_0101.html | 30 ++++++++++++++++
proscend/prosrc/www/app/feature/leaflet_0101.js | 44 +++++++++++++++++++++++
proscend/prosrc/www/src/index.html.src | 1 +
proscend/prosrc/www/src/menu.html.src | 1 +
4 files changed, 76 insertions(+)
試著不使用 angular.extend
diff --git a/proscend/prosrc/www/app/feature/leaflet_0101.html b/proscend/prosrc/www/app/feature/leaflet_0101.html
index 4eba5b6..266cfb8 100644
--- a/proscend/prosrc/www/app/feature/leaflet_0101.html
+++ b/proscend/prosrc/www/app/feature/leaflet_0101.html
@@ -11,14 +11,14 @@
- <leaflet lf-center="london" width="100%" height="480px"></leaflet>
+ <leaflet lf-center="vm.london" width="100%" height="480px"></leaflet>^M
<h1>Center map example</h1>
<ul>
- <li><input type="number" step="any" ng-model="london.lat" /> Latitude</li>
- <li><input type="number" step="any" ng-model="london.lng" /> Longitude</li>
- <li><input type="number" step="any" ng-model="london.zoom" /> Zoom</li>
+ <li><input type="number" step="any" ng-model="vm.london.lat" /> Latitude</li>^M
+ <li><input type="number" step="any" ng-model="vm.london.lng" /> Longitude</li>^M
+ <li><input type="number" step="any" ng-model="vm.london.zoom" /> Zoom</li>^M
</ul>
diff --git a/proscend/prosrc/www/app/feature/leaflet_0101.js b/proscend/prosrc/www/app/feature/leaflet_0101.js
index 932baec..20f9690 100644
--- a/proscend/prosrc/www/app/feature/leaflet_0101.js
+++ b/proscend/prosrc/www/app/feature/leaflet_0101.js
@@ -24,14 +24,11 @@ function controller($scope) {
- angular.extend(
- $scope, {
- london: {
- lat: 51.505,
- lng: -0.09,
- zoom: 4
- }
- });
+ vm.london = {^M
+ lat: 51.505,^M
+ lng: -0.09,^M
+ zoom: 4^M
+ };^Mcommit 1e2648ddf66daadeecaf803622ef05f3b1863a6f
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Wed Aug 28 10:04:24 2019 +0800
testing leaflet for GPS track drawing
- leaflet 0101 - Center map example
- use vm.londen instead of angular.extend
proscend/prosrc/www/app/feature/leaflet_0101.html | 8 ++++----
proscend/prosrc/www/app/feature/leaflet_0101.js | 13 +++++--------
2 files changed, 9 insertions(+), 12 deletions(-)
no more $scope injection into controller
commit 144de8acf9a7d8b4faa7de9ced2efd349c4b9d72
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Wed Aug 28 10:12:41 2019 +0800
testing leaflet for GPS track drawing: leaflet 0101
- no more $scope injection into controller
proscend/prosrc/www/app/feature/leaflet_0101.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
M300[release/v2.01] - GRE: listen to the following events to set the gre link up/down
commit 6cd10ada282805d5b1f450714471a021a4936d63
Refs: [release/v2.01], {origin/release/v2.01}
Author: jeffrey <[email protected]>
Date: Wed Aug 28 10:26:04 2019 +0800
GRE: listen to the following events to set the gre link up/down:
- set the gre link up
- ICOS_UCAST_PING_PASS
- ICOS_WETH_LINK_UP
- set the gre link down
- ICOS_UCAST_PING_FAIL
- ICOS_WAN6_LOST_CONNECTION
- ICOS_UCAST_PING_FAIL
- ICOS_WETH_LINK_DOWN
proscend/prosrc/icos/icoslib/gre_2g/gre_2g.c | 2 ++
1 file changed, 2 insertions(+)