From 202bc6b58cc9b5157761163e645c8e0170ab97ac Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 27 七月 2020 17:29:41 +0800
Subject: [PATCH] 修改地图和信号配置加锁

---
 app/src/main/java/safeluck/drive/evaluation/app.java |   55 +++++++++++++++++++------------------------------------
 1 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 2401054..23357ad 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -549,15 +549,18 @@
                         AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,str);
                     }else{
                         MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",carPath));
+                        CThreadPoolExecutor.runOnMainThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getAppContext(), "鏂囦欢锛�"+carPath+"涓嶅瓨鍦�", Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }else{
-                    StringBuffer vebuffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.VEHICLE);
-                    if (vebuffer != null){
-
-                        AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,vebuffer.toString());
-                    }else{
-                        MyLog.d(TAG,String.format("杞﹁締妯″瀷妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
-                    }
+                    CThreadPoolExecutor.runOnMainThread(()->{
+                        MyLog.i("杞﹁締妯″瀷鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�");
+                        Toast.makeText(getAppContext(), "杞﹁締妯″瀷鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�", Toast.LENGTH_SHORT).show();
+                    });
                 }
 
             }
@@ -588,21 +591,13 @@
                         });
                     }
                 }else{
-                    StringBuffer buffer;
-                    buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.ROAD_MAP);
-                    if (buffer != null){
-
-                        AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,buffer.toString());
-                    }else{
-                        MyLog.d(TAG,String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
-                        CThreadPoolExecutor.runOnMainThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                Toast.makeText(getAppContext(), String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-
-                    }
+                    CThreadPoolExecutor.runOnMainThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            MyLog.i("閬撹矾鍦板浘鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�");
+                            Toast.makeText(getAppContext(), "閬撹矾鍦板浘鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�", Toast.LENGTH_SHORT).show();
+                        }
+                    });
                 }
                 if (!TextUtils.isEmpty(mapPath)){
                     MyLog.i("璋冪敤鏇存柊Map璺緞鍚庣殑鍦板浘"+mapPath);
@@ -622,25 +617,13 @@
                         });
                     }
                 }else{
-                    MyLog.i("璇诲彇Assert鐩綍涓嬪垵濮嬪寲鐨勫湴鍥�");
                     CThreadPoolExecutor.runOnMainThread(new Runnable() {
                         @Override
                         public void run() {
-                            Toast.makeText(getAppContext(), "璇诲彇Assert鐩綍涓嬪垵濮嬪寲鐨勫湴鍥�", Toast.LENGTH_SHORT).show();
+                            MyLog.i("鍦哄湴鍦板浘鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�");
+                            Toast.makeText(getAppContext(), "鍦哄湴鍦板浘鍙戦�佸け璐ワ紝璇锋墜鍔ㄨ缃�", Toast.LENGTH_SHORT).show();
                         }
                     });
-                    StringBuffer buffer;
-
-                        buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.MAP);
-                        if (buffer != null){
-
-                            AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
-                        }else{
-                            MyLog.d(TAG,String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
-                            CThreadPoolExecutor.runOnMainThread(() -> Toast.makeText(getAppContext(), String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()), Toast.LENGTH_SHORT).show());
-
-                        }
-
                 }
 
             }

--
Gitblit v1.8.0