lizhanwei
2020-04-22 dd069631189d426e1d5c934cd3f917581b3fb021
完成系统配置界面
8个文件已修改
4个文件已添加
109 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/list_divider.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/right_arrow.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/tab_bg.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/gps_info_item_rightarrow.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/inspect_signal_head.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_base_set.xml 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_gps_info.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xhdpi/click_it.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xhdpi/conn_status.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/dimens.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
@@ -96,19 +97,13 @@
                                    if (fields[i].getName().equalsIgnoreCase("version")){
                                        version= (String) fields[i].get(mcuInfo);
                                        version = new String(BytesUtils.hexStringToBytes(version),"GBK");
                                        versionDes= "版本号:";
                                        versionDes= "版本号                     ";
                                        version = version+"#"+ BuildConfig.VERSION_NAME;
                                        version = versionDes+version;
                                        spannableString = new SpannableString(version);
                                        spannableString.setSpan(new AbsoluteSizeSpan(22),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                                        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#A8AAA7")),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                                        spannableString.setSpan(new AbsoluteSizeSpan(28),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                                        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFFFFF")),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                                        datas.add(new BaseDataUIBean( spannableString,R.mipmap.version_pic));
                                        setitemInfo(versionDes,version,R.mipmap.version_pic);
                                    }else if(fields[i].getName().equalsIgnoreCase("sn")){
                                        setitemInfo("设备序列号:", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
                                        setitemInfo("设备序列号            ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
                                    }else if(fields[i].getName().equalsIgnoreCase("selftest")){
                                        setitemInfo("自检状态:", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
                                        setitemInfo("自检状态                ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
                                    }
                                } catch (IllegalAccessException e) {
@@ -122,17 +117,17 @@
                                public void run() {
                                    if (mRtkConfig != null){
                                        setitemInfo("省ID:", String.valueOf(mRtkConfig.getProvince()),R.mipmap.province_id);
                                        setitemInfo("市ID:", String.valueOf(mRtkConfig.getCity()),R.mipmap.province_id);
                                        setitemInfo("RTK平台地址:", mRtkConfig.getIp()+":"+mRtkConfig.getPort(),R.mipmap.platform_pic);
                                        setitemInfo("考试平台地址:",ExamPlatformData.getInstance().getPlatformIP()
                                        setitemInfo("省ID                          ", String.valueOf(mRtkConfig.getProvince()),R.mipmap.province_id);
                                        setitemInfo("市ID                          ", String.valueOf(mRtkConfig.getCity()),R.mipmap.province_id);
                                        setitemInfo("RTK平台地址         ", mRtkConfig.getIp()+":"+mRtkConfig.getPort(),R.mipmap.platform_pic);
                                        setitemInfo("考试平台地址         ",ExamPlatformData.getInstance().getPlatformIP()
                                                +":"+ExamPlatformData.getInstance().getPlatformPort(),R.mipmap.platform_pic);
                                    }
                                    if (appStatus != null){
                                        setitemInfo("RTK平台状态:", appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"已登录":"未登录"):"未连接",R.mipmap.province_id);
                                        setitemInfo("考试平台状态:", ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()),R.mipmap.province_id);
                                        setitemInfo("RTK平台状态         ", appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"已登录":"未登录"):"未连接",R.mipmap.conn_status);
                                        setitemInfo("考试平台状态         ", ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()),R.mipmap.conn_status);
                                    }
                                    gpsInfoAdapter.addAll(datas);
                                }
@@ -175,6 +170,8 @@
        View headView = inflater.inflate(R.layout.inspect_signal_head,null);
        lv.addFooterView(footView);
        lv.addHeaderView(headView);
        lv.setDivider(new ColorDrawable(Color.parseColor("#2A344B")));
        lv.setDividerHeight(1);
        footView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(SetArgumentsFragment.newInstance()));
        headView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(InspectSignalFragment.newInstance()));
app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
@@ -1,12 +1,16 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.viewpager.widget.ViewPager;
import android.text.SpannableString;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -60,15 +64,20 @@
        tabLayout.addTab(tabLayout.newTab());
//        tabLayout.addTab(tabLayout.newTab());
        tb = view.findViewById(R.id.toolbar);
        tb.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp);
        tb.setNavigationOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                _mActivity.onBackPressed();
            }
        });
        tb.setTitle(R.string.sys_setting);
        tb.setSubtitle(R.string.sys_setting_sub);
        String str = "系统配置 智能考培,助力驾考新旅程";
        SpannableString spannableString = new SpannableString(str);
        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFFFFF")),
                0,4, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
        spannableString.setSpan(new AbsoluteSizeSpan(28),
                0,4, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
        tb.setTitle(spannableString);
        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#ffa1a1a3")),
                5,str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
        spannableString.setSpan(new AbsoluteSizeSpan(18),
                5,str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
        tb.setTitle(spannableString);
    }
    @Override
app/src/main/res/drawable/list_divider.xml
New file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="line">
<size android:height="1px" />
    <stroke
        android:width="1dp"
        android:color="@android:color/holo_red_dark"/>
</shape>
app/src/main/res/drawable/right_arrow.png

app/src/main/res/drawable/tab_bg.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
<solid android:color="#ff1e4a89"/>
    <corners android:radius="3dp"/>
</shape>
app/src/main/res/layout/gps_info_item_rightarrow.xml
@@ -6,6 +6,10 @@
    android:textAppearance="?android:attr/textAppearanceListItemSmall"
    android:gravity="center_vertical"
    android:text="设置参数"
    android:textColor="#A8AAA7"
    android:textSize="18sp"
    android:drawableLeft="@mipmap/click_it"
    android:drawablePadding="@dimen/ui_margin_5dp"
    android:drawableRight="@drawable/right_arrow"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
app/src/main/res/layout/inspect_signal_head.xml
@@ -6,6 +6,10 @@
    android:textAppearance="?android:attr/textAppearanceListItemSmall"
    android:gravity="center_vertical"
    android:text="车载信号"
    android:textColor="#A8AAA7"
    android:drawablePadding="@dimen/ui_margin_5dp"
    android:drawableLeft="@mipmap/click_it"
    android:textSize="@dimen/network_train_textsize22px"
    android:drawableRight="@drawable/right_arrow"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
app/src/main/res/layout/layout_base_set.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"  android:layout_height="match_parent">
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
        android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">
        android:orientation="vertical"
        android:layout_marginLeft="@dimen/ui_margin_10dp"
        android:layout_marginRight="@dimen/ui_margin_10dp"
        android:layout_marginBottom="@dimen/ui_margin_25dp"
        android:background="@drawable/stu_score_bg"
        >
    <com.google.android.material.appbar.AppBarLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -23,7 +30,6 @@
            android:layout_height="wrap_content"
            android:id="@+id/tab_base_set"
            android:background="@color/profile_bg"
            android:layout_below="@+id/toolbar_set">
        </com.google.android.material.tabs.TabLayout>
    </com.google.android.material.appbar.AppBarLayout>
@@ -33,4 +39,17 @@
        android:id="@+id/vp_base_set">
    </androidx.viewpager.widget.ViewPager>
</LinearLayout>
    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginLeft="@dimen/ui_margin_10dp"
        android:layout_marginRight="@dimen/ui_margin_10dp"
        android:layout_marginBottom="@dimen/ui_margin_25dp"
        android:layout_marginTop="@dimen/ui_margin_50dp"
        android:background="@drawable/stu_score_bg"
        />
</FrameLayout>
app/src/main/res/layout/layout_gps_info.xml
@@ -5,5 +5,7 @@
    <ListView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginLeft="@dimen/ui_margin_10dp"
        android:layout_marginRight="@dimen/ui_margin_10dp"
        android:id="@+id/lv_gpsinfo"></ListView>
</LinearLayout>
app/src/main/res/mipmap-xhdpi/click_it.png
app/src/main/res/mipmap-xhdpi/conn_status.png
app/src/main/res/values/dimens.xml
@@ -14,4 +14,8 @@
    <dimen name="width_160px_dp">127dp</dimen>
    <dimen name="network_train_textsize21px">17sp</dimen>
    <dimen name="network_train_textsize25px">19sp</dimen>
    <dimen name="ui_margin_30dp">30dp</dimen>
    <dimen name="ui_margin_25dp">25dp</dimen>
    <dimen name="ui_margin_80dp">80dp</dimen>
    <dimen name="ui_margin_50dp">50dp</dimen>
</resources>