app/src/main/assets/criteria_I.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/assets/criteria_I.json
@@ -73,7 +73,7 @@ "item_id":11, "item_content": "倒车入库", "deducting_reason": "中途停车时间超过2s", "score_deducting":100, "score_deducting":5, "required_precision":"" }, { app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -151,7 +151,7 @@ onlySendOnceRTKConfig = true; } } public ExamPlatformModel examPlatformModel; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -162,7 +162,7 @@ // 进行tcp连接 final String userId = "100002"; final String token = "token_" + userId; ExamPlatformModel examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class); examPlatformModel= ViewModelProviders.of(this).get(ExamPlatformModel.class); examPlatformModel.getDataChange().observe(this, new Observer<Integer>() { @Override public void onChanged(Integer integer) { app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -23,6 +23,7 @@ import me.yokeyword.fragmentation.SupportFragment; import safeluck.drive.evaluation.Constant; import safeluck.drive.evaluation.MainActivity; import safeluck.drive.evaluation.R; import safeluck.drive.evaluation.bean.ExamPlatformData; import safeluck.drive.evaluation.util.FileUtil; @@ -43,7 +44,7 @@ private Button btn_config_signal; private Button btn_mcu_upgrade; private EditText et_ip,et_port; private ExamPlatformModel examPlatformModel; // private ExamPlatformModel examPlatformModel; public static SupportFragment newInstance() { return new BaseDatasFragment(); } @@ -55,7 +56,7 @@ View view = inflater.inflate(R.layout.layout_base_datas, container, false); initView(view); examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class); // examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class); return view; } @@ -63,6 +64,8 @@ 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()+""); btn_inspect_signal = view.findViewById(R.id.btn_inpsect_signal); btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade); btn_mcu_upgrade.setOnClickListener(this); @@ -101,7 +104,7 @@ break; case R.id.btn_save_platform: if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){ examPlatformModel.changeDataValue(1); ((MainActivity)getActivity()).examPlatformModel.getDataChange().postValue(1); ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim()); ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim())); } app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java
@@ -113,4 +113,14 @@ imsClient.addHeartbeatHandler(seconds); } } public void close() { if (isActive){ if (null != imsClient){ imsClient.close(); imsClient = null; } } } } app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java
@@ -14,18 +14,18 @@ public class ExamPlatformModel extends ViewModel { private static final String TAG = "ExamPlatformModel"; private MutableLiveData<Integer> dataChange = new MutableLiveData<>(0); public LiveData<Integer> getDataChange(){ public MutableLiveData<Integer> getDataChange(){ return dataChange; } public void changeDataValue(final int value){ new Thread(new Runnable() { @Override public void run() { dataChange.postValue(value); } }).start(); } // public void changeDataValue(final int value){ // new Thread(new Runnable() { // @Override // public void run() { // dataChange.postValue(value); // } // }).start(); // } } im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
@@ -272,6 +272,7 @@ } catch (Exception e) { e.printStackTrace(); } finally { MyLog.i("关闭tcp连接"); try { if (serverUrlList != null){ serverUrlList.clear();