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

feat: 设备添加页面

Browse Source
This commit is contained in:
niushuai233
2022-10-20 18:02:23 +08:00
parent 8b1617ce45
commit 7e5035fb6b
8 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ public class DeviceInfo {
device.setName("卧室灯开关" + (i + 1));
device.setIconId(iconId);
device.setDescription("卧室灯开关-树莓派");
device.setDeviceType(DeviceTypeEnum.Switch);
device.setDeviceType(DeviceTypeEnum.Power_Switch);
device.setOnOff(OnOffEnum.OFF);
device.setCommandPath("/path/file");
device.setCommandArgs("-c light -t 1");

43
app/src/main/java/cc/niushuai/project/devcontrol/base/enums/DeviceTypeEnum.java
View File

@@ -1,7 +1,10 @@
package cc.niushuai.project.devcontrol.base.enums;
import android.widget.TextView;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
import cc.niushuai.project.devcontrol.ui.deviceadd.DeviceAddPowerSwitchActivity;
import cc.niushuai.project.devcontrol.ui.powerswitch.PowerSwitchActivity;
/**
@@ -15,20 +18,34 @@ public enum DeviceTypeEnum {
/**
* 开关
*/
Switch("Switch", "开关", R.drawable.ic_device_type_switch, PowerSwitchActivity.class),
Custom("Custom", "自定义设备", R.drawable.ic_device_type_custom, PowerSwitchActivity.class),
Power_Switch("Power_Switch", "开关", R.drawable.ic_device_type_switch, DeviceAddPowerSwitchActivity.class, PowerSwitchActivity.class),
Custom("Custom", "自定义设备", R.drawable.ic_device_type_custom, DeviceAddPowerSwitchActivity.class, PowerSwitchActivity.class),
;
private String value;
private String text;
private int resId;
private Class<? extends BaseActivity> activity;
private Class<? extends BaseActivity> deviceAddActivity;
private Class<? extends BaseActivity> deviceOperateActivity;
DeviceTypeEnum(String value, String text, int resId, Class<? extends BaseActivity> activity) {
DeviceTypeEnum(String value, String text, int resId,
Class<? extends BaseActivity> deviceAddActivity,
Class<? extends BaseActivity> deviceOperateActivity) {
this.value = value;
this.text = text;
this.resId = resId;
this.activity = activity;
this.deviceAddActivity = deviceAddActivity;
this.deviceOperateActivity = deviceOperateActivity;
}
public static DeviceTypeEnum matchByValue(String value) {
for (DeviceTypeEnum deviceTypeEnum : DeviceTypeEnum.values()) {
if (deviceTypeEnum.getValue().equals(value)) {
return deviceTypeEnum;
}
}
return null;
}
public String getValue() {
@@ -55,11 +72,19 @@ public enum DeviceTypeEnum {
this.resId = resId;
}
public Class<? extends BaseActivity> getActivity() {
return activity;
public Class<? extends BaseActivity> getDeviceAddActivity() {
return deviceAddActivity;
}
public void setActivity(Class<? extends BaseActivity> activity) {
this.activity = activity;
public void setDeviceAddActivity(Class<? extends BaseActivity> deviceAddActivity) {
this.deviceAddActivity = deviceAddActivity;
}
public Class<? extends BaseActivity> getDeviceOperateActivity() {
return deviceOperateActivity;
}
public void setDeviceOperateActivity(Class<? extends BaseActivity> deviceOperateActivity) {
this.deviceOperateActivity = deviceOperateActivity;
}
}

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

@@ -14,8 +14,11 @@ public class GlobalVariables {
*/
public static final Map<String, DeviceInfo> DEVICE_INFO_MAP = new HashMap<>(16);
public static Class<? extends BaseActivity> getDeviceAddActivity(String deviceId) {
return getDeviceInfo(deviceId).getDeviceType().getDeviceAddActivity();
}
public static Class<? extends BaseActivity> getDeviceOperateActivity(String deviceId) {
return getDeviceInfo(deviceId).getDeviceType().getActivity();
return getDeviceInfo(deviceId).getDeviceType().getDeviceOperateActivity();
}
public static DeviceInfo getDeviceInfo(String deviceId) {