hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备详情 增加趋势图跳转

Browse Source
master
wenfei 1 month ago
parent 18da622f16
commit 56a9edeb94
14 changed files with 203 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -1156,7 +1156,7 @@
<activity
android:name=".ui.activity.Activity_DzdtInfo"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="landscape" />
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.Activity_Dzdt"
android:screenOrientation="portrait" /> <!-- 当前厂内人员信息 -->

3
app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt
Unescape Escape View File

@ -5,6 +5,7 @@ import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Color
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.text.TextUtils
@ -106,8 +107,10 @@ class DeviceManagerListAdapter(
binding.tvSbzt.text = itemBean.description
if(itemBean.online){
binding.tvZxzt.text = "在线"
binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff
}else{
binding.tvZxzt.text = "离线"
binding.tvZxzt.setTextColor(Color.parseColor("#ff0000"))
}
binding.tvZtsysc.text = itemBean.continuedTime
binding.tvAzsj.text = itemBean.installTime

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_DzdtInfo.java
Unescape Escape View File

@ -80,7 +80,9 @@ public class Activity_DzdtInfo extends BaseActivity {
private final HttpListener<String> callback = new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
SbfxBean sbfxBean = GsonUtils.GsonToBean(response.get(), SbfxBean.class);
String result = response.get();
showLog(result);
SbfxBean sbfxBean = GsonUtils.GsonToBean(result, SbfxBean.class);
if(sbfxBean!=null){
GDdatas.clear();
YHdatas.clear();

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java
Unescape Escape View File

@ -349,6 +349,8 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL
clcrzcxBean.setRows(dataRowsBeanList);
clcrzcxBean.setTotal("1");
json = GsonUtils.GsonString(clcrzcxBean);
showLog("---------");
showLog(json);
return json;
}

61
app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoLineChartActivity.java
Unescape Escape View File

@ -71,6 +71,7 @@ import javax.net.ssl.SSLSocketFactory;
public class DeviceAlarmInfoLineChartActivity extends BaseActivityOaToolbarViewBinding<ActivityDeviceAlarmInfoLineChartBinding> {
private String deviceCode;
private String deviceName;
private String showType;//显示图表类型
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdfDay = new SimpleDateFormat("yyyy-MM-dd");
@ -129,6 +130,66 @@ public class DeviceAlarmInfoLineChartActivity extends BaseActivityOaToolbarViewB
if(deviceNameTemp != null&&deviceNameTemp.contains("\"")){
deviceName=deviceNameTemp.replace("\"","").trim();
}
String showTypeTemp = getIntent().getStringExtra("showType");
if(showTypeTemp != null){
showType=showTypeTemp;
if("速度".equals(showType)){
binding.rb1.setChecked(false);
binding.rb2.setChecked(false);
binding.rb3.setChecked(true);
binding.rb4.setChecked(false);
binding.rb5.setChecked(false);
binding.rb6.setChecked(false);
binding.rb7.setChecked(false);
}
if("加速度".equals(showType)){
binding.rb1.setChecked(false);
binding.rb2.setChecked(true);
binding.rb3.setChecked(false);
binding.rb4.setChecked(false);
binding.rb5.setChecked(false);
binding.rb6.setChecked(false);
binding.rb7.setChecked(false);
}
if("位移".equals(showType)){
binding.rb1.setChecked(false);
binding.rb2.setChecked(false);
binding.rb3.setChecked(false);
binding.rb4.setChecked(true);
binding.rb5.setChecked(false);
binding.rb6.setChecked(false);
binding.rb7.setChecked(false);
}
if("频率".equals(showType)){
binding.rb1.setChecked(false);
binding.rb2.setChecked(false);
binding.rb3.setChecked(false);
binding.rb4.setChecked(false);
binding.rb5.setChecked(false);
binding.rb6.setChecked(true);
binding.rb7.setChecked(false);
}
if("直流分量".equals(showType)){
binding.rb1.setChecked(false);
binding.rb2.setChecked(false);
binding.rb3.setChecked(false);
binding.rb4.setChecked(false);
binding.rb5.setChecked(true);
binding.rb6.setChecked(false);
binding.rb7.setChecked(false);
}
if("温度".equals(showType)){
binding.rb1.setChecked(true);
binding.rb2.setChecked(false);
binding.rb3.setChecked(false);
binding.rb4.setChecked(false);
binding.rb5.setChecked(false);
binding.rb6.setChecked(false);
binding.rb7.setChecked(false);
}
}
String title=getIntent().getStringExtra("title");
initToolbar(title, "刷新", new View.OnClickListener() {
@Override

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt
Unescape Escape View File

@ -27,7 +27,7 @@ import com.yolanda.nohttp.rest.Response
class DeviceOnlineStatusListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceOnlineStatusListBinding>() {
val typeList = mutableListOf<String>("VIBRATION", "OIL", "FUEL", "THERMAL_IMAGER", "VIBRATION_ZB")
val typeList = mutableListOf<String>("VIBRATION", "OIL", "THERMAL_IMAGER", "VIBRATION_ZB")
private lateinit var spinnerAdapter: ArrayAdapter<CharSequence>
//options:[{ value:'online',label:'在线”}{value:'offline',label:'离线”}1，
private var dataList: MutableList<Any> = mutableListOf()//数据列表

9
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -267,6 +267,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etUsername.setText("310440")
// binding.etPassword.setText("Qch@123456")
// binding.etUsername.setText("310695")
// binding.etPassword.setText("Abcd*1234")
//
// binding.etUsername.setText("310728")
// binding.etPassword.setText("Zl@852290530")
//select * from u_account where account_fullusername='郑佩璋'
@ -315,9 +321,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
//谭添欢
// binding.etUsername.setText("310273")
// binding.etPassword.setText("#Tth8680004")
//吴云强
// binding.etUsername.setText("310430")
// binding.etPassword.setText("Laq@201610")
//欧建荣
// binding.etUsername.setText("310285")
// binding.etPassword.setText("@Ojr310285")

50
app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringDetailFragment.java
Unescape Escape View File

@ -104,9 +104,59 @@ public class DeviceMonitoringDetailFragment extends BaseViewBindingFragment<Frag
intent.putExtra("deviceCode", GsonUtils.GsonString(deviceCode));
intent.putExtra("deviceName",GsonUtils.GsonString(deviceName));
intent.putExtra("title","趋势图");
intent.putExtra("showType","速度");
startActivity(intent);
}
});
binding.itemAddSpeed.tvCharView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(context, DeviceAlarmInfoLineChartActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("deviceCode", GsonUtils.GsonString(deviceCode));
intent.putExtra("deviceName",GsonUtils.GsonString(deviceName));
intent.putExtra("title","趋势图");
intent.putExtra("showType","加速度");
startActivity(intent);
}
});
binding.itemWy.tvCharView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(context, DeviceAlarmInfoLineChartActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("deviceCode", GsonUtils.GsonString(deviceCode));
intent.putExtra("deviceName",GsonUtils.GsonString(deviceName));
intent.putExtra("title","趋势图");
intent.putExtra("showType","位移");
startActivity(intent);
}
});
binding.itemPl.tvCharView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(context, DeviceAlarmInfoLineChartActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("deviceCode", GsonUtils.GsonString(deviceCode));
intent.putExtra("deviceName",GsonUtils.GsonString(deviceName));
intent.putExtra("title","趋势图");
intent.putExtra("showType","频率");
startActivity(intent);
}
});
binding.itemZlfl.tvCharView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(context, DeviceAlarmInfoLineChartActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("deviceCode", GsonUtils.GsonString(deviceCode));
intent.putExtra("deviceName",GsonUtils.GsonString(deviceName));
intent.putExtra("title","趋势图");
intent.putExtra("showType","直流分量");
startActivity(intent);
}
});
}
@Override

2
app/src/main/res/layout/item_device_detail_row.xml
Unescape Escape View File

@ -51,7 +51,7 @@
android:paddingEnd="10dp"
android:textSize="16sp"
android:textColor="#67C23A"
android:text="39.9171" />
android:text="" />
<View

20
app/src/main/res/layout/item_device_detail_row_type_add_speed.xml
Unescape Escape View File

@ -27,15 +27,31 @@
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1.4"
android:paddingStart="6dp"
android:gravity="start|center_vertical"
android:textSize="13sp"
android:textColor="#999999"
android:text="加速度数据" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_qzt"/>
<TextView
android:id="@+id/tv_char_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start|center_vertical"
android:textSize="16sp"
android:layout_marginStart="1dp"
android:textColor="#409EFF"
android:text="趋势图" />
<TextView

20
app/src/main/res/layout/item_device_detail_row_type_pl.xml
Unescape Escape View File

@ -27,15 +27,31 @@
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1.4"
android:paddingStart="6dp"
android:gravity="start|center_vertical"
android:textSize="13sp"
android:textColor="#999999"
android:text="频率数据" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_qzt"/>
<TextView
android:id="@+id/tv_char_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start|center_vertical"
android:textSize="16sp"
android:layout_marginStart="1dp"
android:textColor="#409EFF"
android:text="趋势图" />
<TextView

20
app/src/main/res/layout/item_device_detail_row_type_wy.xml
Unescape Escape View File

@ -27,15 +27,31 @@
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1.4"
android:paddingStart="6dp"
android:gravity="start|center_vertical"
android:textSize="13sp"
android:textColor="#999999"
android:text="位移数据" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_qzt"/>
<TextView
android:id="@+id/tv_char_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start|center_vertical"
android:textSize="16sp"
android:layout_marginStart="1dp"
android:textColor="#409EFF"
android:text="趋势图" />
<TextView

21
app/src/main/res/layout/item_device_detail_row_type_zlfl.xml
Unescape Escape View File

@ -27,16 +27,33 @@
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1.4"
android:paddingStart="6dp"
android:gravity="start|center_vertical"
android:textSize="13sp"
android:textColor="#999999"
android:text="直流分量数据" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_qzt"/>
<TextView
android:id="@+id/tv_char_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start|center_vertical"
android:textSize="16sp"
android:layout_marginStart="1dp"
android:textColor="#409EFF"
android:text="趋势图" />
<TextView
android:id="@+id/tv_value"

3
app/src/main/res/values/arrays.xml
Unescape Escape View File

@ -55,7 +55,6 @@
<string-array name="spinner_items_device_type">
<item>测振测温设备</item>
<item>油质监测设备</item>
<item>燃料测温设备</item>
<item>热成像测温设备</item>
<item>zigBee 传感器</item>
</string-array>
@ -65,3 +64,5 @@
</declare-styleable>
</resources>
<!--<item>燃料测温设备</item>-->
Write Preview
Loading…
Cancel
Save