From 95b1eabebe92ebc69f506f3599a5090604e440bb Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期一, 15 三月 2021 15:17:29 +0800
Subject: [PATCH] 驾考添加日志打印到文件； TrainFragment默认给arcgis url赋值，后面arcgis map用到的url的是mmpk文件
---
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 6 +++---
app/src/main/java/safeluck/drive/evaluation/viewmodels/MainViewModel.java | 1 -
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 4 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java | 1 -
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 9 ++++++---
app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentab.java | 1 -
7 files changed, 12 insertions(+), 12 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 0345799..f34ff80 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -124,7 +124,7 @@
if (examStatus.getEnter()==ENTER){
double scale = mMapView.getMapScale();
MyLog.i(TAG,String.format("杩涘叆[%d] map,scale=%f",examStatus.getMap_id(),scale));
- mMapView.setViewpointScaleAsync(scale * 0.2);
+ mMapView.setViewpointScaleAsync(scale * 0.5*0.5);
@@ -132,7 +132,7 @@
double scale = mMapView.getMapScale();
MyLog.i(TAG,String.format("閫�鍑篬%d] map,scale=%f",examStatus.getMap_id(),scale));
- mMapView.setViewpointScaleAsync(scale * 5);
+ mMapView.setViewpointScaleAsync(scale * 2);
}
}
@@ -733,7 +733,7 @@
// create an empty map instance
ArcGISMap map = new ArcGISMap();
Log.i(TAG,String.format("map.getMiniScale=%f",map.getMinScale()));
- map.setMinScale(400.0);
+ map.setMinScale(300.0);
// add map image layer as operational layer
map.getOperationalLayers().add(mapImageLayer);
mMapView.setMap(map);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
index 29744f1..8e95c30 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
@@ -173,7 +173,7 @@
- url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/shoufei0220.mmpk";
+ url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/shoufei0223.mmpk";
Log.i(TAG,"url ========="+url);
final MobileMapPackage mobileMapPackage = new MobileMapPackage(url);
mobileMapPackage.loadAsync();
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index 6ad97e7..418a00c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -827,7 +827,7 @@
canvas3.drawCircle((float) base_x, (float) base_y, 2, paint);
paint.setColor(Color.RED);
-
+ Log.i(TAG,String.format("scalex=%d,scaley=%d,car[0][0]=%f,base_x=%f,base_y=%f",scale_x,scale_y,car[tire.get(0)][0],base_x,base_y));
canvas3.drawCircle((float) (base_x + (car[tire.get(0)][0]) * scale_x), (float) (base_y + (car[tire.get(0)][1]) * scale_y), 2.5f, paint);
canvas3.drawCircle((float) (base_x + (car[tire.get(1)][0]) * scale_x), (float) (base_y + (car[tire.get(1)][1]) * scale_y), 2.5f, paint);
canvas3.drawCircle((float) (base_x + (car[tire.get(2)][0]) * scale_x), (float) (base_y + (car[tire.get(2)][1]) * scale_y), 2.5f, paint);
@@ -1178,7 +1178,6 @@
if (messageRemoteService != null){
this.cmd = messageRemoteService.msgCode;
this.json = messageRemoteService.json;
- MyLog.i(TAG, json);
RealTimeCarPos timeCarPos = gson.fromJson((String) json, RealTimeCarPos.class);
@@ -1341,7 +1340,6 @@
}
}
}else{
- MyLog.i(TAG,"鏆傛椂鏀寔鏇茬嚎");
map_other = new double[xys.size()/2][2];
for (int k=0; k<xys.size();k++){
if ((k % 2) == 0) {
@@ -1443,4 +1441,9 @@
}
+
+
+
+
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
index 4dbbdac..e422d48 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
@@ -1340,7 +1340,6 @@
messageRemoteService = (MessageRemoteService) queue.poll();
if (messageRemoteService != null) {
- MyLog.i(TAG, messageRemoteService.json+" 娑堟伅闃熷垪闀垮害锛�"+queue.size());
RealTimeCarPos timeCarPos = gson.fromJson((String) messageRemoteService.json, RealTimeCarPos.class);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentab.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentab.java
index 472c443..1c98ed6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentab.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentab.java
@@ -1341,7 +1341,6 @@
messageRemoteService = (MessageRemoteService) queue.poll();
if (messageRemoteService != null) {
- MyLog.i(TAG, messageRemoteService.json+" 娑堟伅闃熷垪闀垮害锛�"+queue.size());
RealTimeCarPos timeCarPos = gson.fromJson((String) messageRemoteService.json, RealTimeCarPos.class);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 3e6ef06..e08c3ec 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -749,7 +749,7 @@
case R.id.view_map:
String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
- Log.i(TAG,"map head lulao gps url="+url);
+ MyLog.i(TAG,"map head arcgis url="+url);
startArcGisMapFragment(url);
@@ -848,7 +848,7 @@
private void startArcGisMapFragment(String url) {
-// url = "http://arcgis.aaej.cn/arcgis/rest/services/楂樺簷鏉戦椋為┚鏍＄浜屽湴鍥�/MapServer";
+ url = "http://arcgis.aaej.cn/arcgis/rest/services/楂樺簷鏉戦椋為┚鏍＄浜屽湴鍥�/MapServer";
if (!TextUtils.isEmpty(url)) {
ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
if (jiaXiaoFragment == null) {
diff --git a/app/src/main/java/safeluck/drive/evaluation/viewmodels/MainViewModel.java b/app/src/main/java/safeluck/drive/evaluation/viewmodels/MainViewModel.java
index 85846c9..f35d597 100644
--- a/app/src/main/java/safeluck/drive/evaluation/viewmodels/MainViewModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/viewmodels/MainViewModel.java
@@ -22,7 +22,6 @@
}
private void loadJson() {
- MyLog.i("loadJson");
new Thread(new Runnable() {
@Override
public void run() {
--
Gitblit v1.8.0