From d5bf5c845908b9429904140383956c94760e3e40 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 10 二月 2020 18:13:23 +0800
Subject: [PATCH] 系统设置里基础数据增加升级单片机配置
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1
app/src/main/java/safeluck/drive/evaluation/app.java | 4 +-
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java | 13 +++++-
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 19 +++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 9 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 2
app/src/main/res/layout/layout_base_datas.xml | 37 ++++++++++++++++++
7 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 4458296..9edc49a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -71,5 +71,6 @@
public static final int DEBUG_TXT = 0x0010;
public static final String BIND_RTCM_TOPIC = "BIND_RTCM_TOPIC";
public static final String BIND_DEBUG_TXT = "BIND_DEBUG_TXT";
+ public static final int UPGRADE_MCU_CONTENT_FILE = 21;
public static String exam_enter_exitdata="exam_enter_exitdata";
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 457b8e6..fe7d44e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -234,7 +234,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- StringBuffer vebuffer =FileUtil.readTxtFileFromSD(getApplicationContext(),Constant.VEHICLE);
+ StringBuffer vebuffer =FileUtil.readTxtFileFromSD(getApplicationContext(),Constant.VEHICLE,false);
if (vebuffer != null){
AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,vebuffer.toString());
@@ -249,7 +249,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- StringBuffer buffer =FileUtil.readTxtFileFromSD(getApplicationContext(),Constant.MAP);
+ StringBuffer buffer =FileUtil.readTxtFileFromSD(getApplicationContext(),Constant.MAP,false);
if (buffer != null){
AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index 2dd2bdc..ff1144a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -9,8 +9,13 @@
import android.widget.Button;
import android.widget.Toast;
+import com.anyun.exam.lib.AYSdk;
+import com.anyun.exam.lib.MyLog;
+
import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.util.FileUtil;
/**
* 鍩虹鏁版嵁璁剧疆
@@ -22,8 +27,10 @@
*/
public class BaseDatasFragment extends SupportFragment implements View.OnClickListener {
+ private static final String TAG = BaseDatasFragment.class.getSimpleName();
private Button btn_inspect_signal;
private Button btn_config_signal;
+ private Button btn_mcu_upgrade;
public static SupportFragment newInstance() {
return new BaseDatasFragment();
@@ -41,6 +48,8 @@
private void initView(View view) {
btn_inspect_signal = view.findViewById(R.id.btn_inpsect_signal);
+ btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
+ btn_mcu_upgrade.setOnClickListener(this);
btn_inspect_signal.setOnClickListener(this);
btn_config_signal = view.findViewById(R.id.btn_signal_conf);
btn_config_signal.setOnClickListener(this);
@@ -55,6 +64,16 @@
case R.id.btn_signal_conf:
((BaseSettingFragment)getParentFragment()).startBrotherFragment(SignalConfigFragment.newInstance());
break;
+ case R.id.btn_mcu_upgrade:
+ StringBuffer stringBuffer = FileUtil.readTxtFileFromSD(getContext(),"dfu.bin",true);
+ if (stringBuffer != null){
+
+ AYSdk.getInstance().sendCmd(Constant.UPGRADE_MCU_CONTENT_FILE, stringBuffer.toString());
+ }else{
+ MyLog.i(TAG,"mcu鍗囩骇鏂囦欢涓嶅瓨鍦�");
+ }
+
+ break;
default:
break;
}
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 559f021..4739eda 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -449,7 +449,7 @@
// 5 - 鐩磋杞集
- StringBuffer buffer = FileUtil.readTxtFileFromSD(_mActivity,Constant.MAP);
+ StringBuffer buffer = FileUtil.readTxtFileFromSD(_mActivity,Constant.MAP,false);
Type type = new TypeToken<List<ExamMap>>(){}.getType();
if (buffer != null){
List<ExamMap> examMaps = gson.fromJson(buffer.toString().trim(), type);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 9fd9d18..9fef302 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -5,6 +5,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import android.speech.tts.TextToSpeech;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -20,9 +21,11 @@
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
+import com.anyun.exam.lib.util.Speaker;
import com.google.android.material.textfield.TextInputEditText;
import java.util.List;
+import java.util.Locale;
import java.util.Random;
import me.yokeyword.fragmentation.SupportFragment;
@@ -116,10 +119,8 @@
/**======================娴嬭瘯鏁版嵁搴撶粨鏉�==================*/
-
-
-
-
+ Speaker speaker = new Speaker(getActivity());
+ speaker.speak("涓浗鍔犳补锛岄噸搴嗗姞娌�");
String userId = "100002";
String token = "token_" + userId;
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 58e5238..7c68423 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
@@ -4,6 +4,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.os.Environment;
+import android.text.TextUtils;
import android.util.Log;
import com.anyun.exam.lib.MyLog;
@@ -64,15 +65,21 @@
}
- public static StringBuffer readTxtFileFromSD(Context context,String fileName){
+ public static StringBuffer readTxtFileFromSD(Context context,String fileName,boolean isRootDir){
String lineTxt = null;
StringBuffer stringBuffer = new StringBuffer();
try {
+ String dir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/";
InputStream inputStream = null;
- String dir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+context.getPackageName();
+ if (isRootDir){
+
+ }else{
+
+ dir = dir+context.getPackageName();
+ }
File file = new File(dir,fileName);
if (!file.exists()){
- MyLog.d(TAG,fileName+"鏂囦欢涓嶅瓨鍦�");
+ MyLog.d(TAG,dir+"鐩綍涓�"+fileName+"鏂囦欢涓嶅瓨鍦�");
return null;
}
try {
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 5ae08d7..a3bd3de 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -58,6 +58,7 @@
android:layout_height="wrap_content"
android:gravity="center">
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -72,6 +73,7 @@
/>
</TableRow>
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -94,6 +96,7 @@
android:background="@android:drawable/editbox_background_normal"/>
</TableRow>
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -143,6 +146,7 @@
android:id="@+id/btn_signal_conf"
android:layout_marginLeft="15dp"
android:background="@drawable/btn_bg_baseset"/>
+
</TableRow>
</TableLayout>
</LinearLayout>
@@ -153,6 +157,39 @@
android:layout_marginBottom="10dp"
android:background="@color/colorAccent"
/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/black"
+ android:text="閰嶇疆鍙傛暟锛�"/>
+ <TableLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center">
+ <TableRow android:gravity="center_horizontal"
+ android:layout_marginBottom="10dp">
+
+ <Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍗囩骇鍗曠墖鏈�"
+ android:padding="5dp"
+ android:id="@+id/btn_mcu_upgrade"
+ android:layout_marginLeft="15dp"
+ android:background="@drawable/btn_bg_baseset"/>
+ </TableRow>
+ </TableLayout>
+ </LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:background="@color/colorAccent"
+ />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
Gitblit v1.8.0