style

Common.js

@@ -1,8 +1,3 @@
-import {
-    Platform,
-} from 'react-native';
-
-
 let Global = {
     airspaceType: {
         circle: 1,
@@ -19,14 +14,8 @@ let Global = {
 }
 
 Global.amapLineWidth = 3;
-Global.amapStrokeColor = Platform.select({
-    ios: () => 0x58A8F5,
-    android: () => "#58A8F5"
-})();
+Global.amapStrokeColor = "#58A8F5";
 
-Global.amapFillColor = Platform.select({
-    ios: () => 0xF4F9FC66,
-    android: () => "#1158A8F5" //ARGB in Android
-})();
+Global.amapFillColor = "#1158A8F5";
 
 module.exports = Global;

index.js

@@ -272,21 +272,21 @@ function getMarkerSelector(polygonAndMarkers, lineAndMarkers) {
 
 function getRegionPoints(circles, lineAndMarkers, polygonAndMarkers) {
     let regionPoints = new Array();
-    
+
     for (let i = 0; i < circles.length; i++) {
         regionPoints.push(getCircleRegions(circles[i]));
     }
-    
+
     let lines = lineAndMarkers.lines;
     for (let i = 0; i < lines.length; i++) {
         regionPoints.push(lines[i].coordinates);
     }
-    
+
     let polygons = polygonAndMarkers.polygons;
     for (let i = 0; i < polygons.length; i++) {
         regionPoints.push(polygons.coordinates);
     }
-    
+
     return regionPoints;
 }
 
@@ -321,13 +321,19 @@ function getPolygonSelector(polygonAndMarkers) {
     );
 }
 
+let setStyle = (style) => {
+    return (shapeName) => style[shapeName]
+}
+
 //获取selector
-export function getShapesSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
+export function getShapesSelector(airspaceInfos, style, currentAirspaceIndex) {
+    if (!style)
+        style = {};
     currentAirspaceIndex = currentAirspaceIndex ? currentAirspaceIndex : () => -1;
-    let circles = getCircleSelector(airspaceInfos, setStyle, currentAirspaceIndex);
-    let lineAndMarkers = getLineAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex);
+    let circles = getCircleSelector(airspaceInfos, setStyle(style), currentAirspaceIndex);
+    let lineAndMarkers = getLineAndMarkerSelector(airspaceInfos, setStyle(style), currentAirspaceIndex);
     let lines = getLineSelector(lineAndMarkers);
-    let polygonAndMarkers = getPolygonAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex);
+    let polygonAndMarkers = getPolygonAndMarkerSelector(airspaceInfos, setStyle(style), currentAirspaceIndex);
     let polygons = getPolygonSelector(polygonAndMarkers);
     let markers = getMarkerSelector(polygonAndMarkers, lineAndMarkers);
     let regionPoints = getRegionPointsSelector(circles, lineAndMarkers, polygonAndMarkers);
@@ -341,11 +347,13 @@ export function getShapesSelector(airspaceInfos, setStyle, currentAirspaceIndex)
 }
 //获取数组
 export function getShapes(airspaceInfos, setStyle, currentAirspaceIndex) {
+    if (!style)
+        style = {};
     currentAirspaceIndex = currentAirspaceIndex ? currentAirspaceIndex : () => -1;
-    let circles = getCircles(airspaceInfos, setStyle, currentAirspaceIndex);
-    let lineAndMarkers = getLinesAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex);
+    let circles = getCircles(airspaceInfos, setStyle(style), currentAirspaceIndex);
+    let lineAndMarkers = getLinesAndMarkers(airspaceInfos, setStyle(style), currentAirspaceIndex);
     let lines = getLines(lineAndMarkers);
-    let polygonAndMarkers = getPolygonsAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex);
+    let polygonAndMarkers = getPolygonsAndMarkers(airspaceInfos, setStyle(style), currentAirspaceIndex);
     let polygons = getPolygons(polygonAndMarkers);
     let markers = getMarkers(polygonAndMarkers, lineAndMarkers);
     let regionPoints = getRegionPoints(circles, lineAndMarkers, polygonAndMarkers);