From 542e5bcb04d0f2fc257d27e8f9435c5bac5b61cd Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期日, 26 四月 2020 13:36:11 +0800
Subject: [PATCH] 修改app.java 增加初始数据，而不是依赖远程服务是否执行
---
app/src/main/java/safeluck/drive/evaluation/app.java | 12 +++
app/src/main/res/layout/layout_road_train.xml | 159 +++++++++++++++++++++++++---------------------------
2 files changed, 87 insertions(+), 84 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 6867cfd..4ca59a5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -93,14 +93,22 @@
//鏁版嵁搴撴搷浣�
MyLog.i(TAG, "onCreate111");
FileUtil.createdirs(getApplicationContext());
- //1.鍏堟鏌d鍗″寘鍚嶇殑鐩綍涓嬶紝鏄惁瀛樺湪鍦板浘鏂囦欢鍜岃溅杈嗘ā鍨嬫枃浠�
- //2. 濡傛灉涓嶈兘鍐嶅氨鍘讳笅杞�
+
+ //鑰冭瘯鐘舵�� 锛屼竴浜涘垵濮嬬姸鎬侊紝app涓�浜涚姸鎬佸簲璇ュ厛鍒濆鍖栦竴涓�
+ initData();
}
}
+ private void initData() {
+ CThreadPoolExecutor.runInBackground(()->{
+ int type = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().getStartExamInt();
+ ExamPlatformData.getInstance().setExamType(type);
+ });
+ }
+
public static Context getAppContext(){
return appContext;
}
diff --git a/app/src/main/res/layout/layout_road_train.xml b/app/src/main/res/layout/layout_road_train.xml
index 20d1c7d..19951c5 100644
--- a/app/src/main/res/layout/layout_road_train.xml
+++ b/app/src/main/res/layout/layout_road_train.xml
@@ -8,59 +8,78 @@
<TableLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
-
+ android:layout_height="45dp"
+ android:padding="@dimen/ui_margin_5dp"
android:gravity="bottom">
-<TableRow android:layout_width="wrap_content"
+<TableRow android:layout_width="match_parent"
android:id="@+id/first"
android:layout_height="35dp">
<Button android:id="@+id/btn_1"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
style="@style/ui_exam_font"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:background="@drawable/btn_exam_item_bg"
android:text="@string/straight_line"/>
<Button android:id="@+id/btn_2"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:background="@drawable/btn_exam_item_bg"
-
+ android:layout_marginRight="@dimen/ui_margin_10dp"
style="@style/ui_exam_font"
android:text="@string/add_subtract"/>
<Button android:id="@+id/btn_3"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
style="@style/ui_exam_font"
android:text="@string/pull_over"/>
<Button android:id="@+id/btn_4"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
+ android:text="@string/by_crossing"/>
+ <Button android:id="@+id/btn_5"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:text="@string/junction_left"/>
+ <Button android:id="@+id/btn_6"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
+ android:text="@string/junction_right"/>
+ <Button android:id="@+id/btn_12"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:background="@drawable/btn_exam_item_bg"
style="@style/ui_exam_font"
- android:text="@string/by_crossing"/>
- <Button android:id="@+id/btn_5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
- android:text="@string/junction_left"/>
- <Button android:id="@+id/btn_6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- style="@style/ui_exam_font"
- android:text="@string/junction_right"/>
+ android:text="@string/lane_change"/>
</TableRow>
<TableRow android:layout_width="wrap_content"
@@ -68,96 +87,72 @@
android:layout_height="35dp">
<Button android:id="@+id/btn_7"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:background="@drawable/btn_exam_item_bg"
-
+ android:layout_marginRight="@dimen/ui_margin_10dp"
style="@style/ui_exam_font"
android:text="@string/crosswalk"/>
<Button android:id="@+id/btn_8"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
style="@style/ui_exam_font"
android:background="@drawable/btn_exam_item_bg"
-
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/school_area"/>
<Button android:id="@+id/btn_9"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
style="@style/ui_exam_font"
android:background="@drawable/btn_exam_item_bg"
-
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/bus_area"/>
<Button android:id="@+id/btn_10"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
style="@style/ui_exam_font"
android:background="@drawable/btn_exam_item_bg"
-
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_11"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
-
- android:visibility="gone"
-
- android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_12"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
-
- style="@style/ui_exam_font"
- android:text="@string/lane_change"/>
- <Button android:id="@+id/btn_13"
- android:layout_width="wrap_content"
+ <Button android:id="@+id/btn_14"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
- android:visibility="gone"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
+ android:text="@string/start_vehicle"/>
+ <Button android:id="@+id/btn_16"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="@string/pull_over"/>
+
+
+ <Button android:id="@+id/btn_13"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:background="@drawable/btn_exam_item_bg"
style="@style/ui_exam_font"
android:text="@string/night_driving"/>
</TableRow>
- <TableRow android:layout_width="wrap_content"
- android:visibility="gone"
- android:id="@+id/third"
- android:layout_height="35dp">
- <Button android:id="@+id/btn_14"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
-
- style="@style/ui_exam_font"
- android:text="@string/junction_right"/>
- <Button android:id="@+id/btn_15"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
-
- style="@style/ui_exam_font"
- android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_16"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
-
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/pull_over"/>
- </TableRow>
</TableLayout>
</ScrollView>
\ No newline at end of file
--
Gitblit v1.8.0