把道路、场地、模型更新功能放到设置参数；修改基础数据，使之对齐

endian11

2020-09-10 9f4af8f45a67819d32f1c403025b7090c027c457

把道路、场地、模型更新功能放到设置参数；修改基础数据，使之对齐

 app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java

@@ -104,11 +104,12 @@
                                        version = new String(BytesUtils.hexStringToBytes(version),"GBK");
                                        versionDes= "版本号                     ";
                                        version = version+"#"+ BuildConfig.VERSION_NAME;
                                        setitemInfo(versionDes,version,R.mipmap.version_pic);

                                        datas.add(new BaseDataUIBean(str2SpannableString(versionDes),R.mipmap.version_pic,str2FouregourdSpannableString(version),"",1,null));
                                    }else if(fields[i].getName().equalsIgnoreCase("sn")){
                                        setitemInfo("设备序列号            ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
                                        datas.add(new BaseDataUIBean(str2SpannableString("设备序列号"),R.mipmap.device_sn,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
                                    }else if(fields[i].getName().equalsIgnoreCase("selftest")){
                                        setitemInfo("自检状态                ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
                                        datas.add(new BaseDataUIBean(str2SpannableString("自检状态 "),R.mipmap.auto_check_status,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
                                    }

                                } catch (IllegalAccessException e) {
@@ -122,17 +123,16 @@
                                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()
                                                +":"+ExamPlatformData.getInstance().getPlatformPort(),R.mipmap.platform_pic);

                                        datas.add(new BaseDataUIBean(str2SpannableString("省ID  "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getProvince())),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("市ID  "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getCity())),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("RTK平台地址  "),R.mipmap.platform_pic,str2FouregourdSpannableString(mRtkConfig.getIp()+":"+mRtkConfig.getPort()),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("考试平台地址  "),R.mipmap.platform_pic,str2FouregourdSpannableString(ExamPlatformData.getInstance().getPlatformIP()
                                                +":"+ExamPlatformData.getInstance().getPlatformPort()),"",1,null));

                                    }
                                    if (appStatus != null){
                                        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);
                                          datas.add(new BaseDataUIBean(str2SpannableString("RTK平台状态"),R.mipmap.conn_status,str2FouregourdSpannableString(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"已登录":"未登录"):"未连接"),"",1,null));
                                          datas.add(new BaseDataUIBean(str2SpannableString("考试平台状态"),R.mipmap.conn_status,str2FouregourdSpannableString(ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus())),"",1,null));
                                    }
                                    HashMap<BaseDataUIBean.TYPE_, MapInfoHead> hashMaps = ExamPlatformData.getInstance().getMapInfoHeads();
                                    if (hashMaps != null){
@@ -163,16 +163,7 @@
        return spannableString;
    }

    private void setitemInfo(String des, String str, int id){
        versionDes=des;
        version= versionDes+str;
        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,id));
    }


    public static SupportFragment newInstance() {
        return new BaseDatasFragment();
@@ -271,16 +262,13 @@
            BaseDataUIBean.TYPE_ type = datas.get((int)view.getTag()).getType_();
            switch (type){
                case car:
                    Toast.makeText(_mActivity, "更新车模型", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");

                    break;
                case road:
                    Toast.makeText(_mActivity, "更新道路地图", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");

                    break;
                case yard:
                    Toast.makeText(_mActivity, "更新场地地图", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");

                    break;
            }
        }

 app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java

@@ -59,6 +59,7 @@
import safeluck.drive.evaluation.customview.MyArgEditText;
import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.DataInitKt;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
@@ -162,6 +163,9 @@
        btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
        btn_map_select = view.findViewById(R.id.btn_map_select);
        view.findViewById(R.id.btn_car_select).setOnClickListener(this);
        view.findViewById(R.id.btn_car_upgrade).setOnClickListener(this);
        view.findViewById(R.id.btn_yard_update).setOnClickListener(this);
        view.findViewById(R.id.btn_road_update).setOnClickListener(this);
        btn_mcu_upgrade.setOnClickListener(this);
        btn_map_select.setOnClickListener(this);
        btn_config_signal = view.findViewById(R.id.btn_signal_conf);
@@ -262,6 +266,18 @@
                    }
                });
                break;
            case R.id.btn_car_upgrade:
                Toast.makeText(_mActivity, "更新车模型", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");
                break;
            case R.id.btn_yard_update:
                Toast.makeText(_mActivity, "更新场地地图", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
                break;
            case R.id.btn_road_update:
                Toast.makeText(_mActivity, "更新道路地图", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");
                break;
            default:
                break;
        }

 app/src/main/res/layout/layout_arc_gis.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/activity_main"
    android:layout_width="match_parent"
@@ -11,4 +11,12 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent" >
    </com.esri.arcgisruntime.mapping.view.MapView>
</RelativeLayout>
    <Button
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|left"
        android:id="@+id/btn_change_map"
        android:background="@drawable/btn_state_save"

        android:text="切换地图"/>
</FrameLayout>

 app/src/main/res/layout/layout_base_datas.xml

@@ -215,6 +215,49 @@
    </LinearLayout>


        <LinearLayout
            android:layout_width="match_parent"
            android:layout_marginBottom="10dp"
            android:layout_height="60dp"
            android:gravity="center_vertical"
            android:orientation="horizontal">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize25px"
                android:text="地图升级："/>


            <Button  android:layout_width="129dp"
                android:layout_height="@dimen/ui_margin_50dp"
                android:text="车辆模型升级"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:layout_marginLeft="60dp"
                android:id="@+id/btn_car_upgrade"
                android:background="@drawable/btn_bg_baseset"/>
            <Button  android:layout_width="129dp"
                android:layout_height="@dimen/ui_margin_50dp"
                android:text="场地地图升级"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_yard_update"
                android:layout_marginLeft="8dp"
                android:background="@drawable/btn_bg_baseset"/>
            <Button   android:layout_width="129dp"
                android:layout_height="@dimen/ui_margin_50dp"
                android:text="道路地图升级"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_road_update"
                android:layout_marginLeft="8dp"
                android:background="@drawable/btn_bg_baseset"/>

        </LinearLayout>


    </LinearLayout>

 app/src/main/res/layout/layout_mapfragment.xml

@@ -22,12 +22,5 @@
        android:background="@drawable/btn_state_save"
        android:layout_marginLeft="120dp"
        android:text="缩小"/>
    <Button
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|left"
        android:id="@+id/btn_change_map"
        android:background="@drawable/btn_state_save"
        android:layout_marginLeft="240dp"
        android:text="切换地图"/>

</FrameLayout>

 app/src/main/res/layout/map_car_info_update.xml

@@ -4,14 +4,16 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:gravity="center_horizontal">
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:minHeight="?android:attr/listPreferredItemHeightSmall"
    android:gravity="center_vertical">

    <TextView
        android:id="@+id/tv_map_name"
        android:layout_width="wrap_content"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:text="涪陵交通驾校"
        android:layout_weight="3"
        android:layout_weight="1"
        android:drawablePadding="@dimen/ui_margin_5dp"
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -21,10 +23,10 @@

    <TextView
        android:id="@+id/tv_version"
        android:layout_width="wrap_content"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:text="@string/mapversion"
        android:layout_weight="1"
        android:layout_weight="2"
        android:textColor="@android:color/white"
 />

@@ -34,7 +36,8 @@
        android:text="更新车辆模型"
        android:textColor="@android:color/white"
        android:background="@drawable/bg_rgb_dlg"
        android:layout_weight="2"
        android:layout_weight="0"
        android:visibility="gone"
        android:id="@+id/btn_update_map_car"
     />
</LinearLayout>

 app/src/main/res/values/strings.xml

@@ -57,4 +57,26 @@
        <item>下面将进行模拟夜间行驶场景灯光使用的考试，请按语音指令在5秒内做出相应的灯光操作</item>
        <item>模拟夜间考试完成请关闭所有灯光，请起步继续完成考试</item>
    </array>







    <!-- 刷新 -->
    <string name="pull_to_refresh">下拉刷新</string>
    <string name="release_to_refresh">释放立即刷新</string>
    <string name="refreshing">正在刷新...</string>
    <string name="refresh_fail">刷新失败</string>
    <string name="pullup_to_load">上拉加载更多</string>
    <string name="release_to_load">释放立即加载</string>
    <string name="loading">正在加载...</string>
    <string name="load_succeed">加载成功</string>
    <string name="load_fail">加载失败</string>


    <string name="auto_act_to_select">请选择需要连接的蓝牙设备</string>
    <string name="auto_act_to_refresh">请尝试下拉刷新</string>

</resources>