From 1c1476896d3667bbfa3460859658a8fa02377c8e Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期四, 15 四月 2021 10:16:26 +0800
Subject: [PATCH] 如果地图url=null,就url="".然后ArcGisMapFragment根据url是否为空字符串来判定加载http gisurl地图还是 changdi.mmpk; 文件名必须是changdi.mmpk 必须放在包名下

---
 app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
index f34ff80..7b3b742 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -272,10 +272,12 @@
 
         setupMap();
 
-
-//        addTrailheadsLayer();
-        url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/shoufei0223.mmpk";
-        Log.i(TAG,"url ========="+url);
+        if (!TextUtils.isEmpty(url)){
+            MyLog.i(TAG,"鐜板湪http鍔犺浇锛�"+url);
+             addTrailheadsLayer();
+        }else{
+                    url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/changdi.mmpk";
+        MyLog.i(TAG,"鐜板湪鍔犺浇锛�"+url);
         final MobileMapPackage mobileMapPackage = new MobileMapPackage(url);
         mobileMapPackage.loadAsync();
         mobileMapPackage.addDoneLoadingListener(()->{
@@ -286,6 +288,8 @@
                 mMapView.setMap(mainArcGismapMMPK);
             }
         });
+        }
+
         return view;
     }
 
@@ -342,7 +346,9 @@
                 if (messageRemoteService != null) {
                     this.cmd = messageRemoteService.msgCode;
                     this.json = messageRemoteService.json;
-                    MyLog.i(TAG, json);
+
+                    //澶浜� 涓嶈兘鎵�
+//                    MyLog.i(TAG, json);
 
 
                     RealTimeCarPos timeCarPos = gson.fromJson((String) json, RealTimeCarPos.class);
@@ -797,7 +803,7 @@
     }
     private void readGisCar() {
 
-        String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/gisvehiclemodel.json";
+        String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/vehiclemodel.json";
         if (TextUtils.isEmpty(carFilePath)){
             Toast.makeText(_mActivity, "杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�", Toast.LENGTH_SHORT).show();
             MyLog.i (TAG, "GISCar杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�");

--
Gitblit v1.8.0