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/app.java | 4 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 18 ++++++++++++------
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 25 ++++++++++++-------------
im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java | 3 ++-
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 3 ++-
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 3 ++-
6 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index f8ae137..51be84e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -261,7 +261,7 @@
@Override
public void callBackMsg(final int cmd, String json) {
if (cmd!=11 && cmd!=14){
- String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s,绾跨▼鍙�=%d,鏃堕棿=%s", cmd, json,Thread.currentThread().getId(),Utils.formatTimeYYMMDDHHmmSSSSS(System.currentTimeMillis()));
+ String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json);
if (strConent.equalsIgnoreCase(lastStr)){
}else{
@@ -346,7 +346,7 @@
FailedProj failedProj = new FailedProj(Constant.SUBJECT_ALL, emp_id, Constant.TEST_STU_ID, utc, sn);
- MyLog.i("鎻掑叆fail_projects琛�=$failedProj");
+ MyLog.i("鎻掑叆fail_projects琛�="+failedProj.toString());
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getFailProjDao().insert(failedProj);
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杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�");
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 0322a69..2a5fd54 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -1298,7 +1298,8 @@
}
allMap[sanwei] = map.clone();
}else{
- MyLog.i(TAG,String.format("鏇茬嚎 %d, 鐐规暟 %d", sanwei, xys.size()/2));
+
+ Log.i(TAG,String.format("鏇茬嚎 %d, 鐐规暟 %d", sanwei, xys.size()/2));
map_other = new double[xys.size()/2][2];
allOtherMap[sanwei] = new double[xys.size()/2][2];
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 f308d8e..f70ed5d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -457,7 +457,6 @@
item_conents.add(f.getItem_content());
Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
}
MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
currTotalScore -=item_id;
@@ -847,25 +846,25 @@
}
private void startArcGisMapFragment(String url) {
- if (TextUtils.isEmpty(url)){
+ if (url==null){
- url = "http://arcgis.aaej.cn/arcgis/rest/services/楂樺簷鏉戦椋為┚鏍＄浜屽湴鍥�/MapServer";
+ url ="";
}
- if (!TextUtils.isEmpty(url)) {
+
ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
if (jiaXiaoFragment == null) {
jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url);
}
start(jiaXiaoFragment);
- }else{
- Toast.makeText(_mActivity, "閿欒锛欰rcGIS URL 涓虹┖锛�", Toast.LENGTH_SHORT).show();
-
- MapFragment jiaXiaoFragment = findFragment(MapFragment.class);
- if (jiaXiaoFragment == null) {
- jiaXiaoFragment = (MapFragment) MapFragment.newInstance();
- }
- start(jiaXiaoFragment);
- }
+// }else{
+// Toast.makeText(_mActivity, "閿欒锛欰rcGIS URL 涓虹┖锛�", Toast.LENGTH_SHORT).show();
+//
+// MapFragment jiaXiaoFragment = findFragment(MapFragment.class);
+// if (jiaXiaoFragment == null) {
+// jiaXiaoFragment = (MapFragment) MapFragment.newInstance();
+// }
+// start(jiaXiaoFragment);
+// }
}
private String getArcGisUrl(int examType) {
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index a2b0e0e..9c26aec 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -67,7 +67,7 @@
//鍙嶈浆涔�
byte[] datas=messageEscaper.unescape(message);
- MyLog.i(PlatFormConstant.TAG,"鏈嶅姟娑堟伅锛�"+ BytesUtils.bytesToHexString(datas));
+// MyLog.i(PlatFormConstant.TAG,"鏈嶅姟娑堟伅锛�"+ BytesUtils.bytesToHexString(datas));
JK2019MessageBase jk2019MessageBase = MessageManager.get(BytesUtils.bytesToHexString(datas));
if (jk2019MessageBase instanceof JKMessage8100){
if (((JKMessage8100) jk2019MessageBase).result == JKMessage8100.SUCCESS){
@@ -86,6 +86,7 @@
sendMessage(jkMessage0101);
ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_REGISTERED);
}else{
+ MyLog.i(PlatFormConstant.TAG,"璁惧鏈敞鍐�");
ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_NOT_REGISTERED);
}
}else if (jk2019MessageBase instanceof JKMessage8001){
diff --git a/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java b/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
index 7485539..57e0eca 100644
--- a/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
+++ b/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
@@ -337,7 +337,8 @@
return;
}
try {
- MyLog.i(PlatFormConstant.TAG, "瀹㈡埛绔秷鎭紙杞箟鍚庯級锛�"+ BytesUtils.bytesToHexString(msg));
+ //0206娑堟伅澶浜� 锛屽啀璇存墦浜嗘秷鎭唴瀹逛篃鐪嬩笉鎳傦紝涓嶆墦浜� 21/4/15
+// MyLog.i(PlatFormConstant.TAG, "瀹㈡埛绔秷鎭紙杞箟鍚庯級锛�"+ BytesUtils.bytesToHexString(msg));
ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer();
byteBuf.writeBytes(msg);
channel.writeAndFlush(byteBuf);
--
Gitblit v1.8.0