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: 结构重组

Browse Source
This commit is contained in:
niushuai233
2022-10-24 16:03:26 +08:00
parent af5212a0be
commit b301ffff70
7 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,9 @@ 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.vo.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;
@@ -70,15 +69,15 @@ public class DeviceAddPowerSwitchActivity extends BaseActivity {
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.setDeviceName(binding.deviceAddName.getText().toString());
device.setRemark("默认设备");
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()));
ToastUtil.show(this, StrUtil.format("设备: {} 已新增", device.getDeviceName()));
this.finish();
ActivityUtil.startActivity(this, PowerSwitchActivity.class, new String[]{Keys.ID}, new String[]{device.getId()});

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

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.vo.DeviceInfo;
import cc.niushuai.project.devcontrol.base.util.GlobalVariables;
import cc.niushuai.project.devcontrol.base.util.Keys;
import cc.niushuai.project.devcontrol.databinding.DeviceItemBinding;
@@ -107,7 +107,7 @@ public class NavDeviceFragment extends Fragment {
// 设置当前设备的图标和名称
m1.put("device_item_cardView_id", deviceInfo.getId());
m1.put("device_item_cardView_image", deviceInfo.getIconId());
m1.put("device_item_cardView_text", deviceInfo.getName());
m1.put("device_item_cardView_text", deviceInfo.getDeviceName());
// 统一添加到data中
gvData.add(m1);

5
app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java
View File

@@ -9,7 +9,6 @@ import androidx.appcompat.widget.AppCompatImageView;
import java.util.HashMap;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.base.enums.OnOffEnum;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
import cc.niushuai.project.devcontrol.base.util.GlobalVariables;
@@ -44,10 +43,10 @@ public class PowerSwitchActivity extends BaseActivity {
this.device = GlobalVariables.getDeviceInfo(getIntentDeviceId());
// 标题名称
super.setTitle(this.device.getName(), this.device.getDescription());
super.setTitle(this.device.getDeviceName(), this.device.getRemark());
// 开关底部的名称
TextView contentTextTextView = findViewById(R.id.power_switch_activity_content_text);
contentTextTextView.setText(device.getName());
contentTextTextView.setText(device.getDeviceName());
}
/**