From 15ee4664eaf906538a348b2cc3986417750b20d4 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 12 六月 2020 15:40:39 +0800
Subject: [PATCH] 修改缺少地图时不发送地图，
---
app/src/main/java/safeluck/drive/evaluation/app.java | 22 +++++++++++++++++-----
app/src/main/res/layout/profile_layout.xml | 9 ++++++---
app/src/main/res/values/dimens.xml | 1 +
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 732c3b2..1f96554 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -255,12 +255,25 @@
MyLog.i("鏀跺埌鑰冭瘯搴旂瓟閿欒鐮�="+errCode);
switch (errCode){
case -1:
-// sendMapInfo();
-// break;
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ if (TextUtils.isEmpty(ExamPlatformData.getInstance().getRoadMapPath())){
+ MyLog.i("寮�濮嬭�冭瘯鍚庯紝杩滅▼鏈嶅姟缂哄皯璺�冨湴鍥撅紝浣嗗湴鍥剧‘瀹炰笉瀛樺湪鏃犳硶鍙戦�佺粰杩滅▼鏈嶅姟");
+ return;
+ }
+ }
+ if (ExamPlatformData.getInstance().getExamType()==ExamPlatformData.EXAM_TYPE_ChangKAO){
+ if (TextUtils.isEmpty(ExamPlatformData.getInstance().getMapPath())){
+ MyLog.i("寮�濮嬭�冭瘯鍚庯紝杩滅▼鏈嶅姟缂哄皯chang鑰冨湴鍥撅紝浣嗗湴鍥剧‘瀹炰笉瀛樺湪鏃犳硶鍙戦�佺粰杩滅▼鏈嶅姟");
+ return;
+ }
+ }
+
+ sendMapInfo();
+ break;
case -2:
-// sendVechileInfo();
-// break;
+ sendVechileInfo();
+ break;
case -3:
Data data = new Data.Builder().putInt(Constant.NEED_MAPS_CAR,1).build();
OneTimeWorkRequest examStatausOutWorker1 = new OneTimeWorkRequest.Builder(ExamStatusOutWorker.class)
@@ -534,7 +547,6 @@
AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
}else{
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",roadmapPath));
-
CThreadPoolExecutor.runOnMainThread(new Runnable() {
@Override
public void run() {
diff --git a/app/src/main/res/layout/profile_layout.xml b/app/src/main/res/layout/profile_layout.xml
index 93d32d4..acb67a2 100644
--- a/app/src/main/res/layout/profile_layout.xml
+++ b/app/src/main/res/layout/profile_layout.xml
@@ -8,6 +8,7 @@
<LinearLayout android:layout_width="457dp"
android:layout_height="105dp"
android:orientation="horizontal"
+ android:layout_weight="3"
android:background="@drawable/stu_score_bg"
>
@@ -69,9 +70,10 @@
</LinearLayout>
<LinearLayout android:layout_width="166dp"
android:layout_height="105dp"
+ android:layout_weight="1"
android:orientation="vertical"
android:id="@+id/view_map"
- android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_35dp"
android:background="@drawable/view_map_bg"
>
<ImageView
@@ -96,7 +98,8 @@
<LinearLayout
android:layout_width="143dp"
android:layout_height="105dp"
- android:layout_marginLeft="10dp"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/ui_margin_35dp"
android:orientation="vertical"
>
<LinearLayout
@@ -130,7 +133,7 @@
/>
</LinearLayout>
<Button
- android:layout_width="match_parent"
+ android:layout_width="143dp"
android:layout_height="match_parent"
android:textColor="#ffffff"
android:background="@drawable/start_exam_bg"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3267616..0252eb5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,4 +20,5 @@
<dimen name="ui_margin_50dp">50dp</dimen>
<dimen name="ui_margin_40dp">40dp</dimen>
<dimen name="ui_margin_45dp">45dp</dimen>
+ <dimen name="ui_margin_35dp">35dp</dimen>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0