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-24 18:02:14 +08:00
parent 05a79e5094
commit f904d4aa60
8 changed files with 235 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/cc/niushuai/project/devcontrol/base/util/UiUtil.java
View File

@@ -1,8 +1,10 @@
package cc.niushuai.project.devcontrol.base.util;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.util.TypedValue;
import android.widget.TextView;
public class UiUtil {
@@ -11,4 +13,8 @@ public class UiUtil {
return (int) TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, dipValue, r.getDisplayMetrics());
}
public static String getTextViewTextById(Activity activity, int id) {
return ((TextView) activity.findViewById(id)).getText().toString();
}
}

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

@@ -3,10 +3,14 @@ package cc.niushuai.project.devcontrol.ui.deviceadd;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.enums.YesNoEnum;
import cc.niushuai.project.devcontrol.base.util.IdWorker;
import cc.niushuai.project.devcontrol.base.util.UiUtil;
import cc.niushuai.project.devcontrol.db.DB;
import cc.niushuai.project.devcontrol.db.entity.Device;
import cc.niushuai.project.devcontrol.vo.DeviceInfo;
@@ -74,12 +78,12 @@ public class DeviceAddPowerSwitchActivity extends BaseActivity {
device.setIconId(R.drawable.ic_device_type_switch);
device.setDeviceType(DeviceTypeEnum.Power_Switch.getValue());
device.setOnOff(OnOffEnum.OFF.getValue());
device.setDeviceName(binding.deviceAddName.getText().toString());
device.setCommandPath(binding.deviceAddParamProgram.getText().toString());
device.setCommandStatus(binding.deviceAddParamStatus.getText().toString());
device.setCommandOpen(binding.deviceAddParamOpen.getText().toString());
device.setCommandClose(binding.deviceAddParamClose.getText().toString());
device.setRemark(binding.deviceAddParamRemark.getText().toString());
device.setDeviceName(UiUtil.getTextViewTextById(this, R.id.device_add_name));
device.setCommandPath(UiUtil.getTextViewTextById(this,R.id.device_add_param_program));
device.setCommandStatus(UiUtil.getTextViewTextById(this,R.id.device_add_param_status));
device.setCommandOpen(UiUtil.getTextViewTextById(this,R.id.device_add_param_open));
device.setCommandClose(UiUtil.getTextViewTextById(this,R.id.device_add_param_close));
device.setRemark(UiUtil.getTextViewTextById(this,R.id.device_add_param_remark));
device.setCreateTime(DateUtil.now());
device.setOrder(1);
device.setIsDeleted(YesNoEnum.NO.getIntegerValue());
@@ -95,4 +99,6 @@ public class DeviceAddPowerSwitchActivity extends BaseActivity {
this.finish();
ActivityUtil.startActivity(this, PowerSwitchActivity.class, new String[]{Keys.ID}, new String[]{device.getId() + ""});
}
}

7
app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchSetParamActivity.java
View File

@@ -32,7 +32,8 @@ public class PowerSwitchSetParamActivity extends BaseActivity {
protected void init() {
device = GlobalVariables.getDeviceInfo(getIntentDeviceId());
super.setTitle(getString(R.string.power_switch_set_paramSet), null);
this.setTitle(null, getString(R.string.power_switch_set_paramSet), null, R.drawable.ic_confrim_32);
}
@Override
@@ -40,10 +41,8 @@ public class PowerSwitchSetParamActivity extends BaseActivity {
// 隐藏更多按钮
super.activityButtonBackClickListener(this);
super.activityButtonMoreSetClickListener(false, null, null, null);
// 保存监听事件
binding.powerSwitchSetActivityItemParamSetBtnSave.setOnClickListener(this::btnSaveParamClickListener);
super.activityButtonMoreSetClickListener(this::btnSaveParamClickListener);
}
private void btnSaveParamClickListener(View view) {