lizhanwei
2020-01-08 59447247cbcee1dea6e9a2c0426b244047061316
修改FTP配置页面为RTK配置(目前只配置了RTK ip。port、省ID、市ID)
4个文件已修改
23 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/PasswordFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_ftp_setting.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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();
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="省ID:"/>
        <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="市ID:"/>
        <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>
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>