Merge branch 'dev-2.1' of https://github.com/iMobileforJavaScript/iTablet into dev-2.1

jiakai123 · jiakai123 · commit 5509da8366fc · 2019-09-06T15:34:00.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -107,3 +107,6 @@ android/app/src/main/assets/python_android_assets/math.so
 android/app/src/main/assets/python_android_assets/PIL.zip
 android/app/src/main/assets/python_android_assets/_io.so
 android/app/src/main/assets/python_android_assets/math.so
+android/app/src/main/assets/python_android_assets/_io.so
+android/app/src/main/assets/python_android_assets/math.so
+android/app/src/main/assets/python_android_assets/PIL.zip
diff --git a/android/app/src/main/java/com/supermap/RN/FileTools.java b/android/app/src/main/java/com/supermap/RN/FileTools.java
@@ -880,6 +880,10 @@ private static void zipFile(File resFile, ZipOutputStream zipout, String rootpat
                 zipFile(file, zipout, rootpath);
             }
         } else {
+            //有.nomedia文件不导出
+            if(resFile.getName().equals(".nomedia")){
+                return;
+            }
             byte buffer[] = new byte[BUFF_SIZE];
             BufferedInputStream in = new BufferedInputStream(new FileInputStream(resFile),
                     BUFF_SIZE);
diff --git a/ios/iTablet.xcodeproj/project.pbxproj b/ios/iTablet.xcodeproj/project.pbxproj
@@ -1984,15 +1984,15 @@
 /* Begin PBXShellScriptBuildPhase section */
 		00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 12;
+			buildActionMask = 8;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Bundle React Native code and images";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
diff --git a/src/components/Dialog/InputDialog.js b/src/components/Dialog/InputDialog.js
@@ -24,7 +24,6 @@ export default class InputDialog extends PureComponent {
     returnKeyType: string,
     confirmBtnTitle: string,
     cancelBtnTitle: string,
-    // inputSelection: Object,
   }
 
   static defaultProps = {
@@ -125,10 +124,6 @@ export default class InputDialog extends PureComponent {
               value: text,
             })
           }}
-          // selection={this.props.inputSelection || {
-          //   start: this.state.value.length - 1,
-          //   end: this.state.value.length - 1,
-          // }}
           keyboardAppearance={this.props.keyboardAppearance}
           returnKeyType={this.props.returnKeyType}
         />
@@ -150,16 +145,14 @@ export default class InputDialog extends PureComponent {
         confirmBtnDisable={!this.state.isLegalName}
       >
         <KeyboardAvoidingView behavior="padding" enabled>
-          <View style={styles.contentView}>
-            {this.renderInput()}
-            {!this.state.isLegalName && this.state.errorInfo && (
-              <View style={styles.errorView}>
-                <Text numberOfLines={2} style={styles.errorInfo}>
-                  {this.state.errorInfo}
-                </Text>
-              </View>
-            )}
-          </View>
+          {this.renderInput()}
+          {!this.state.isLegalName && this.state.errorInfo && (
+            <View style={styles.errorView}>
+              <Text numberOfLines={2} style={styles.errorInfo}>
+                {this.state.errorInfo}
+              </Text>
+            </View>
+          )}
         </KeyboardAvoidingView>
       </Dialog>
     )
diff --git a/src/components/Dialog/styles.js b/src/components/Dialog/styles.js
@@ -162,6 +162,7 @@ export default StyleSheet.create({
     flexDirection: 'column',
   },
   errorView: {
+    marginTop: Platform.OS === 'ios' ? scaleSize(4) : 0,
     width: '100%',
     minHeight: scaleSize(60),
     flexDirection: 'row',
diff --git a/src/components/Loading/IndicatorLoading.js b/src/components/Loading/IndicatorLoading.js
@@ -27,7 +27,7 @@ const styles = StyleSheet.create({
   },
 })
 
-export default class Container extends PureComponent {
+export default class IndicatorLoading extends PureComponent {
   props: {
     style?: StyleSheet,
     titleStyle?: StyleSheet,
diff --git a/src/constants/ConstOnline.js b/src/constants/ConstOnline.js
@@ -100,6 +100,16 @@ export default {
     layerIndex: 3,
     mapName: 'GOOGLE地图',
   },
+  BingMap: {
+    type: 'Datasource',
+    DSParams: {
+      server: 'http://cn.bing.com/ditu',
+      engineType: 230,
+      alias: 'bingMap',
+    },
+    layerIndex: 0,
+    mapName: 'Bing地图',
+  },
   OSM: {
     type: 'Datasource',
     DSParams: {
diff --git a/src/constants/FunctionToolbarModule.js b/src/constants/FunctionToolbarModule.js
@@ -217,6 +217,16 @@ const layerManagerData = [
     type: DatasetType.IMAGE,
     themeType: -1,
   },
+  {
+    title: 'BingMap',
+    action: () => {
+      return OpenData(ConstOnline.BingMap, 0)
+    },
+    data: [],
+    image: require('../assets/map/icon-shallow-image_black.png'),
+    type: DatasetType.IMAGE,
+    themeType: -1,
+  },
   // {
   //   title: '全球矢量地图',
   //   action: () => {
diff --git a/src/containers/mtLayerManager/LayerUtils.js b/src/containers/mtLayerManager/LayerUtils.js
@@ -14,6 +14,7 @@ const baseMapsOrigin = [
   'CycleMap@OpenStreetMaps',
   'TransportMap@OpenStreetMaps',
   'quanguo@SuperMapCloud',
+  'roadmap_cn@bingMap',
   'baseMap',
 ]
 let baseMaps = [...baseMapsOrigin]
diff --git a/src/containers/workspace/components/PlotAnimationView/PlotAnimationView.js b/src/containers/workspace/components/PlotAnimationView/PlotAnimationView.js
@@ -11,7 +11,7 @@ import {
 import { ConstToolType, TouchType } from '../../../../constants'
 import { TableList } from '../../../../components'
 import { color } from '../../../../styles'
-import { Toast, scaleSize, setSpText } from '../../../../utils'
+import { scaleSize, setSpText } from '../../../../utils'
 import { getLanguage } from '../../../../language/index'
 // import { getPublicAssets } from '../../../../assets'
 import { getThemeAssets } from '../../../../assets'
@@ -69,12 +69,6 @@ export default class PlotAnimationView extends React.Component {
       this.props.layerName,
       this.props.geoId,
     )
-    if (type == -1) {
-      Toast.show(getLanguage(global.language).Prompt.PLEASE_SELECT_PLOT_SYMBOL)
-      this.cancle()
-      return
-    }
-
     let data = this.getData()
     let subData = []
     switch (type) {
diff --git a/src/containers/workspace/pages/map3D/Map3D.js b/src/containers/workspace/pages/map3D/Map3D.js
@@ -75,9 +75,14 @@ export default class Map3D extends React.Component {
     }
     this.name = params.name || ''
     this.type = params.type || 'MAP_3D'
+    this.mapLoaded = false // 判断地图是否加载完成
   }
 
   componentDidMount() {
+    this.container.setLoading(
+      true,
+      getLanguage(this.props.language).Prompt.LOADING,
+    )
     InteractionManager.runAfterInteractions(() => {
       if (Platform.OS === 'android') {
         this.props.setBackAction({
@@ -94,10 +99,6 @@ export default class Map3D extends React.Component {
       GLOBAL.SaveMapView && GLOBAL.SaveMapView.setTitle(SAVE_TITLE)
 
       // 三维地图只允许单例
-      this.container.setLoading(
-        true,
-        getLanguage(this.props.language).Prompt.LOADING,
-      )
       // setTimeout(this._addScene, 2000)
       this._addScene()
       this.addAttributeListener()
@@ -188,6 +189,7 @@ export default class Map3D extends React.Component {
       setTimeout(() => {
         this.container.setLoading(false)
         Toast.show(getLanguage(this.props.language).Prompt.NO_SCENE)
+        this.mapLoaded = true
         //'无场景显示')
       }, 1500)
       return
@@ -207,11 +209,13 @@ export default class Map3D extends React.Component {
           // Toast.show('无场景显示')
         }, 1500)
         this.props.refreshLayer3dList && this.props.refreshLayer3dList()
+        this.mapLoaded = true
       })
     } catch (e) {
       setTimeout(() => {
         this.container.setLoading(false)
         // Toast.show('无场景显示')
+        this.mapLoaded = true
       }, 1500)
     }
     await SScene.changeBaseLayer(1)
@@ -281,6 +285,7 @@ export default class Map3D extends React.Component {
     //   NavigationService.goBack()
     // }
     // GLOBAL.sceneName = ''
+    if (!this.mapLoaded) return
     try {
       this.container &&
         this.container.setLoading(
diff --git a/src/containers/workspace/pages/mapView/MapView.js b/src/containers/workspace/pages/mapView/MapView.js
@@ -228,12 +228,19 @@ export default class MapView extends React.Component {
       },
     ]
 
+    this.mapLoaded = false // 判断地图是否加载完成
     this.fullMap = false
     this.analystRecommendVisible = false // 底部分析推荐列表 是否显示
     GLOBAL.showAIDetect = GLOBAL.Type === constants.MAP_AR
   }
 
   componentDidMount() {
+    this.container &&
+      this.container.setLoading(
+        true,
+        getLanguage(this.props.language).Prompt.LOADING,
+        //'地图加载中'
+      )
     InteractionManager.runAfterInteractions(() => {
       GLOBAL.SaveMapView &&
         GLOBAL.SaveMapView.setTitle(
@@ -242,12 +249,6 @@ export default class MapView extends React.Component {
           getLanguage(this.props.language).Prompt.SAVE_NO,
           getLanguage(this.props.language).Prompt.CANCEL,
         )
-      this.container &&
-        this.container.setLoading(
-          true,
-          getLanguage(this.props.language).Prompt.LOADING,
-          //'地图加载中'
-        )
 
       this.setState({
         showMap: true,
@@ -528,7 +529,7 @@ export default class MapView extends React.Component {
     this._addMap()
   }
 
-  geometrySelected = event => {
+  geometrySelected = async event => {
     this.props.setSelection &&
       this.props.setSelection([
         {
@@ -586,13 +587,23 @@ export default class MapView extends React.Component {
         break
       }
       case ConstToolType.PLOT_ANIMATION_START: {
-        let type = ConstToolType.PLOT_ANIMATION_NODE_CREATE
-        this.toolBox.setVisible(true, type, {
-          isFullScreen: true,
-          height: ConstToolType.TOOLBAR_HEIGHT[5],
-          containerType: 'createPlotAnimation',
-          cb: () => {},
-        })
+        let type = await SMap.getGeometryTypeById(
+          event.layerInfo.name,
+          event.id,
+        )
+        if (type == -1) {
+          Toast.show(
+            getLanguage(global.language).Prompt.PLEASE_SELECT_PLOT_SYMBOL,
+          )
+        } else {
+          let type = ConstToolType.PLOT_ANIMATION_NODE_CREATE
+          this.toolBox.setVisible(true, type, {
+            isFullScreen: true,
+            height: ConstToolType.TOOLBAR_HEIGHT[5],
+            containerType: 'createPlotAnimation',
+            cb: () => {},
+          })
+        }
         break
       }
       default:
@@ -986,6 +997,7 @@ export default class MapView extends React.Component {
   }
 
   back = () => {
+    if (!this.mapLoaded) return
     // this.props.setMapIndoorNavigation(false)
     this.props.setMap2Dto3D(false)
     GLOBAL.NAVIGATIONMAPOPEN = false
@@ -1191,6 +1203,8 @@ export default class MapView extends React.Component {
           },
         )
 
+        this.mapLoaded = true
+
         this._addGeometrySelectedListener()
         this.setLoading(false)
 
@@ -1216,6 +1230,7 @@ export default class MapView extends React.Component {
         SMap.setIsMagnifierEnabled(true)
       } catch (e) {
         this.setLoading(false)
+        this.mapLoaded = true
       }
     }.bind(this)())
   }
diff --git a/src/language/EN/Map_module.js b/src/language/EN/Map_module.js
@@ -1,11 +1,11 @@
 //地图类型
 const Map_Module = {
-  MAP_EDIT: 'Mapping',
-  MAP_3D: 'Scenes',
+  MAP_EDIT: 'Cartography',
+  MAP_3D: 'Scene',
   MAP_AR: 'Video Map',
   MAP_NAVIGATION: 'Navigation',
   MAP_THEME: 'Thematic Map',
-  MAP_COLLECTION: 'Collection',
+  MAP_COLLECTION: 'Surveying',
   MAP_PLOTTING: 'Plotting',
   MAP_ANALYST: 'Data Analysis',
 }
diff --git a/src/language/EN/Profile.js b/src/language/EN/Profile.js
@@ -11,7 +11,7 @@ const Profile = {
   SETTINGS: 'Settings',
   COLOR_SCHEME: 'Color Scheme',
   TEMPLATE: 'Template',
-  COLLECTION_TEMPLATE: 'Collection Template',
+  COLLECTION_TEMPLATE: 'Surveying Template',
   PLOTTING_TEMPLATE: 'Plotting Template',
   NAVIGATION: 'Navigation',
   INCREMENT: 'Increment',

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ const baseMapsOrigin = [`
`14`	`14`	`'CycleMap@OpenStreetMaps',`
`15`	`15`	`'TransportMap@OpenStreetMaps',`
`16`	`16`	`'quanguo@SuperMapCloud',`
	`17`	`+ 'roadmap_cn@bingMap',`
`17`	`18`	`'baseMap',`
`18`	`19`	`]`
`19`	`20`	`let baseMaps = [...baseMapsOrigin]`