From dfd4367d5c4a64743b2a842602a94578b993fdde Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 22 四月 2020 09:27:15 +0800
Subject: [PATCH] 完成所有页面基础，还需完善细节
---
app/src/main/res/drawable/green_light.xml | 2
app/src/main/res/layout/layout_check_signal.xml | 19 +
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 60 +--
app/src/main/res/mipmap-xhdpi/auto_check_status.png | 0
app/src/main/res/layout/layout_train_fragment.xml | 1
app/src/main/res/mipmap-xhdpi/version_pic.png | 0
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 10
app/src/main/res/drawable/ic_btn_daikao.xml | 2
app/src/main/res/layout/activity_main.xml | 35 ++
app/src/main/res/drawable/ic_btn_save_nopress.xml | 5
app/src/main/res/layout/gps_info_item.xml | 1
app/src/main/res/layout/layout_base_datas.xml | 127 +--------
app/src/main/res/layout/layout_signal_slice.xml | 73 +++-
app/src/main/res/mipmap-xhdpi/province_id.png | 0
app/src/main/java/safeluck/drive/evaluation/bean/BaseDataUIBean.java | 45 +++
app/src/main/res/drawable/btn_state_save.xml | 4
app/src/main/java/safeluck/drive/evaluation/adapter/BaseDataInfoAdapter.java | 85 ++++++
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 66 +++++
app/src/main/res/layout/layout_stu_score.xml | 14 -
app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java | 19
app/src/main/res/drawable/ic_btn_save_press.xml | 5
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 119 +++++---
app/src/main/res/layout/layout_base_set.xml | 1
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 57 +--
app/src/main/res/mipmap-xhdpi/device_sn.png | 0
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 27 +-
app/src/main/res/mipmap-xhdpi/platform_pic.png | 0
app/src/main/res/layout/networktoolbar.xml | 1
28 files changed, 465 insertions(+), 313 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 7df7eb4..1593fe3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -14,6 +14,9 @@
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
import android.widget.Toast;
@@ -25,6 +28,8 @@
import androidx.work.WorkManager;
import me.yokeyword.fragmentation.SupportActivity;
+import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
+import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
@@ -64,17 +69,24 @@
import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
import safeluck.drive.evaluation.viewmodels.TimeViewModel;
-public class MainActivity extends SupportActivity implements IMSConnectStatusCallback {
+public class MainActivity extends SupportActivity implements IMSConnectStatusCallback, View.OnClickListener {
private static final int PERMISSIONS_REQUEST_CODE = 1001;
private String TAG = MainActivity.class.getCanonicalName();
SignalConfigViewModel signalConfigViewModel;
private PermissionManager mPermissionsManager;
private RTKConfig mRTKConfig;//RTK閰嶇疆淇℃伅
+ private ImageView iv_rtk_status;
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
public ExamPlatformModel examPlatformModel;
+
+ private TextView tv_sat_num,tv_work_platform,tv_network_time,
+ tv_qf;
+
+ public Button btn_return;
+ public View viewtitle;
private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
@@ -113,8 +125,52 @@
hideBottomUIMenu();
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_main);
+
+ viewtitle = findViewById(R.id.top_title);
+ btn_return = findViewById(R.id.btn_return);
+
+
+ btn_return.setOnClickListener(this);
+ iv_rtk_status = findViewById(R.id.iv_rtk_connect);
+ tv_work_platform = findViewById(R.id.platform);
+
+ tv_sat_num = findViewById(R.id.tv_sat_num_instatus);
+ tv_qf = findViewById(R.id.tv_qf);
+ iv_rtk_status.getDrawable().setLevel(0);
+ tv_network_time = findViewById(R.id.network_time);
+
+
+ tv_network_time.setText(Utils.getHHmm());
//鍒濆鍖杢ts
ExamPlatformData.getInstance().initTTS(getApplicationContext());
+
+
+
+ AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
+ appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
+ @Override
+ public void onChanged(AppStatus appStatus) {
+ if (appStatus != null){
+ Log.i(TAG, "onChanged: "+appStatus.toString());
+ iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
+ tv_work_platform.setText(getString(R.string.platform_status,ExamPlatformData.getInstance().getExamplatformStatusStr(
+ ExamPlatformData.getInstance().getExamplatformStatus()
+ )));
+ tv_sat_num.setText(String.valueOf(appStatus.getSat_num()).length()==1?"0"+appStatus.getSat_num():String.valueOf(appStatus.getSat_num()));
+ tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()]);
+ }
+ }
+ });
+
+ TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
+ timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
+ @Override
+ public void onChanged(String s) {
+ tv_network_time.setText(s);
+ }
+ });
+
+
// TODO
// 杩涜tcp杩炴帴
final String userId = "100002";
@@ -340,4 +396,12 @@
}
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.btn_return:
+ onBackPressed();
+ break;
+ }
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/BaseDataInfoAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/BaseDataInfoAdapter.java
new file mode 100644
index 0000000..4eb06aa
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/BaseDataInfoAdapter.java
@@ -0,0 +1,85 @@
+package safeluck.drive.evaluation.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.BaseDataUIBean;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2020/1/10. 16:33:13
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+
+public class BaseDataInfoAdapter extends BaseAdapter {
+ private List<BaseDataUIBean> persons = new ArrayList<>();//gps淇℃伅
+ private final static String TAG = "anyun_info";
+ private Context mContext;
+ @Override
+ public int getCount() {
+ return persons.size();
+ }
+
+ @Override
+ public BaseDataUIBean getItem(int i) {
+ return persons.get(i);
+ }
+
+ @Override
+ public long getItemId(int i) {
+ return i;
+ }
+
+ @Override
+ public View getView(int i, View view, ViewGroup viewGroup) {
+ InfoHodler infoHodler = null;
+ if (view == null){
+ view = LayoutInflater.from(mContext).inflate(R.layout.gps_info_item,null);
+ infoHodler = new InfoHodler();
+ infoHodler.name = view.findViewById(R.id.text_check_info);
+ view.setTag(infoHodler);
+ }else{
+ infoHodler = (InfoHodler) view.getTag();
+ }
+
+ infoHodler.name.setText(getItem(i).getDes());
+ infoHodler.name.setCompoundDrawablesWithIntrinsicBounds(mContext.getResources().
+ getDrawable(getItem(i).getRes_id()),null,null,null);
+ infoHodler.name.setCompoundDrawablePadding(10);
+ return view;
+ }
+
+ public BaseDataInfoAdapter(Context mContext) {
+ this.mContext = mContext;
+ }
+ /**
+ * //鍏堟竻鎺夊師鏉ョ殑鎵�鏈夋暟鎹啀娣诲姞鏂板姞杩涙潵鎵�鏈夌殑鏁版嵁
+ * @param ps
+ */
+ public void addAll(List<BaseDataUIBean> ps){
+ persons.clear();//鍏堟竻鎺夊師鏉ョ殑鎵�鏈夋暟鎹�
+ persons.addAll(ps);//鍐嶆坊鍔犳柊鍔犺繘鏉ユ墍鏈夌殑鏁版嵁
+ notifyDataSetChanged();//鍒锋柊鐣岄潰
+ }
+
+ static class InfoHodler {
+
+
+ public TextView name;//濮撳悕
+
+
+
+
+
+ }
+
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/BaseDataUIBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/BaseDataUIBean.java
new file mode 100644
index 0000000..185680a
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/BaseDataUIBean.java
@@ -0,0 +1,45 @@
+package safeluck.drive.evaluation.bean;
+
+import android.text.SpannableString;
+
+import androidx.annotation.IdRes;
+
+/**
+ * @ProjectName: DriveJudge
+ * @Package: safeluck.drive.evaluation.bean
+ * @ClassName: BaseDataUIBean
+ * @Description: java绫讳綔鐢ㄦ弿杩�
+ * @Author: 鏉庡崰浼�
+ * @CreateDate: 2020-04-21 16:28
+ * @UpdateUser: 鏇存柊鑰�
+ * @UpdateDate: 2020-04-21 16:28
+ * @UpdateRemark: 鏇存柊璇存槑
+ * @Version: 1.0
+ */
+
+public class BaseDataUIBean {
+ private SpannableString des;
+ @IdRes
+ private int res_id;
+
+ public BaseDataUIBean(SpannableString s, int res_id) {
+ this.des = s;
+ this.res_id = res_id;
+ }
+
+ public SpannableString getDes() {
+ return des;
+ }
+
+ public void setDes(SpannableString des) {
+ this.des = des;
+ }
+
+ public int getRes_id() {
+ return res_id;
+ }
+
+ public void setRes_id(int res_id) {
+ this.res_id = res_id;
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index 4413c8a..40c1934 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -2,8 +2,11 @@
import android.content.Context;
import android.content.Intent;
+import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
+
+import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
@@ -11,6 +14,10 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -43,9 +50,11 @@
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.adapter.BaseDataInfoAdapter;
import safeluck.drive.evaluation.adapter.GpsInfoAdapter;
import safeluck.drive.evaluation.adapter.QuickAdapter;
import safeluck.drive.evaluation.adapter.WrapContentLinearLayoutManager;
+import safeluck.drive.evaluation.bean.BaseDataUIBean;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
@@ -67,6 +76,9 @@
private Gson gson = new Gson();
private RTKConfig mRtkConfig;
private AppStatus appStatus;
+ private SpannableString spannableString;
+ private String versionDes;
+ private String version;
private AppStatusViewModel appStatusViewModel;
private ICEventListener icEventListener = new ICEventListener() {
@Override
@@ -82,13 +94,21 @@
fields[i].setAccessible(true);
try {
if (fields[i].getName().equalsIgnoreCase("version")){
- String version = (String) fields[i].get(mcuInfo);
+ version= (String) fields[i].get(mcuInfo);
version = new String(BytesUtils.hexStringToBytes(version),"GBK");
- datas.add("鐗堟湰鍙凤細" + version+"#"+ BuildConfig.VERSION_NAME);
+ 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));
}else if(fields[i].getName().equalsIgnoreCase("sn")){
- datas.add( "璁惧搴忓垪鍙凤細" + fields[i].get(mcuInfo));
+ setitemInfo("璁惧搴忓垪鍙凤細", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
}else if(fields[i].getName().equalsIgnoreCase("selftest")){
- datas.add( "鑷鐘舵�侊細" + fields[i].get(mcuInfo));
+ setitemInfo("鑷鐘舵�侊細", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
}
} catch (IllegalAccessException e) {
@@ -102,16 +122,17 @@
public void run() {
if (mRtkConfig != null){
- datas.add("鐪両D锛�"+mRtkConfig.getProvince());
- datas.add("甯侷D锛�"+mRtkConfig.getCity());
- datas.add("RTK骞冲彴鍦板潃锛�"+mRtkConfig.getIp()+":"+mRtkConfig.getPort());
+ setitemInfo("鐪両D锛�", String.valueOf(mRtkConfig.getProvince()),R.mipmap.province_id);
+ setitemInfo("甯侷D锛�", 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("鑰冭瘯骞冲彴鍦板潃锛�"+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());
}
if (appStatus != null){
- datas.add("RTK骞冲彴鐘舵�侊細"+(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�"));
- datas.add("鑰冭瘯骞冲彴鐘舵�侊細"+ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()));
+ 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);
}
gpsInfoAdapter.addAll(datas);
}
@@ -122,16 +143,25 @@
}
};
+ 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();
}
- private List<String> datas = new ArrayList<>();
- private RecyclerView recyclerView;
+ private List<BaseDataUIBean> datas = new ArrayList<>();
private ListView lv;
- private GpsInfoAdapter gpsInfoAdapter;
- private List<String> gpsinfos = new ArrayList<>();
+ private BaseDataInfoAdapter gpsInfoAdapter;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -145,53 +175,39 @@
View headView = inflater.inflate(R.layout.inspect_signal_head,null);
lv.addFooterView(footView);
lv.addHeaderView(headView);
- footView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-// SetArgumentsFragment setArgumentsFragment = findFragment(SetArgumentsFragment.class);
-// if (setArgumentsFragment == null){
-// setArgumentsFragment = SetArgumentsFragment.newInstance();
-// }
- ((BaseSettingFragment)getParentFragment()).startBrotherFragment(SetArgumentsFragment.newInstance());
-
- }
- });
- headView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- ((BaseSettingFragment)getParentFragment()).startBrotherFragment(InspectSignalFragment.newInstance());
-
- }
- });
+ footView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(SetArgumentsFragment.newInstance()));
+ headView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(InspectSignalFragment.newInstance()));
RTKConfigViewModel rtkConfigViewModel= ViewModelProviders.of(this).get(RTKConfigViewModel.class);
- rtkConfigViewModel.getRTKConfig().observe(this, new Observer<RTKConfig>() {
- @Override
- public void onChanged(RTKConfig rtkConfig) {
- if (rtkConfig != null){
- Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
- mRtkConfig = rtkConfig;
- }
-
-
+ rtkConfigViewModel.getRTKConfig().observe(this, rtkConfig -> {
+ if (rtkConfig != null){
+ Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
+ mRtkConfig = rtkConfig;
}
+
+
});
appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
- appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
- @Override
- public void onChanged(AppStatus ppStatus) {
- if (ppStatus != null){
- appStatus = ppStatus;
- }
+ appStatusViewModel.getAppStatus().observe(this, ppStatus -> {
+ if (ppStatus != null){
+ appStatus = ppStatus;
}
});
return view;
}
private void initView(View view) {
+ 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);
+ }
lv = view.findViewById(R.id.lv_gpsinfo);
- gpsInfoAdapter = new GpsInfoAdapter(_mActivity);
+ gpsInfoAdapter = new BaseDataInfoAdapter(_mActivity);
lv.setAdapter(gpsInfoAdapter);
}
@@ -206,4 +222,11 @@
super.onDetach();
CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_MCUINFO_TOPIC);
}
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
+ ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
index 78f59ae..6b8483b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -4,6 +4,7 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -23,6 +24,7 @@
import me.yokeyword.fragmentation.ISupportFragment;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.BuildConfig;
+import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.customview.LoadProgressDialog;
@@ -54,6 +56,14 @@
}
private void initView(View view) {
+ 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);
+ }
view.findViewById(R.id.network_train).setOnClickListener(this);
view.findViewById(R.id.car_train).setOnClickListener(this);
view.findViewById(R.id.system_setting).setOnClickListener(this);
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..a419254 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;
@@ -117,15 +118,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);
+ }
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index e477a6b..33ded82 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -54,6 +54,7 @@
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProjViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
+import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
@@ -101,10 +102,10 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id,tv_work_platform,tv_network_time,
- tv_qf,tv_start_time,tv_sex;
+ private TextView tv_speed,tv_total_score,tv_name,tv_id,
+ tv_start_time,tv_sex;
private double speed=0.0;
- private ImageView iv_rtk_status,iv_head;
+ private ImageView iv_head;
private int currTotalScore = 100;
private List<ScoreBean> mArrayList = new ArrayList<>();
@@ -502,28 +503,7 @@
});
- AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
- appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
- @Override
- public void onChanged(AppStatus appStatus) {
- if (appStatus != null){
- Log.i(TAG, "onChanged: "+appStatus.toString());
- iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
- tv_work_platform.setText(getString(R.string.platform_status,ExamPlatformData.getInstance().getExamplatformStatusStr(
- ExamPlatformData.getInstance().getExamplatformStatus())));
- tv_sat_num.setText(String.valueOf(appStatus.getSat_num()).length()==1?"0"+appStatus.getSat_num():String.valueOf(appStatus.getSat_num()));
- tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()]);
- }
- }
- });
- TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
- timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
- @Override
- public void onChanged(String s) {
- tv_network_time.setText(s);
- }
- });
return view;
}
@@ -532,6 +512,14 @@
private void initView(View view) {
+ 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);
+ }
btn_ids.add(R.id.btn_1);
btn_ids.add(R.id.btn_2);
btn_ids.add(R.id.btn_3);
@@ -554,22 +542,15 @@
tv_id = view.findViewById(R.id.tv_ID);
tv_start_time = view.findViewById(R.id.tv_start_time);
tv_sex = view.findViewById(R.id.tv_sex);
- tv_work_platform = view.findViewById(R.id.platform);
- iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
- iv_rtk_status.getDrawable().setLevel(0);
+
iv_head = view.findViewById(R.id.iv_head);
- tv_sat_num = view.findViewById(R.id.tv_sat_num_instatus);
- tv_qf = view.findViewById(R.id.tv_qf);
tv_speed = view.findViewById(R.id.tv_speed);
tv_total_score = view.findViewById(R.id.tv_total_score);
- tv_network_time = view.findViewById(R.id.network_time);
- tv_network_time.setText(Utils.getHHmm());
tv_speed.setText(getResources().getString(R.string.speed,speed));
- view.findViewById(R.id.btn_return).setOnClickListener(this);
mListView = view.findViewById(R.id.lv);
mListView.setFocusable(false);
mListView.setOnTouchListener((v, ev) -> {
@@ -651,9 +632,7 @@
}
break;
- case R.id.btn_return:
- _mActivity.onBackPressed();
- break;
+
case R.id.iv_head:
MyLog.i(PlatFormConstant.HTTPTAG,"绛惧埌");
loadProgressDialog = LoadProgressDialog.newInstance("璇风◢鍚�...");
@@ -761,6 +740,7 @@
public void onAttach(Context context) {
super.onAttach(context);
CEventCenter.onBindEvent(true,icEventListener,Constant.BIND_SPEED_TOPIC);
+
}
@Override
@@ -778,4 +758,11 @@
tv_total_score.setText(msp);
}
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
+ ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index b1318fd..178bbd7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -142,17 +142,14 @@
}
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);
- view.findViewById(R.id.btn_return).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());
@@ -180,8 +177,7 @@
@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){
@@ -252,8 +248,6 @@
request_code = REQUEST_CODE_ROADMAP;
openFileMgr();
break;
- case R.id.btn_return:
- _mActivity.onBackPressed();
default:
break;
}
@@ -338,4 +332,9 @@
public void onDetach() {
super.onDetach();
}
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 758d410..7c679f1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -57,6 +57,7 @@
import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProjViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
+import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
import safeluck.drive.evaluation.bean.ExamPlatformData;
@@ -104,10 +105,10 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id,tv_work_platform,tv_network_time
- ,tv_qf,tv_start_time,tv_sex;
+ private TextView tv_speed,tv_total_score,tv_name,tv_id
+ ,tv_start_time,tv_sex;
private double speed=0.0;
- private ImageView iv_rtk_status,iv_head;
+ private ImageView iv_head;
WokViewModel wokViewModel;
private int currTotalScore = 100;
@@ -489,29 +490,7 @@
}
});
- AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
- appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
- @Override
- public void onChanged(AppStatus appStatus) {
- if (appStatus != null){
- Log.i(TAG, "onChanged: "+appStatus.toString());
- iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
- tv_work_platform.setText(getString(R.string.platform_status,ExamPlatformData.getInstance().getExamplatformStatusStr(
- ExamPlatformData.getInstance().getExamplatformStatus()
- )));
- tv_sat_num.setText(String.valueOf(appStatus.getSat_num()).length()==1?"0"+appStatus.getSat_num():String.valueOf(appStatus.getSat_num()));
- tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()]);
- }
- }
- });
- TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
- timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
- @Override
- public void onChanged(String s) {
- tv_network_time.setText(s);
- }
- });
return view;
}
@@ -519,6 +498,14 @@
private void initView(View view) {
+ 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);
+ }
btn_ids.add(R.id.btn_1);
btn_ids.add(R.id.btn_2);
btn_ids.add(R.id.btn_3);
@@ -541,24 +528,14 @@
tv_id = view.findViewById(R.id.tv_ID);
tv_start_time = view.findViewById(R.id.tv_start_time);
tv_sex = view.findViewById(R.id.tv_sex);
- tv_work_platform = view.findViewById(R.id.platform);
- iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
- iv_rtk_status.getDrawable().setLevel(0);
iv_head = view.findViewById(R.id.iv_head);
- tv_sat_num = view.findViewById(R.id.tv_sat_num_instatus);
- tv_qf = view.findViewById(R.id.tv_qf);
tv_speed = view.findViewById(R.id.tv_speed);
tv_total_score = view.findViewById(R.id.tv_total_score);
- tv_network_time = view.findViewById(R.id.network_time);
-
- tv_network_time.setText(Utils.getHHmm());
tv_speed.setText(getResources().getString(R.string.speed,speed));
- btn_return = view.findViewById(R.id.btn_return);
- btn_return.setOnClickListener(this);
mListView = view.findViewById(R.id.lv);
mListView.setFocusable(false);
mListView.setOnTouchListener(new View.OnTouchListener() {
@@ -647,9 +624,6 @@
}
start(mapFragment);
}
- break;
- case R.id.btn_return:
- _mActivity.onBackPressed();
break;
case R.id.iv_head:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
@@ -750,6 +724,16 @@
@Override
public void onDetach() {
super.onDetach();
+ Log.i(TAG,"onDetach");
CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_SPEED_TOPIC);
+
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ Log.i(TAG,"onDestroyView");
+ ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
+ ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
}
}
diff --git a/app/src/main/res/drawable/btn_state_save.xml b/app/src/main/res/drawable/btn_state_save.xml
index 1b621a7..8bbe517 100644
--- a/app/src/main/res/drawable/btn_state_save.xml
+++ b/app/src/main/res/drawable/btn_state_save.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/ic_btn_fail"></item>
-<item android:state_pressed="false" android:drawable="@drawable/ic_btn_daikao"></item>
+<item android:state_pressed="true" android:drawable="@drawable/ic_btn_save_press"></item>
+<item android:state_pressed="false" android:drawable="@drawable/ic_btn_save_nopress"></item>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/green_light.xml b/app/src/main/res/drawable/green_light.xml
index 66aa44c..cc62961 100644
--- a/app/src/main/res/drawable/green_light.xml
+++ b/app/src/main/res/drawable/green_light.xml
@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp"/>
<size android:height="10dp" android:width="10dp"/>
- <solid android:color="@android:color/holo_green_light"/>
+ <solid android:color="#1661C6"/>
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_daikao.xml b/app/src/main/res/drawable/ic_btn_daikao.xml
index 3bd9826..91e43d4 100644
--- a/app/src/main/res/drawable/ic_btn_daikao.xml
+++ b/app/src/main/res/drawable/ic_btn_daikao.xml
@@ -5,5 +5,5 @@
android:viewportHeight="1024">
<path
android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
- android:fillColor="#187558"/>
+ android:fillColor="#1E4A89"/>
</vector>
diff --git a/app/src/main/res/drawable/ic_btn_save_nopress.xml b/app/src/main/res/drawable/ic_btn_save_nopress.xml
new file mode 100644
index 0000000..644660d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_save_nopress.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+<solid android:color="#187558"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_save_press.xml b/app/src/main/res/drawable/ic_btn_save_press.xml
new file mode 100644
index 0000000..330dcf6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_save_press.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+<solid android:color="#d4237a"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9d83b34..e8f9ccd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
tools:context=".MainActivity">
-
+ <include layout="@layout/networktoolbar"/>
<FrameLayout
- android:id="@+id/fl_container"
- android:background="@drawable/ic_bground"
android:layout_width="match_parent"
- android:layout_marginBottom="@dimen/bottombar_height"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent">
+ <FrameLayout
+ android:id="@+id/fl_container"
+ android:background="@drawable/ic_bground"
+ android:layout_width="match_parent"
+ android:layout_marginBottom="@dimen/bottombar_height"
+ android:layout_height="match_parent">
+ <Button
+ android:id="@+id/btn_return"
+ android:layout_width="128dp"
+ android:layout_height="48dp"
+ android:background="@mipmap/return_bg"
+ android:drawableLeft="@mipmap/return_pic"
+ android:paddingLeft="20dp"
+ android:text="杩斿洖"
+ android:gravity="center_vertical"
+ android:drawablePadding="@dimen/ui_margin_5dp"
+ android:layout_gravity="bottom|end"
+ android:textColor="#FFFFFF"
+ android:textSize="@dimen/network_train_textsize24px" />
+ </FrameLayout>
+ </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gps_info_item.xml b/app/src/main/res/layout/gps_info_item.xml
index 060ec8c..9c28717 100644
--- a/app/src/main/res/layout/gps_info_item.xml
+++ b/app/src/main/res/layout/gps_info_item.xml
@@ -5,6 +5,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
+ android:text="123"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 316cfc4..7279ee7 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -12,7 +12,7 @@
android:textSize="@dimen/network_train_textsize24px"
android:background="@drawable/btn_state_save"
android:layout_alignParentEnd="true"
- android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginRight="35dp"
android:layout_above="@+id/ll_container_set"
android:text="淇濆瓨"/>
<LinearLayout
@@ -38,15 +38,11 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="鑰冭瘯骞冲彴鍦板潃锛�"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="IP锛�"/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="47.93.157.103"
+ android:layout_marginLeft="25dp"
android:drawableLeft="@drawable/set_arg_et_drawable"
android:id="@+id/et_platform_ip"
android:background="@android:drawable/editbox_background_normal"/>
@@ -109,16 +105,13 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="@string/rtk_addr_des"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="IP锛�"/>
+
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/rtk_addr_ip"
android:text="192.168.23.12"
+ android:layout_marginLeft="26dp"
android:background="@android:drawable/editbox_background_normal"/>
<TextView
android:layout_width="wrap_content"
@@ -144,16 +137,13 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="鐧诲綍淇℃伅锛�"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="鐪両D锛�"/>
+
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/et_provice_id"
android:text="12"
+ android:layout_marginLeft="68dp"
android:inputType="numberDecimal"
android:background="@android:drawable/editbox_background_normal"/>
<TextView
@@ -195,104 +185,15 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="杞﹁浇淇″彿閰嶇疆锛�"/>
- <TableLayout
- android:layout_width="match_parent"
+ <Button android:layout_width="410dp"
android:layout_height="wrap_content"
- android:gravity="center">
- <TableRow android:gravity="center_horizontal"
- android:visibility="gone"
- android:layout_marginBottom="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="涓绘澘锛�"/>
- <androidx.appcompat.widget.AppCompatSpinner
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:entries="@array/spinnerarr"
- android:gravity="center"
- />
- </TableRow>
- <TableRow android:gravity="center_horizontal"
- android:visibility="gone"
- android:layout_marginBottom="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="涓插彛鍙凤細"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="GpsExam"
- android:background="@android:drawable/editbox_background_normal"/> <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="娉㈢壒鐜囷細"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="GpsExam"
- android:background="@android:drawable/editbox_background_normal"/>
- </TableRow>
- <TableRow android:gravity="center_horizontal"
- android:visibility="gone"
- android:layout_marginBottom="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="鍓澘锛�"/>
- <androidx.appcompat.widget.AppCompatSpinner
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:entries="@array/spinnerarr"/>
- </TableRow>
- <TableRow android:gravity="center_horizontal"
- android:visibility="gone"
- android:layout_marginBottom="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="涓插彛鍙凤細"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="GpsExam"
- android:background="@android:drawable/editbox_background_normal"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:text="娉㈢壒鐜囷細"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="GpsExam"
- android:background="@android:drawable/editbox_background_normal"/>
- </TableRow>
- <TableRow android:gravity="center_horizontal"
- >
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鏌ョ湅淇″彿"
- android:visibility="gone"
- android:id="@+id/btn_inpsect_signal"
- android:padding="5dp"
- android:background="@drawable/btn_bg_baseset"/>
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="淇″彿閰嶇疆"
- android:padding="5dp"
- android:id="@+id/btn_signal_conf"
- android:layout_marginLeft="15dp"
- android:background="@drawable/btn_bg_baseset"/>
-
- </TableRow>
- </TableLayout>
+ android:text="淇″彿閰嶇疆"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:id="@+id/btn_signal_conf"
+ android:layout_marginLeft="25dp"
+ android:textSize="@dimen/network_train_textsize24px"
+ android:background="@drawable/btn_bg_baseset"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/layout_base_set.xml b/app/src/main/res/layout/layout_base_set.xml
index bdd45cd..38db05d 100644
--- a/app/src/main/res/layout/layout_base_set.xml
+++ b/app/src/main/res/layout/layout_base_set.xml
@@ -30,7 +30,6 @@
<androidx.viewpager.widget.ViewPager
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/train_bg"
android:id="@+id/vp_base_set">
</androidx.viewpager.widget.ViewPager>
diff --git a/app/src/main/res/layout/layout_check_signal.xml b/app/src/main/res/layout/layout_check_signal.xml
index 7c45702..7bae304 100644
--- a/app/src/main/res/layout/layout_check_signal.xml
+++ b/app/src/main/res/layout/layout_check_signal.xml
@@ -4,12 +4,23 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@android:color/white"
>
- <include layout="@layout/toolbar" android:id="@+id/inpsect_signal_toolbar"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏌ョ湅杞﹁浇淇″彿杈撳叆"
+ android:textColor="#ffffffff"
+ android:textSize="23sp"
+ android:layout_marginBottom="17dp"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ />
<FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_width="791dp"
+ android:layout_height="373dp"
+ android:background="@drawable/stu_score_bg"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="10dp">
<include layout="@layout/layout_signal_slice" android:id="@+id/inpset_signal_slice"/>
<RelativeLayout
android:layout_gravity="end"
diff --git a/app/src/main/res/layout/layout_signal_slice.xml b/app/src/main/res/layout/layout_signal_slice.xml
index 62f9278..3384cea 100644
--- a/app/src/main/res/layout/layout_signal_slice.xml
+++ b/app/src/main/res/layout/layout_signal_slice.xml
@@ -18,27 +18,29 @@
android:id="@+id/tv_loudspeaker"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
-
- android:textColor="@android:color/black"/>
+ android:textSize="@dimen/network_train_textsize22px"
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="杩滃厜鐏�"
android:layout_marginLeft="30dp"
android:id="@+id/tv_high_beam"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="妗ｄ綅涓�"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_one"
android:layout_toRightOf="@+id/tv_high_beam"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -48,27 +50,30 @@
android:layout_height="wrap_content"
android:text="瀹夊叏甯�"
android:id="@+id/tv_seat_belt"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绌烘。"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_null_engine"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="妗ｄ綅浜�"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_two"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -77,28 +82,31 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鐔勭伀"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_cut_off"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绀哄鐏�"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_width_lamp"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:layout_marginLeft="30dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="妗ｄ綅涓�"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_three"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -108,28 +116,31 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="闂ㄩ攣"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_gate_lock"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙岄棯"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_emergency_flasher"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍓埞"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_four"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
@@ -140,28 +151,31 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鎵嬪埞"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_parking_brake"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鑴氬埞"
+ android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
android:id="@+id/tv_foot_brake"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="妗ｄ綅浜�"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_five"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -171,19 +185,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="宸﹁浆鍚�"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_trun_left"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="缁曡溅涓�"
android:layout_marginLeft="30dp"
+ android:textSize="@dimen/network_train_textsize22px"
android:id="@+id/tv_winding_one"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -191,9 +207,10 @@
android:layout_marginLeft="30dp"
android:id="@+id/tv_signal3_6"
android:visibility="gone"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -204,28 +221,31 @@
android:layout_height="wrap_content"
android:text="鍙宠浆鍚�"
android:id="@+id/tv_turn_right"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="閽ュ寵START浣�"
android:layout_marginLeft="30dp"
android:id="@+id/tv_winding_two"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Signal3-7"
android:id="@+id/tv_signal3_7"
+ android:textSize="@dimen/network_train_textsize22px"
android:visibility="gone"
android:layout_marginLeft="30dp"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -238,16 +258,18 @@
android:id="@+id/tv_low_lamp"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textSize="@dimen/network_train_textsize22px"
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绂诲悎"
android:layout_marginLeft="30dp"
android:id="@+id/tv_clutch_pedal"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -257,7 +279,8 @@
android:id="@+id/tv_signal3_8"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
- android:textColor="@android:color/black"/>
+ android:textSize="@dimen/network_train_textsize22px"
+ android:textColor="@android:color/white"/>
</TableRow>
</TableLayout>
diff --git a/app/src/main/res/layout/layout_stu_score.xml b/app/src/main/res/layout/layout_stu_score.xml
index 5ac0c05..1f27659 100644
--- a/app/src/main/res/layout/layout_stu_score.xml
+++ b/app/src/main/res/layout/layout_stu_score.xml
@@ -21,19 +21,7 @@
android:layout_alignParentEnd="true"
android:orientation="horizontal">
- <Button
- android:id="@+id/btn_return"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@mipmap/return_bg"
- android:drawableLeft="@mipmap/return_pic"
- android:gravity="center_vertical"
- android:paddingLeft="20dp"
- android:text="杩斿洖"
- android:drawablePadding="5dp"
- android:textColor="#FFFFFF"
- android:textSize="@dimen/network_train_textsize24px" />
+
</LinearLayout>
</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_train_fragment.xml b/app/src/main/res/layout/layout_train_fragment.xml
index cdb80aa..4f2898c 100644
--- a/app/src/main/res/layout/layout_train_fragment.xml
+++ b/app/src/main/res/layout/layout_train_fragment.xml
@@ -5,7 +5,6 @@
android:orientation="vertical"
style="@style/ui_margin"
>
-<include layout="@layout/networktoolbar"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/networktoolbar.xml b/app/src/main/res/layout/networktoolbar.xml
index 01203b7..079d156 100644
--- a/app/src/main/res/layout/networktoolbar.xml
+++ b/app/src/main/res/layout/networktoolbar.xml
@@ -5,6 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:id="@+id/top_title"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/mipmap-xhdpi/auto_check_status.png b/app/src/main/res/mipmap-xhdpi/auto_check_status.png
new file mode 100755
index 0000000..aa707d3
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/auto_check_status.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/device_sn.png b/app/src/main/res/mipmap-xhdpi/device_sn.png
new file mode 100755
index 0000000..6cfc2a5
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/device_sn.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/platform_pic.png b/app/src/main/res/mipmap-xhdpi/platform_pic.png
new file mode 100755
index 0000000..d409bb6
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/platform_pic.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/province_id.png b/app/src/main/res/mipmap-xhdpi/province_id.png
new file mode 100755
index 0000000..a87eb57
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/province_id.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/version_pic.png b/app/src/main/res/mipmap-xhdpi/version_pic.png
new file mode 100755
index 0000000..2926510
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/version_pic.png
Binary files differ
--
Gitblit v1.8.0