Skip to content

Commit

Permalink
在实时数据中添加系统直流电压和设备运行状态，以及设备软件版本
Browse files Browse the repository at this point in the history
  • Loading branch information
@taowenyin
taowenyin committed Aug 17, 2017
1 parent b067c7f commit 245f2a9
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 3 deletions.
71 changes: 70 additions & 1 deletion app/src/main/java/cn/edu/siso/rlxapf/RealDataFragment.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cn.edu.siso.rlxapf;

import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.widget.GridLayoutManager;
Expand Down Expand Up @@ -29,11 +28,15 @@ public class RealDataFragment extends Fragment implements IRealTimeData {
private List<DataBean> voltageData = null;
private List<DataBean> powerData = null;
private List<DataBean> thdData = null;
private List<DataBean> voltageDCData = null;
private List<DataBean> deviceInfoData = null;
private List<DataGroupBean> realData = null;

private String[] voltageTitles = null;
private String[] powerTitles = null;
private String[] thdTitles = null;
private String[] voltageDCTitles = null;
private String[] deviceInfoTitles = null;

public static final String TAG = "RealDataFragment";

Expand All @@ -54,6 +57,8 @@ public void onCreate(Bundle savedInstanceState) {
voltageTitles = getResources().getStringArray(R.array.real_data_voltage_titles);
powerTitles = getResources().getStringArray(R.array.real_data_power_titles);
thdTitles = getResources().getStringArray(R.array.real_data_thd_titles);
voltageDCTitles = getResources().getStringArray(R.array.real_data_voltage_dc_titles);
deviceInfoTitles = getResources().getStringArray(R.array.real_data_device_info_titles);

// 数据列表
this.realData = new ArrayList<DataGroupBean>();
Expand Down Expand Up @@ -96,6 +101,32 @@ public void onCreate(Bundle savedInstanceState) {
}
DataGroupBean thdGroupData = new DataGroupBean(realDataSections[2], thdData);
realData.add(thdGroupData);

// 添加直流电压数据
voltageDCData = new ArrayList<DataBean>();
for (int i = 0; i < voltageDCTitles.length; i++) {
List<Map<String, Integer>> item = new ArrayList<Map<String, Integer>>();
Map<String, Integer> value = new HashMap<String, Integer>();
value.put(DataBean.DATA_KEY, 0);
item.add(value);
DataBean data = new DataBean(voltageDCTitles[i], item);
voltageDCData.add(data);
}
DataGroupBean directVoltageGroupData = new DataGroupBean(realDataSections[3], voltageDCData);
realData.add(directVoltageGroupData);

// 添加直流电压数据
deviceInfoData = new ArrayList<DataBean>();
for (int i = 0; i < deviceInfoTitles.length; i++) {
List<Map<String, Integer>> item = new ArrayList<Map<String, Integer>>();
Map<String, Integer> value = new HashMap<String, Integer>();
value.put(DataBean.DATA_KEY, 0);
item.add(value);
DataBean data = new DataBean(deviceInfoTitles[i], item);
deviceInfoData.add(data);
}
DataGroupBean deviceInfoGroupData = new DataGroupBean(realDataSections[4], deviceInfoData);
realData.add(deviceInfoGroupData);
}

@Override
Expand Down Expand Up @@ -402,6 +433,44 @@ public void updateRealData(RealTimeDatasBean datasBean) {
DataBean loadCurrentCTotalDistortionRateData = new DataBean(thdTitles[8], loadCurrentCTotalDistortionRateItem);
thdData.add(loadCurrentCTotalDistortionRateData);

voltageDCData.clear();
// 直流电压1
int voltageDC1 = datasBean.getVoltageDC1();
List<Map<String, Integer>> voltageDC1Item = new ArrayList<Map<String, Integer>>();
Map<String, Integer> voltageDC1Value = new HashMap<String, Integer>();
voltageDC1Value.put(DataBean.DATA_KEY, voltageDC1);
voltageDC1Item.add(voltageDC1Value);
DataBean voltageDC1Data = new DataBean(voltageDCTitles[0], voltageDC1Item);
voltageDCData.add(voltageDC1Data);

// 直流电压2
int voltageDC2 = datasBean.getVoltageDC2();
List<Map<String, Integer>> voltageDC2Item = new ArrayList<Map<String, Integer>>();
Map<String, Integer> voltageDC2Value = new HashMap<String, Integer>();
voltageDC2Value.put(DataBean.DATA_KEY, voltageDC2);
voltageDC2Item.add(voltageDC2Value);
DataBean voltageDC2Data = new DataBean(voltageDCTitles[1], voltageDC2Item);
voltageDCData.add(voltageDC1Data);

deviceInfoData.clear();
// 设备软件版本
int version = datasBean.getVersion();
List<Map<String, String>> versionItem = new ArrayList<Map<String, String>>();
Map<String, String> versionValue = new HashMap<String, String>();
versionValue.put(DataBean.DATA_KEY, "" + version);
versionItem.add(versionValue);
DataBean versionData = new DataBean(deviceInfoTitles[0], versionItem);
deviceInfoData.add(versionData);

// 设备运行状态
int stateAPF = datasBean.getStateAPF();
List<Map<String, String>> stateAPFItem = new ArrayList<Map<String, String>>();
Map<String, String> stateAPFValue = new HashMap<String, String>();
stateAPFValue.put(DataBean.DATA_KEY, (stateAPF == 0 ? "停止" : "运行"));
stateAPFItem.add(stateAPFValue);
DataBean stateAPFData = new DataBean(deviceInfoTitles[1], stateAPFItem);
deviceInfoData.add(stateAPFData);

adapter.notifyDataSetChanged();
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/cn/edu/siso/rlxapf/RealDataSpanSizeLookup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ public RealDataSpanSizeLookup(SectionedRecyclerViewAdapter<?, ?, ?> adapter, Gri

@Override
public int getSpanSize(int position) {
// -10 因为最后10个数据需要一行一数据，
// -10 -7 因为当中的9个数据需要一行一数据，
if(adapter.isSectionHeaderPosition(position) ||
adapter.isSectionFooterPosition(position) ||
position >= (adapter.getItemCount() - 10)){
(position >= (adapter.getItemCount() - 16) && position < (adapter.getItemCount() - 7))){
return layoutManager.getSpanCount();
}else {
return 1;
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
<item>电压电流</item>
<item>功率即其他</item>
<item>THD</item>
<item>直流电压</item>
<item>设备信息</item>
</string-array>

<!--实时电压电流数据标题-->
Expand Down Expand Up @@ -154,6 +156,18 @@
<item>负载C相电流总畸变率</item>
</string-array>

<!--实时直流电压数据标题-->
<string-array name="real_data_voltage_dc_titles">
<item>直流电压1</item>
<item>直流电压2</item>
</string-array>

<!--实时设备数据标题-->
<string-array name="real_data_device_info_titles">
<item>设备软件版本</item>
<item>设备运行状态</item>
</string-array>

<!--系统电压图表的标题-->
<string name="curve_voltage_title">系统电压</string>
<string name="curve_a_voltage_title">系统A相电压</string>
Expand Down

0 comments on commit 245f2a9

Please sign in to comment.