From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
index 49d51a1..dc0c870 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
@@ -25,6 +25,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.MCUInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
@@ -43,9 +44,6 @@
private static final String TAG = "InspectSignalFragment";
private static final int VALIAD_NUM = 1;//1楂樼數骞虫湁鏁�
-
- private TextView textView_turnLight,tv_speed,tv_engine;
- private Toolbar toolbar;
private Gson gson= new Gson();
private Handler handler = new Handler();
private LayoutCheckSignalBinding bingding;
@@ -69,8 +67,8 @@
handler.post(new Runnable() {
@Override
public void run() {
- bingding.tvRoateSpeed.setText(String.valueOf(mcuInfo.getEngine()));
- bingding.tvDangweiNum.setText(String.valueOf(mcuInfo.getSpeed()/10.0));
+ bingding.roatespeed.updateStr(String.valueOf(mcuInfo.getEngine()));
+ bingding.myspeed.updateStr(String.valueOf(mcuInfo.getSpeed()/10.0));
for (int i = 0; i < gpios.size(); i++) {
Log.i(TAG, "run: gpio["+i+"]="+gpios.get(i));
@@ -117,15 +115,15 @@
}
private void initView() {
- toolbar = bingding.inpsectSignalToolbar.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("鏌ョ湅杞﹁浇淇″彿杈撳叆");
+ Log.i(TAG,"currTopFragment="+getTopFragment().getClass().getSimpleName());
+ 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);
+ }
+
}
--
Gitblit v1.8.0