From 59447247cbcee1dea6e9a2c0426b244047061316 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 08 一月 2020 10:01:56 +0800
Subject: [PATCH] 修改FTP配置页面为RTK配置（目前只配置了RTK ip。port、省ID、市ID）
---
app/src/main/res/layout/layout_ftp_setting.xml | 18 ++++++++++++------
app/src/main/res/values/strings.xml | 1 +
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
index 4906bbc..4129fd3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
@@ -20,7 +20,7 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public class SimpleFragmentAdapter extends FragmentPagerAdapter {
- private String[] mTitles = new String[]{"鍩虹鏁版嵁","FTP閰嶇疆","椹炬牎淇℃伅"};
+ private String[] mTitles = new String[]{"鍩虹鏁版嵁","RTK閰嶇疆","椹炬牎淇℃伅"};
public SimpleFragmentAdapter(FragmentManager fm) {
super(fm);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java
index 7880b83..4923ca6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java
@@ -61,7 +61,7 @@
break;
case R.id.btn_sure:
String pwd = editText.getText().toString().trim();
- if (!TextUtils.isEmpty(pwd) && pwd.equals("123456")) {
+ if (!TextUtils.isEmpty(pwd) && pwd.equals("1")) {
BaseSettingFragment sysSetingFragment = findFragment(BaseSettingFragment.class);
if (sysSetingFragment == null) {
sysSetingFragment = (BaseSettingFragment) BaseSettingFragment.newInstance();
diff --git a/app/src/main/res/layout/layout_ftp_setting.xml b/app/src/main/res/layout/layout_ftp_setting.xml
index 9b3c0d0..5fcae59 100644
--- a/app/src/main/res/layout/layout_ftp_setting.xml
+++ b/app/src/main/res/layout/layout_ftp_setting.xml
@@ -14,7 +14,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
- android:text="鏈嶅姟鍣ㄥ湴鍧�锛�"/>
+ android:text="@string/rtk_addr_des"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -23,6 +23,7 @@
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:id="@+id/rtk_addr_ip"
android:text="192.168.23.12"
android:background="@android:drawable/editbox_background_normal"/>
<TextView
@@ -33,6 +34,7 @@
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:id="@+id/rtk_addr_port"
android:text="8080"
android:background="@android:drawable/editbox_background_normal"/>
</LinearLayout>
@@ -56,22 +58,25 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
- android:text="鐢ㄦ埛鍚嶏細"/>
+ android:text="鐪両D锛�"/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="GpsExam"
+ android:id="@+id/et_provice_id"
+ android:text="12"
+ android:inputType="numberDecimal"
android:background="@android:drawable/editbox_background_normal"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
- android:text="瀵嗙爜锛�"/>
+ android:text="甯侷D锛�"/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="192.168.23.12"
- android:inputType="textPassword"
+ android:id="@+id/et_city_id"
+ android:text="192"
+ android:inputType="numberDecimal"
android:background="@android:drawable/editbox_background_normal"/>
</LinearLayout>
<View
@@ -84,5 +89,6 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:id="@+id/btn_save_rtk"
android:text="淇濆瓨"/>
</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fdbc7dc..47b5726 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,4 +17,5 @@
<string name="description_info">Info</string>
<string name="request_permission">This sample needs camera permission.</string>
<string name="camera_error">This device doesn\'t support Camera2 API.</string>
+ <string name="rtk_addr_des">RTK骞冲彴鍦板潃锛�</string>
</resources>
--
Gitblit v1.8.0