From b1241719066f2636d6e30be525cef8bcc6d30619 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 23 四月 2020 13:05:44 +0800
Subject: [PATCH] 完善参数设置UI
---
app/src/main/res/layout/layout_signal_config.xml | 47 +++
app/src/main/res/drawable/btn_bg1_baseset.xml | 18 +
app/src/main/res/drawable/btn_bg_baseset.xml | 23 +
app/src/main/res/layout/layout_mycustom_et_arg.xml | 38 +++
app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java | 47 +--
app/src/main/java/safeluck/drive/evaluation/customview/MyArgEditText.kt | 104 +++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 97 ++++----
app/src/main/res/layout/layout_signal_conf_item.xml | 22 +
app/src/main/res/layout/layout_base_datas.xml | 234 ++++++++-------------
9 files changed, 384 insertions(+), 246 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/MyArgEditText.kt b/app/src/main/java/safeluck/drive/evaluation/customview/MyArgEditText.kt
new file mode 100644
index 0000000..b5d1cbc
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/MyArgEditText.kt
@@ -0,0 +1,104 @@
+package safeluck.drive.evaluation.customview
+
+import android.content.Context
+import android.text.Editable
+import android.util.AttributeSet
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import safeluck.drive.evaluation.R
+
+/**
+ *
+ * @ProjectName: DriveJudge
+ * @Package: safeluck.drive.evaluation.customview
+ * @ClassName: MyCustomEditText
+ * @Description: java绫讳綔鐢ㄦ弿杩�
+ * @Author: 鏉庡崰浼�
+ * @CreateDate: 2020-04-22 14:05
+ * @UpdateUser: 鏇存柊鑰�
+ * @UpdateDate: 2020-04-22 14:05
+ * @UpdateRemark: 鏇存柊璇存槑
+ * @Version: 1.0
+ */
+
+class MyArgEditText : LinearLayout{
+
+ private val TAG= "MyCustomEditText"
+
+ constructor(context: Context) : this(context, null)
+ constructor(context: Context, attributeSet: AttributeSet?) : this(context, attributeSet, 0)
+
+ constructor(context: Context, attributeSet: AttributeSet?, defStyleAttr: Int):super(context,attributeSet,defStyleAttr){
+ init(context,attributeSet)
+ }
+
+
+
+
+ // true灏辨槸鏄剧ず false涓嶆樉绀�
+ var visiblity:Boolean = true
+
+ var str:String=""
+ var desstr:String=""
+
+ var txtDes:TextView? = null
+ var txtDesUnit:TextView? = null
+ var et_num:EditText? = null
+ var view: View? = null
+
+
+ fun init(context: Context, attributeSet: AttributeSet?){
+ Log.i(TAG,"myCustomEditText z鑷畾涔�---------")
+ view = LayoutInflater.from(context).inflate(R.layout.layout_mycustom_et_arg,this,true)
+
+ txtDes = view?.findViewById(R.id.tv_des_et)
+ txtDesUnit = view?.findViewById(R.id.tv_unit)
+ et_num = view?.findViewById(R.id.et_num)
+
+ var a = context.obtainStyledAttributes(attributeSet,R.styleable.mycustom_et)
+ //鑾峰彇鏄惁瑕佹樉绀哄崟浣�
+ visiblity = a!!.getBoolean(R.styleable.mycustom_et_txt_unit,true)
+ str = a!!.getString(R.styleable.mycustom_et_txt)
+ desstr = a!!.getString(R.styleable.mycustom_et_txt_des)
+
+ var desunit = a!!.getString(R.styleable.mycustom_et_txt_unit_des)
+// var width = a!!.getString(R.styleable.mycustom_et_view_width)
+// var height = a!!.getString(R.styleable.mycustom_et_view_height)
+
+ Log.i(TAG,"txtDes=$desstr")
+ Log.i(TAG,"str=$str")
+ Log.i(TAG,"visiblity=$visiblity")
+
+
+
+ when(visiblity){
+ true->{
+ txtDesUnit?.visibility = View.VISIBLE
+ txtDesUnit?.text = desunit
+ }
+ else-> txtDesUnit?.visibility = View.GONE
+ }
+
+ txtDes?.text = desstr
+ et_num?.text = Editable.Factory.getInstance().newEditable(str)
+
+ a.recycle()
+
+
+ }
+
+
+
+ fun updateStr(str:String){
+ et_num?.text = Editable.Factory.getInstance().newEditable(str)
+ invalidate()
+ }
+
+}
+
+
+
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 178bbd7..3c9a001 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -77,10 +77,9 @@
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 EditText et_ip_rtk,et_port_rtk,et_city_id,et_city_province,et_phone;
private RTKConfigViewModel rtkConfigViewModel;
private RTKConfig mRtkConfig;
private boolean needSendRtk = false;
@@ -101,11 +100,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());
+// 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());
ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
@@ -150,28 +149,24 @@
((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()+"");
+// 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_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);
+// et_ip_rtk = view.findViewById(R.id.rtk_addr_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);
}
@Override
@@ -204,33 +199,33 @@
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()))){
- 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()));
- }
+// if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){
+// 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()));
+// }
- 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());
-
- if (ExamPlatformData.getInstance().compareRTKIPandPort(rtkip,rtkport)){
- mRtkConfig.setRegistered(0);
- MyLog.i("rtk ip鍜屽湴鍧�鏈夊彉鍖�");
- needSendRtk = true;
- sendRtkConfigInfo(mRtkConfig);
-
- }
- rtkConfigViewModel.insertRTKConfig(mRtkConfig);
-
- }
+// 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());
+//
+// if (ExamPlatformData.getInstance().compareRTKIPandPort(rtkip,rtkport)){
+// mRtkConfig.setRegistered(0);
+// MyLog.i("rtk ip鍜屽湴鍧�鏈夊彉鍖�");
+// needSendRtk = true;
+// sendRtkConfigInfo(mRtkConfig);
+//
+// }
+// rtkConfigViewModel.insertRTKConfig(mRtkConfig);
+//
+// }
@@ -244,10 +239,10 @@
request_code = REQUEST_CODE_MAP;
openFileMgr();
break;
- case R.id.btn_roadmap_select:
- request_code = REQUEST_CODE_ROADMAP;
- openFileMgr();
- break;
+// case R.id.btn_roadmap_select:
+// request_code = REQUEST_CODE_ROADMAP;
+// openFileMgr();
+// break;
default:
break;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
index ece42fa..5194ddc 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
@@ -103,47 +103,36 @@
private void initView(View view) {
mToobar = view.findViewById(R.id.toolbar);
- mToobar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp,null));
linearLayout = view.findViewById(R.id.ll_container);
- mToobar.setNavigationOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- _mActivity.onBackPressed();
- }
- });
mToobar.setTitle("淇″彿閰嶇疆");
listView =new ListView(_mActivity);
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
- ViewGroup.LayoutParams layoutParams1 = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
listView.setLayoutParams(layoutParams);
linearLayout.addView(listView);
listView.setDivider(null);
final MySignalsAdapter mySignalsAdapter = new MySignalsAdapter(_mActivity);
signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
- signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
- @Override
- public void onChanged(List<SingalConfig> singalConfigs) {
- list.clear();
- signalConfiglist.clear();
- MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲");
+ signalConfigViewModel.getSignalConfigs().observe(this, singalConfigs -> {
+ list.clear();
+ signalConfiglist.clear();
+ MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲");
- for (int i = 0; i < singalConfigs.size(); i++) {
- SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
- signalConfigRemote.setFunc_id(i);
- signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
- signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
- list.add(signalConfigRemote);
- }
- for (int i = 0; i < singalConfigs.size(); i++) {
+ for (int i = 0; i < singalConfigs.size(); i++) {
+ SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
+ signalConfigRemote.setFunc_id(i);
+ signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
+ signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
+ list.add(signalConfigRemote);
+ }
+ for (int i = 0; i < singalConfigs.size(); i++) {
- SingalConfig singalConfig = singalConfigs.get(i);
- i++;
- SingalConfig singalConfig1 = singalConfigs.get(i);
- signalConfiglist .add(new SignalConfigBean(singalConfig.getSignalName(),singalConfig1.getSignalName(),singalConfig.getHighLevel()==1?true:false,singalConfig.getMainBoard()==1?true:false,
- singalConfig1.getHighLevel()==1?true:false,singalConfig1.getMainBoard()==1?true:false,singalConfig.getIndex(),singalConfig1.getIndex()));
- mySignalsAdapter.notifyDataSetChanged();
- }
+ SingalConfig singalConfig = singalConfigs.get(i);
+ i++;
+ SingalConfig singalConfig1 = singalConfigs.get(i);
+ signalConfiglist .add(new SignalConfigBean(singalConfig.getSignalName(),singalConfig1.getSignalName(),singalConfig.getHighLevel()==1?true:false,singalConfig.getMainBoard()==1?true:false,
+ singalConfig1.getHighLevel()==1?true:false,singalConfig1.getMainBoard()==1?true:false,singalConfig.getIndex(),singalConfig1.getIndex()));
+ mySignalsAdapter.notifyDataSetChanged();
}
});
diff --git a/app/src/main/res/drawable/btn_bg1_baseset.xml b/app/src/main/res/drawable/btn_bg1_baseset.xml
new file mode 100644
index 0000000..8a22b6b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_bg1_baseset.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ >
+ <item>
+ <shape android:shape="rectangle">
+ <stroke android:color="#11468A" android:width="1dp"/>
+ <corners android:radius="10dp"/>
+ </shape>
+
+ </item>
+ <item android:left="1dp" android:top="1dp" android:right="1dp"
+ android:bottom="1dp">
+ <shape android:shape="rectangle">
+ <solid android:color="#11468A" />
+ <corners android:radius="10dp"/>
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_bg_baseset.xml b/app/src/main/res/drawable/btn_bg_baseset.xml
index 91d9609..9368f17 100644
--- a/app/src/main/res/drawable/btn_bg_baseset.xml
+++ b/app/src/main/res/drawable/btn_bg_baseset.xml
@@ -1,7 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="#ff2b3141" />
- <stroke android:width="1dp" android:color="#591e5095" />
- <corners android:radius="26dp"/>
-</shape>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ >
+ <item>
+ <shape android:shape="rectangle">
+ <stroke android:color="#11468A" android:width="1dp"/>
+ <corners android:radius="26dp"/>
+ </shape>
+
+ </item>
+<item android:left="1dp" android:top="1dp" android:right="1dp"
+ android:bottom="1dp">
+ <shape android:shape="rectangle">
+ <solid android:color="#ff2b3141" />
+ <corners android:radius="26dp"/>
+ </shape>
+</item>
+</layer-list>
\ 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 7279ee7..ec6242e 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -2,10 +2,11 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lee="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
- android:layout_width="wrap_content"
+ android:layout_width="96dp"
android:layout_height="wrap_content"
android:id="@+id/btn_save_platform"
android:textColor="@android:color/white"
@@ -17,7 +18,7 @@
android:text="淇濆瓨"/>
<LinearLayout
android:layout_width="774dp"
- android:layout_height="320dp"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp"
android:id="@+id/ll_container_set"
@@ -30,7 +31,8 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
@@ -38,64 +40,33 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="鑰冭瘯骞冲彴鍦板潃锛�"/>
- <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"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:text="Port锛�"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="2020"
- android:id="@+id/et_platform_port"
- android:background="@android:drawable/editbox_background_normal"/>
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
+ android:id="@+id/platform_ip"
+ lee:txt="47.93.157.103"
+ lee:txt_des="IP"
+ android:layout_marginLeft="31dp"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
+ android:id="@+id/platform_port"
+ lee:txt="12125"
+ lee:txt_des="Port"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
</LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/black"
- 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:id="@+id/simulate_ip"
- android:text="192.168.23.12"
- android:background="@android:drawable/editbox_background_normal"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:text="Port锛�"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/simulate_port"
- android:text="9001"
- android:background="@android:drawable/editbox_background_normal"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
@@ -105,31 +76,33 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="@string/rtk_addr_des"/>
-
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
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"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:text="Port锛�"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ lee:txt="47.93.157.103"
+ lee:txt_des="IP"
+ android:layout_marginLeft="33dp"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
android:id="@+id/rtk_addr_port"
- android:text="8080"
- android:background="@android:drawable/editbox_background_normal"/>
+ lee:txt="12125"
+ lee:txt_des="Port"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
+
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
+
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
@@ -137,45 +110,31 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="鐧诲綍淇℃伅锛�"/>
-
- <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
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:text="甯侷D锛�"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/et_city_id"
- android:text="192"
- android:inputType="numberDecimal"
- android:background="@android:drawable/editbox_background_normal"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:visibility="gone"
- android:text="鐢佃瘽锛�"/>
- <EditText
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/et_phone"
- android:text="19234567894"
- android:visibility="gone"
- android:inputType="numberDecimal"
- android:background="@android:drawable/editbox_background_normal"/>
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
+ android:layout_marginLeft="65dp"
+ android:id="@+id/province_id"
+ lee:txt="23"
+ lee:txt_des="鐪両D"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
+ <safeluck.drive.evaluation.customview.MyArgEditText
+ android:layout_height="50dp"
+ android:layout_width="200dp"
+ android:id="@+id/city_id"
+ lee:txt="1"
+ lee:txt_des="甯侷D"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ lee:txt_unit="false"
+ lee:txt_unit_des ="r/min"
+ />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
@@ -185,23 +144,23 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="杞﹁浇淇″彿閰嶇疆锛�"/>
- <Button android:layout_width="410dp"
+ <Button android:layout_width="395dp"
android:layout_height="wrap_content"
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"/>
+ android:layout_marginLeft="@dimen/ui_margin_25dp"
+ android:background="@drawable/btn_bg1_baseset"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
@@ -209,51 +168,36 @@
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize25px"
android:text="閰嶇疆鍙傛暟锛�"/>
- <TableLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center">
- <TableRow android:gravity="center_horizontal"
- android:layout_marginBottom="10dp">
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+
+ <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_mcu_upgrade"
- android:layout_marginLeft="15dp"
android:background="@drawable/btn_bg_baseset"/>
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- 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:id="@+id/btn_map_select"
- android:layout_marginLeft="15dp"
+ android:layout_marginLeft="8dp"
android:background="@drawable/btn_bg_baseset"/>
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <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_car_select"
- android:layout_marginLeft="15dp"
+ android:layout_marginLeft="8dp"
android:background="@drawable/btn_bg_baseset"/>
- <Button android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="璺�冨湴鍥鹃�夋嫨"
- android:padding="5dp"
- android:textColor="@android:color/white"
- android:textSize="@dimen/network_train_textsize21px"
- android:id="@+id/btn_roadmap_select"
- android:layout_marginLeft="15dp"
- android:background="@drawable/btn_bg_baseset"/>
- </TableRow>
- </TableLayout>
+
</LinearLayout>
diff --git a/app/src/main/res/layout/layout_mycustom_et_arg.xml b/app/src/main/res/layout/layout_mycustom_et_arg.xml
new file mode 100644
index 0000000..c9424ec
--- /dev/null
+++ b/app/src/main/res/layout/layout_mycustom_et_arg.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="180dp"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ android:background="@drawable/input_bg">
+<TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="杞﹂��"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/ui_margin_5dp"
+ android:paddingRight="@dimen/ui_margin_5dp"
+ android:textSize="20sp"
+ android:id="@+id/tv_des_et"
+ android:background="@drawable/tv_des_bg"
+ android:textColor="#FFFFFF"
+ />
+ <EditText
+ android:layout_width="150dp"
+ android:layout_height="match_parent"
+ android:text="123"
+ android:background="@null"
+ android:gravity="center"
+ android:id="@+id/et_num"
+ android:textColor="#FFFFFF"
+ android:textSize="20sp"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="km/h"
+ android:gravity="center"
+ android:textSize="20sp"
+ android:id="@+id/tv_unit"
+ android:textColor="#888A95"
+ />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_signal_conf_item.xml b/app/src/main/res/layout/layout_signal_conf_item.xml
index 0842db8..8744c98 100644
--- a/app/src/main/res/layout/layout_signal_conf_item.xml
+++ b/app/src/main/res/layout/layout_signal_conf_item.xml
@@ -2,27 +2,33 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:gravity="center"
- android:layout_height="60dp">
+
+ android:layout_height="100dp">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:id="@+id/tv_signal_1"
+ android:textColor="@android:color/white"
android:layout_height="wrap_content"
+ android:textSize="@dimen/network_train_textsize22px"
android:gravity="center"
android:text="鍠囧彮"/>
<EditText
android:layout_width="0dp"
+ android:textColor="@android:color/white"
android:layout_weight="1"
android:gravity="center"
android:layout_height="wrap_content"
android:id="@+id/et_signal1_port"
- android:background="@android:drawable/editbox_background_normal"
+ android:background="@drawable/tv_des_bg"
+ android:textSize="@dimen/network_train_textsize22px"
android:text="0"/>
<CheckBox
android:layout_width="0dp"
android:layout_weight="1"
- android:gravity="center"
+ android:layout_gravity="center"
android:id="@+id/signal_check_1"
+
android:layout_height="wrap_content"
android:checked="true"/>
<CheckBox
@@ -32,13 +38,11 @@
android:id="@+id/signal_check_2"
android:layout_height="wrap_content"
android:checked="true"/>
- <View
- android:layout_width="1px"
- android:layout_height="wrap_content"
- android:background="@color/colorAccent"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize22px"
android:gravity="center"
android:id="@+id/tv_signal_2"
android:layout_height="wrap_content"
@@ -47,7 +51,9 @@
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center"
- android:background="@android:drawable/editbox_background_normal"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:background="@drawable/tv_des_bg"
android:id="@+id/et_signal2_port"
android:layout_height="wrap_content"
android:text="0"/>
diff --git a/app/src/main/res/layout/layout_signal_config.xml b/app/src/main/res/layout/layout_signal_config.xml
index 467a9c0..be5a07b 100644
--- a/app/src/main/res/layout/layout_signal_config.xml
+++ b/app/src/main/res/layout/layout_signal_config.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent" android:layout_height="match_parent">
+<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/ll_container"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:background="@drawable/stu_score_bg"
>
<include layout="@layout/toolbar"/>
<LinearLayout
@@ -11,58 +17,85 @@
android:layout_height="25dp"
android:layout_marginLeft="@dimen/ui_margin_10dp"
android:layout_marginRight="10dp"
- android:background="@drawable/stu_score_bg"
android:orientation="horizontal"
android:layout_column="8">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
+ android:gravity="center"
android:textSize="15sp"
android:textColor="#ff888995"
android:text="淇″彿鍚嶇О"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
+ android:gravity="center"
android:layout_height="wrap_content"
- android:textColor="@android:color/black"
android:text="鐗╃悊绱㈠紩"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
+ android:gravity="center"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
android:text="楂樼數骞虫湁鏁�"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:textColor="@android:color/black"
+ android:gravity="center"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
android:text="涓绘澘鏈夋晥"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:textColor="@android:color/black"
+ android:gravity="center"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
android:text="淇″彿鍚嶇О"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:textColor="@android:color/black"
+ android:gravity="center"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
android:text="鐗╃悊绱㈠紩"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
+ android:gravity="center"
android:text="楂樼數骞虫湁鏁�"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:textColor="@android:color/black"
+ android:textSize="15sp"
+ android:textColor="#ff888995"
+ android:gravity="center"
android:text="涓绘澘鏈夋晥"/>
</LinearLayout>
</LinearLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:layout_marginTop="@dimen/ui_margin_50dp"
+ android:background="@drawable/stu_score_bg"
+ />
+</FrameLayout>
\ No newline at end of file
--
Gitblit v1.8.0