From fff165b3215de255000cb133d51ceb03b5202bd6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 10 一月 2020 16:07:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/res/layout/layout_rtk_setting.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/layout/layout_rtk_setting.xml b/app/src/main/res/layout/layout_rtk_setting.xml
index 7be4603..83faf92 100644
--- a/app/src/main/res/layout/layout_rtk_setting.xml
+++ b/app/src/main/res/layout/layout_rtk_setting.xml
@@ -98,6 +98,73 @@
android:layout_marginBottom="10dp"
android:background="@color/colorAccent"
/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_reg"
+ android:text="@string/rtk_register_status"
+ android:layout_weight="1"/>
+ <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_connect"
+ android:text="@string/rtk_connect_status"
+ android:layout_weight="1"/>
+ <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_imei"
+ android:text="@string/rtk_config_imei"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:background="@color/colorAccent"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_login"
+ android:text="@string/rtk_config_login"
+ android:layout_weight="1"/> <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_model"
+ android:text="@string/rtk_config_model"
+ android:layout_weight="1"/>
+ <TextView
+ android:textColor="@android:color/black"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_rtk_sn"
+ android:text="@string/rtk_config_sn"
+ android:layout_weight="1"/>
+
+ </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