niushuai233/DevControl
1
0
Fork 0
mirror of https://github.com/niushuai233/DevControl.git synced 2024-10-27 22:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 修改字段名为deviceType

Browse Source
This commit is contained in:
niushuai233 2022-10-19 15:32:04 +08:00
parent d238867bc4
commit 61e6a875ed
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/cc/niushuai/project/devcontrol/base/entity/device/DeviceInfo.java
View File

@ -30,7 +30,7 @@ public class DeviceInfo {
/** /**
* 设备类型 * 设备类型
*/ */
private DeviceTypeEnum type; private DeviceTypeEnum deviceType;
/** /**
* 开关状态 * 开关状态
@ -79,12 +79,12 @@ public class DeviceInfo {
this.name = name; this.name = name;
} }
public DeviceTypeEnum getType() { public DeviceTypeEnum getDeviceType() {
return type; return deviceType;
} }
public void setType(DeviceTypeEnum type) { public void setDeviceType(DeviceTypeEnum deviceType) {
this.type = type; this.deviceType = deviceType;
} }
public OnOffEnum getOnOff() { public OnOffEnum getOnOff() {
@ -148,7 +148,7 @@ public class DeviceInfo {
device.setName("卧室灯开关" + (i + 1)); device.setName("卧室灯开关" + (i + 1));
device.setIconId(iconId); device.setIconId(iconId);
device.setDescription("卧室灯开关-树莓派"); device.setDescription("卧室灯开关-树莓派");
device.setType(DeviceTypeEnum.Switch); device.setDeviceType(DeviceTypeEnum.Switch);
device.setOnOff(OnOffEnum.OFF); device.setOnOff(OnOffEnum.OFF);
device.setCommandPath("/path/file"); device.setCommandPath("/path/file");
device.setCommandArgs("-c light -t 1"); device.setCommandArgs("-c light -t 1");

4
app/src/main/java/cc/niushuai/project/devcontrol/base/util/GlobalVariables.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo; import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
public class GlobalVariables { public class GlobalVariables {
@ -13,5 +14,8 @@ public class GlobalVariables {
*/ */
public static final Map<String, DeviceInfo> DEVICE_INFO_MAP = new HashMap<>(16); public static final Map<String, DeviceInfo> DEVICE_INFO_MAP = new HashMap<>(16);
public static Class<? extends BaseActivity> getDeviceOperateActivity(String deviceId) {
return DEVICE_INFO_MAP.get(deviceId).getDeviceType().getActivity();
}
} }

3
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java
View File

@ -117,8 +117,7 @@ public class NavDeviceFragment extends Fragment {
private void onItemClick(AdapterView<?> parent, View view, int position, long id) { private void onItemClick(AdapterView<?> parent, View view, int position, long id) {
TextView textId = view.findViewById(R.id.device_item_cardView_id); TextView textId = view.findViewById(R.id.device_item_cardView_id);
DeviceInfo deviceInfo = GlobalVariables.DEVICE_INFO_MAP.get(textId.getText()); Intent intent = new Intent(getActivity(), GlobalVariables.getDeviceOperateActivity(textId.getText().toString()));
Intent intent = new Intent(getActivity(), deviceInfo.getType().getActivity());
intent.putExtra(Keys.ID, textId.getText()); intent.putExtra(Keys.ID, textId.getText());
startActivity(intent); startActivity(intent);
} }