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-21 14:53:30 +08:00
parent 297b60fa7a
commit 1c8968e140
16 changed files with 360 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,12 +56,19 @@ public class DeviceInfo {
private String commandPath;
/**
* <pre>
* 执行命令 参数
* /文件夹/二进制文件 参数
* </pre>
* 开启参数
*/
private String commandArgs;
private String commandOpen;
/**
* 关闭参数
*/
private String commandClose;
/**
* 扩展参数集合
*/
private List<String> commandExtra;
public String getId() {
return id;
@@ -119,18 +126,29 @@ public class DeviceInfo {
this.commandPath = commandPath;
}
public String getCommandArgs() {
return commandArgs;
public String getCommandOpen() {
return commandOpen;
}
public void setCommandArgs(String commandArgs) {
this.commandArgs = commandArgs;
public void setCommandOpen(String commandOpen) {
this.commandOpen = commandOpen;
}
public String getFullCommandArgs() {
return StrUtil.join(StrUtil.SPACE, this.getCommandPath(), StrUtil.SPACE, this.getCommandArgs());
public String getCommandClose() {
return commandClose;
}
public void setCommandClose(String commandClose) {
this.commandClose = commandClose;
}
public List<String> getCommandExtra() {
return commandExtra;
}
public void setCommandExtra(List<String> commandExtra) {
this.commandExtra = commandExtra;
}
/**
* mock 假数据
@@ -151,7 +169,8 @@ public class DeviceInfo {
device.setDeviceType(DeviceTypeEnum.Power_Switch);
device.setOnOff(OnOffEnum.OFF);
device.setCommandPath("/path/file");
device.setCommandArgs("-c light -t 1");
device.setCommandOpen("-c light -t 1");
device.setCommandClose("-c light -t 0");
list.add(device);
GlobalVariables.DEVICE_INFO_MAP.put(device.getId(), device);

49
app/src/main/java/cc/niushuai/project/devcontrol/base/ui/BaseActivity.java
View File

@@ -4,6 +4,7 @@ import android.view.View;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.AppCompatImageButton;
import java.util.Map;
@@ -43,9 +44,21 @@ public abstract class BaseActivity extends AppCompatActivity {
* @date: 2022/10/20 10:13
*/
protected void setTitle(String title, String subTitle) {
this.setTitle(null, title, subTitle, null);
}
/**
* 设置title 同时修改icon
*
* @author niushuai
* @date: 2022/10/20 10:13
*/
protected void setTitle(Integer backIconResId, String title, String subTitle, Integer moreSetIconResId) {
// 标题名称
TextView titleTextView = findViewById(R.id.activity_title_name);
titleTextView.setText(title);
if (StrUtil.isNotEmpty(title)) {
titleTextView.setText(title);
}
// 副标题名称
TextView descTextView = findViewById(R.id.activity_title_description);
@@ -58,6 +71,18 @@ public abstract class BaseActivity extends AppCompatActivity {
// 主标题 修改高度为50dp
titleTextView.getLayoutParams().height = UiUtil.dip2px(this, 50);
}
// 修改back按钮的图片
if (null != backIconResId) {
AppCompatImageButton btnBack = findViewById(R.id.activity_title_back);
btnBack.setImageResource(backIconResId);
}
// 修改back按钮的图片
if (null != moreSetIconResId) {
AppCompatImageButton btnMoreSet = findViewById(R.id.activity_title_more_set);
btnMoreSet.setImageResource(moreSetIconResId);
}
}
/**
@@ -80,6 +105,17 @@ public abstract class BaseActivity extends AppCompatActivity {
findViewById(R.id.activity_title_back).setOnClickListener(view -> activity.finish());
}
/**
* 自定义back的点击事件
*
* @param onClickListener 点击事件
* @author niushuai
* @date: 2022/10/21 14:19
*/
protected void activityButtonBackClickListener(View.OnClickListener onClickListener) {
findViewById(R.id.activity_title_back).setOnClickListener(onClickListener);
}
/**
* 更多设置 打开新的activity
*
@@ -99,4 +135,15 @@ public abstract class BaseActivity extends AppCompatActivity {
moreSetView.setOnClickListener(view -> ActivityUtil.startActivity(activity, clazz, withData));
}
/**
* 自定义moreSet点击事件
*
* @param onClickListener 点击事件
* @author niushuai
* @date: 2022/10/21 14:18
*/
protected void activityButtonMoreSetClickListener(View.OnClickListener onClickListener) {
findViewById(R.id.activity_title_more_set).setOnClickListener(onClickListener);
}
}

10
app/src/main/java/cc/niushuai/project/devcontrol/base/util/ActivityUtil.java
View File

@@ -16,6 +16,16 @@ public class ActivityUtil {
startActivity(sourceActivity, targetActivity, null);
}
public static void startActivity(Activity sourceActivity, Class<? extends BaseActivity> targetActivity, String[] keys, String[] values) {
HashMap<String, String> map = new HashMap<>();
for (int i = 0; i < keys.length; i++) {
map.put(keys[i], values[i]);
}
startActivity(sourceActivity, targetActivity, map);
}
public static void startActivity(Activity sourceActivity, Class<? extends BaseActivity> targetActivity,
Map<String, String> withData) {
Intent intent = new Intent(sourceActivity, targetActivity);

11
app/src/main/java/cc/niushuai/project/devcontrol/base/util/ToastUtil.java Normal file
View File

@@ -0,0 +1,11 @@
package cc.niushuai.project.devcontrol.base.util;
import android.app.Activity;
import android.widget.Toast;
public class ToastUtil {
public static void show(Activity activity, String msg) {
Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show();
}
}

59
app/src/main/java/cc/niushuai/project/devcontrol/ui/deviceadd/DeviceAddPowerSwitchActivity.java
View File

@@ -2,9 +2,22 @@ package cc.niushuai.project.devcontrol.ui.deviceadd;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.base.enums.DeviceTypeEnum;
import cc.niushuai.project.devcontrol.base.enums.OnOffEnum;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
import cc.niushuai.project.devcontrol.base.util.ActivityUtil;
import cc.niushuai.project.devcontrol.base.util.GlobalVariables;
import cc.niushuai.project.devcontrol.base.util.Keys;
import cc.niushuai.project.devcontrol.base.util.ToastUtil;
import cc.niushuai.project.devcontrol.databinding.ActivityDeviceAddPowerSwitchBinding;
import cc.niushuai.project.devcontrol.ui.powerswitch.PowerSwitchActivity;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
public class DeviceAddPowerSwitchActivity extends BaseActivity {
@@ -24,5 +37,51 @@ public class DeviceAddPowerSwitchActivity extends BaseActivity {
@Override
protected void init() {
// 设置标题栏信息
this.setTitle(null, getString(R.string.power_switch_add), null, R.drawable.ic_confrim_32);
}
/**
* 监听器事件统一设置入口
*
* @author niushuai
* @date: 2022/10/19 17:31
*/
@Override
protected void addListener() {
// 返回事件
this.activityButtonBackClickListener(this);
// 保存设备信息事件
this.activityButtonMoreSetClickListener(this::confirm4SaveDataClickListener);
}
/**
* 保存设备数据
*
* @param view
* @author niushuai
* @date: 2022/10/21 14:20
*/
private void confirm4SaveDataClickListener(View view) {
DeviceInfo device = new DeviceInfo();
device.setId(IdUtil.nanoId());
device.setIconId(R.drawable.ic_device_type_switch);
device.setDeviceType(DeviceTypeEnum.Power_Switch);
device.setOnOff(OnOffEnum.OFF);
device.setName(binding.deviceAddName.getText().toString());
device.setDescription("默认设备");
device.setCommandPath(binding.deviceAddParamProgram.getText().toString());
device.setCommandOpen(binding.deviceAddParamOpen.getText().toString());
device.setCommandClose(binding.deviceAddParamClose.getText().toString());
GlobalVariables.DEVICE_INFO_MAP.put(device.getId(), device);
ToastUtil.show(this, StrUtil.format("设备: {} 已新增", device.getName()));
ActivityUtil.startActivity(this, PowerSwitchActivity.class, new String[]{Keys.ID}, new String[]{device.getId()});
}
}