修改地图和信号配置加锁

lizhanwei

2020-07-27 202bc6b58cc9b5157761163e645c8e0170ab97ac

 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());

                        }

                }

            }