Merge branch 'newUI'

lizhanwei

2020-05-14 8735b56eefde751618c819f5b331a56a62274a5c

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

@@ -56,6 +56,8 @@
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.MyArgEditText;
import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
@@ -77,10 +79,12 @@
    private static final int REQUEST_CODE_CAR = 101;
    private int request_code = REQUEST_CODE_MAP;
    private Button btn_config_signal;
    private Button btn_mcu_upgrade,btn_map_select,btn_roadmap_select;
    private EditText et_ip,et_port,et_simulte_ip,et_simulate_port;
    private Button btn_mcu_upgrade,btn_map_select;
    private Gson gson = new Gson();
    private EditText et_ip_rtk,et_port_rtk,et_city_id,et_city_province,et_phone;


    private MyArgEditText platform_ip,platform_port,rtkPlatform_ip,rtkPlatform_port,city,province;

    private RTKConfigViewModel rtkConfigViewModel;
    private RTKConfig mRtkConfig;
    private boolean needSendRtk = false;
@@ -88,7 +92,7 @@
    public static SetArgumentsFragment newInstance() {
        return new SetArgumentsFragment();
    }
//
    
    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -101,11 +105,11 @@
            if (rtkConfig != null){
                Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
                mRtkConfig = rtkConfig;
                et_ip_rtk.setText(rtkConfig.getIp());
                et_city_id.setText(String.valueOf(rtkConfig.getCity()));
                et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
                et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
                et_phone.setText(rtkConfig.getPhone());

                rtkPlatform_ip.updateStr(rtkConfig.getIp());
                rtkPlatform_port.updateStr(String.valueOf(rtkConfig.getPort()));
                city.updateStr(String.valueOf(rtkConfig.getCity()));
                province.updateStr(String.valueOf(rtkConfig.getProvince()));
                ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
                ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());

@@ -131,7 +135,6 @@
                e.printStackTrace();
            }
            jsonObject.remove("_id");
            rtkjson = null;
            rtkjson = jsonObject.toString();
            MyLog.i( "need resend RTK配置信息：" + rtkjson+"标志位："+needSendRtk);
            AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
@@ -142,45 +145,38 @@

    }
    private void initView(View view) {
//        toolbar =view.findViewById(R.id.toolbar);
//        toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp,null));
//        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
//            @Override
//            public void onClick(View v) {
//                _mActivity.onBackPressed();
//            }
//        });
//        toolbar.setTitle("设置参数");
        if (HomeFragment.class.getSimpleName().equals(getTopFragment().getClass().getSimpleName())){
            ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
            ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
        }else{
            ((MainActivity)_mActivity).viewtitle.setVisibility(View.VISIBLE);
            ((MainActivity)_mActivity).btn_return.setVisibility(View.VISIBLE);
        }
        view.findViewById(R.id.btn_save_platform).setOnClickListener(this);
        et_ip = view.findViewById(R.id.et_platform_ip);
        et_port = view.findViewById(R.id.et_platform_port);
        et_ip.setText(ExamPlatformData.getInstance().getPlatformIP());
        et_port.setText(ExamPlatformData.getInstance().getPlatformPort()+"");
        platform_ip = view.findViewById(R.id.platform_ip);
        platform_port = view.findViewById(R.id.platform_port);

        platform_ip.updateStr(ExamPlatformData.getInstance().getPlatformIP());

        platform_port.updateStr(ExamPlatformData.getInstance().getPlatformPort()+"");
        btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
        btn_map_select = view.findViewById(R.id.btn_map_select);
        btn_roadmap_select = view.findViewById(R.id.btn_roadmap_select);
        view.findViewById(R.id.btn_car_select).setOnClickListener(this);
        btn_mcu_upgrade.setOnClickListener(this);
        btn_map_select.setOnClickListener(this);
        btn_roadmap_select.setOnClickListener(this);
        btn_config_signal = view.findViewById(R.id.btn_signal_conf);
        btn_config_signal.setOnClickListener(this);


        et_ip_rtk = view.findViewById(R.id.rtk_addr_ip);
        et_simulte_ip = view.findViewById(R.id.simulate_ip);
        et_city_id = view.findViewById(R.id.et_city_id);
        et_city_province = view.findViewById(R.id.et_provice_id);
        et_phone = view.findViewById(R.id.et_phone);
        et_port_rtk = view.findViewById(R.id.rtk_addr_port);
        et_simulate_port = view.findViewById(R.id.simulate_port);

        rtkPlatform_ip = view.findViewById(R.id.rtk_addr_ip);
        rtkPlatform_port = view.findViewById(R.id.rtk_addr_port);
        city = view.findViewById(R.id.city_id);
        province = view.findViewById(R.id.province_id);
    }
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.btn_inpsect_signal:
                break;

            case R.id.btn_signal_conf:
                SupportFragment signalFragment = findChildFragment(SignalConfigFragment.class);
                if (signalFragment == null){
@@ -207,24 +203,32 @@
                break;
            case R.id.btn_save_platform:
                Toast.makeText(_mActivity, "保存成功", Toast.LENGTH_SHORT).show();
                if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){
                String tempPlatformIp = platform_ip.getInputStr().trim();
                String tempRTKPlatformIp = rtkPlatform_ip.getInputStr().trim();


                int city_id_ = Integer.parseInt(city.getInputStr().trim());

                int province_id_ = Integer.parseInt(province.getInputStr().trim());

                int tempPlatformPort = Integer.parseInt(platform_port.getInputStr().trim());
                int tempRTKPlatformPort = Integer.parseInt(rtkPlatform_port.getInputStr().trim());

                if(ExamPlatformData.getInstance().compareIPandPort(tempPlatformIp,tempPlatformPort)){
                    SPUtils.put(getActivity(), SPUtils.DES_HEX_PWD,"");
                    ((MainActivity)getActivity()).examPlatformModel.getDataChange().postValue(1);
                    ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim());
                    ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim()));
                    ExamPlatformData.getInstance().insertPlatformIp(tempPlatformIp);
                    ExamPlatformData.getInstance().insertPlatformPort(tempPlatformPort);
                }

                if (mRtkConfig != null){
                    String rtkip = et_ip_rtk.getText().toString().trim();
                    int rtkport = Integer.parseInt(et_port_rtk.getText().toString().trim());

                    mRtkConfig.setPort(rtkport);
                    mRtkConfig.setCity(Integer.parseInt(et_city_id.getText().toString().trim()));
                    mRtkConfig.setProvince(Integer.parseInt(et_city_province.getText().toString().trim()));
                    mRtkConfig.setIp(rtkip);
                    mRtkConfig.setPhone(et_phone.getText().toString().trim());
                    mRtkConfig.setPort(tempRTKPlatformPort);
                    mRtkConfig.setCity(city_id_);
                    mRtkConfig.setProvince(province_id_);
                    mRtkConfig.setIp(tempRTKPlatformIp);

                    if (ExamPlatformData.getInstance().compareRTKIPandPort(rtkip,rtkport)){
                    if (ExamPlatformData.getInstance().compareRTKIPandPort(tempRTKPlatformIp,tempRTKPlatformPort)){
                        mRtkConfig.setRegistered(0);
                        MyLog.i("rtk ip和地址有变化");
                        needSendRtk = true;
@@ -234,9 +238,6 @@
                    rtkConfigViewModel.insertRTKConfig(mRtkConfig);

                }



                _mActivity.onBackPressed();
                break;
            case R.id.btn_car_select://车辆模型和地图公用一套代码 区别在于REQUEST_CODE
@@ -244,12 +245,22 @@
                openFileMgr();
                break;
            case R.id.btn_map_select:
                request_code = REQUEST_CODE_MAP;
                openFileMgr();
                break;
            case R.id.btn_roadmap_select:
                request_code = REQUEST_CODE_ROADMAP;
                openFileMgr();
                SelectDialog selectDialog = SelectDialog.newInstance();
                selectDialog.show(getFragmentManager(),"selectdialog");
                selectDialog.setSelectedListener((int res) -> {
                    if (res != SelectDialog.SELECT_NONE){
                        if (res == SelectDialog.FIRST){
                            request_code = REQUEST_CODE_MAP;
                            Toast.makeText(_mActivity, "场考地图选择！", Toast.LENGTH_SHORT).show();
                        }else{
                            request_code = REQUEST_CODE_ROADMAP;
                            Toast.makeText(_mActivity, "路考地图选择！", Toast.LENGTH_SHORT).show();
                        }
                        openFileMgr();
                    }else{
                        Toast.makeText(_mActivity, "没有任何选择！", Toast.LENGTH_SHORT).show();
                    }
                });
                break;
            default:
                break;
@@ -335,4 +346,9 @@
    public void onDetach() {
        super.onDetach();
    }

    @Override
    public void onDestroyView() {
        super.onDestroyView();
    }
}