From f3af97387d8d25d6bebd8b4383dee1c22fc947ac Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 27 四月 2021 22:43:46 +0800
Subject: [PATCH] 在设置里增加手动设置离线地图包（场地和道路）
---
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 17 +++++++-
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java | 8 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 27 +++++++++++++
app/src/main/res/layout/layout_base_datas.xml | 45 ++++++++++++++++++++++
4 files changed, 95 insertions(+), 2 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 10c2ba2..0baa039 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -277,10 +277,23 @@
addTrailheadsLayer();
}else{
if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
- url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/road.mmpk";
+ url = ExamPlatformData.getInstance().getRoadMmpkPath();
+ boolean isExist = FileUtil.isFileExist(url);
+ if (!isExist){
+ Toast.makeText(_mActivity, "璇峰湪\"璁剧疆\"閲岄�夋嫨閬撹矾绂荤嚎鍦板浘鍖�", Toast.LENGTH_SHORT).show();
+ }else{
+
+// url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/road.mmpk";
+ }
}else{
- url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/changdi.mmpk";
+ url = ExamPlatformData.getInstance().getYardMmpkPath();
+ boolean isExist = FileUtil.isFileExist(url);
+ if (!isExist){
+ Toast.makeText(_mActivity, "璇峰湪\"璁剧疆\"閲岄�夋嫨鍦哄湴绂荤嚎鍦板浘鍖�", Toast.LENGTH_SHORT).show();
+ }else{
+
+ }
}
MyLog.i(TAG,"鐜板湪鍔犺浇锛�"+url);
final MobileMapPackage mobileMapPackage = new MobileMapPackage(url);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index 2e10dd8..ad9762f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -82,6 +82,8 @@
private static final String TAG = SetArgumentsFragment.class.getSimpleName();
private static final int REQUEST_CODE_MAP = 100;
private static final int REQUEST_CODE_ROADMAP = 102;
+ private static final int REQUEST_CODE_ROAD_MMMPK= 103;
+ private static final int REQUEST_CODE_YARD_MMPK = 104;
private static final int REQUEST_CODE_CAR = 101;
private int request_code = REQUEST_CODE_MAP;
private Button btn_config_signal;
@@ -171,6 +173,8 @@
view.findViewById(R.id.btn_car_upgrade).setOnClickListener(this);
view.findViewById(R.id.btn_yard_update).setOnClickListener(this);
view.findViewById(R.id.btn_road_update).setOnClickListener(this);
+ view.findViewById(R.id.btn_road_mmpk).setOnClickListener(this);
+ view.findViewById(R.id.btn_yard_mmpk).setOnClickListener(this);
btn_mcu_upgrade.setOnClickListener(this);
btn_map_select.setOnClickListener(this);
btn_config_signal = view.findViewById(R.id.btn_signal_conf);
@@ -321,6 +325,16 @@
});
WorkManager.getInstance(_mActivity).enqueue(oneTimeWorkRequest1);
break;
+ case R.id.btn_yard_mmpk:
+ MyLog.i(TAG,"閫夋嫨鍦哄湴绂荤嚎鍦板浘鍖�");
+ request_code = REQUEST_CODE_YARD_MMPK;
+ openFileMgr();
+ break;
+ case R.id.btn_road_mmpk:
+ MyLog.i(TAG,"閫夋嫨閬撹矾绂荤嚎鍦板浘鍖�");
+ request_code = REQUEST_CODE_ROAD_MMMPK;
+ openFileMgr();
+ break;
default:
break;
}
@@ -396,6 +410,19 @@
}
+ }else if (requestCode == REQUEST_CODE_ROAD_MMMPK){
+ if (data != null){
+ final Uri uri= data.getData();
+ MyLog.i(TAG, "road mmpk onActivityResult: "+uri.getPath());
+ ExamPlatformData.getInstance().setRoadMMPKPath(uri.getPath());
+ }
+
+ }else if (requestCode == REQUEST_CODE_YARD_MMPK){
+ if (data != null){
+ final Uri uri = data.getData();
+ MyLog.i(TAG, "yard mmpk onActivityResult: "+uri.getPath());
+ ExamPlatformData.getInstance().setYardMMPKPath(uri.getPath());
+ }
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
index 6f870e7..a77c1ef 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
@@ -400,4 +400,12 @@
e.printStackTrace();
}
}
+
+ public static boolean isFileExist(String path) {
+ File file = new File(path);
+ if (file.exists()){
+ return true;
+ }
+ return false;
+ }
}
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 84703e6..c90b531 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -295,7 +295,52 @@
</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_marginBottom="10dp"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize25px"
+ android:text="绂荤嚎鍦板浘锛�"/>
+
+
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="杞﹁締妯″瀷鍗囩骇"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:layout_marginLeft="60dp"
+ android:id="@+id/btn_car_mmpk"
+ android:visibility="gone"
+ android:background="@drawable/btn_bg_baseset"/>
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="鍦哄湴绂荤嚎鍦板浘"
+ android:padding="5dp"
+ android:layout_marginLeft="60dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:id="@+id/btn_yard_mmpk"
+ android:background="@drawable/btn_bg_baseset"/>
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="閬撹矾绂荤嚎鍦板浘"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:id="@+id/btn_road_mmpk"
+ android:layout_marginLeft="8dp"
+ android:background="@drawable/btn_bg_baseset"/>
+
+ </LinearLayout>
</LinearLayout>
+
<Button
android:id="@+id/btn_return"
android:layout_width="wrap_content"
--
Gitblit v1.8.0