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

style: 代码格式化

Browse Source
This commit is contained in:
niushuai233
2022-10-25 14:56:22 +08:00
parent 3f376200e5
commit 1968904318
17 changed files with 148 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
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.custom.DeviceCustomActivity;

16
app/src/main/java/cc/niushuai/project/devcontrol/base/enums/OnOffEnum.java
View File

@@ -14,14 +14,6 @@ public enum OnOffEnum {
this.text = text;
}
public String getValue() {
return value;
}
public String getText() {
return text;
}
public static OnOffEnum matchByValue(String value) {
for (OnOffEnum onOffEnum : OnOffEnum.values()) {
if (onOffEnum.getValue().equals(value)) {
@@ -30,4 +22,12 @@ public enum OnOffEnum {
}
return null;
}
public String getValue() {
return value;
}
public String getText() {
return text;
}
}

20
app/src/main/java/cc/niushuai/project/devcontrol/base/enums/YesNoEnum.java
View File

@@ -3,7 +3,7 @@ package cc.niushuai.project.devcontrol.base.enums;
public enum YesNoEnum {
YES("1", 1, "是"),
NO("0",0, "否"),
NO("0", 0, "否"),
;
private String value;
@@ -16,6 +16,15 @@ public enum YesNoEnum {
this.text = text;
}
public static YesNoEnum matchByValue(String value) {
for (YesNoEnum onOffEnum : YesNoEnum.values()) {
if (onOffEnum.getValue().equals(value)) {
return onOffEnum;
}
}
return null;
}
public String getValue() {
return value;
}
@@ -27,13 +36,4 @@ public enum YesNoEnum {
public String getText() {
return text;
}
public static YesNoEnum matchByValue(String value) {
for (YesNoEnum onOffEnum : YesNoEnum.values()) {
if (onOffEnum.getValue().equals(value)) {
return onOffEnum;
}
}
return null;
}
}

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

@@ -9,11 +9,11 @@ import androidx.appcompat.widget.AppCompatImageButton;
import java.util.Map;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.util.GlobalVariables;
import cc.niushuai.project.devcontrol.vo.DeviceInfo;
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.UiUtil;
import cc.niushuai.project.devcontrol.vo.DeviceInfo;
import cn.hutool.core.util.StrUtil;
/**

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

@@ -2,7 +2,6 @@ package cc.niushuai.project.devcontrol.base.util;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import java.util.HashMap;
import java.util.Map;

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

@@ -4,10 +4,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
import cc.niushuai.project.devcontrol.db.DB;
import cc.niushuai.project.devcontrol.db.entity.Device;
import cc.niushuai.project.devcontrol.vo.DeviceInfo;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
public class GlobalVariables {
@@ -35,6 +35,7 @@ public class GlobalVariables {
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().getDeviceOperateActivity();
}

70
app/src/main/java/cc/niushuai/project/devcontrol/base/util/IdWorker.java
View File

@@ -9,6 +9,26 @@ public class IdWorker {
private long datacenterId; //数据id
//12位的序列号
private long sequence;
//初始时间戳
private long twepoch = 1288834974657L;
//长度为5位
private long workerIdBits = 5L;
private long datacenterIdBits = 5L;
//最大值
private long maxWorkerId = -1L ^ (-1L << workerIdBits);
private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
//序列号id长度
private long sequenceBits = 12L;
//序列号最大值
private long sequenceMask = -1L ^ (-1L << sequenceBits);
//工作id需要左移的位数，12位
private long workerIdShift = sequenceBits;
//数据id需要左移位数 12+5=17位
private long datacenterIdShift = sequenceBits + workerIdBits;
//时间戳需要左移位数 12+5+5=22位
private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
//上次时间戳，初始值为负数
private long lastTimestamp = -1L;
public IdWorker(long workerId, long datacenterId, long sequence) {
// sanity check for workerId
@@ -26,29 +46,21 @@ public class IdWorker {
this.sequence = sequence;
}
//初始时间戳
private long twepoch = 1288834974657L;
//---------------测试---------------
public static void main(String[] args) {
IdWorker worker = new IdWorker(1, 1, 1);
for (int i = 0; i < 30; i++) {
System.out.println(worker.nextId());
}
}
//长度为5位
private long workerIdBits = 5L;
private long datacenterIdBits = 5L;
//最大值
private long maxWorkerId = -1L ^ (-1L << workerIdBits);
private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
//序列号id长度
private long sequenceBits = 12L;
//序列号最大值
private long sequenceMask = -1L ^ (-1L << sequenceBits);
public static long getNextId() {
return INSTANCE.nextId();
}
//工作id需要左移的位数，12位
private long workerIdShift = sequenceBits;
//数据id需要左移位数 12+5=17位
private long datacenterIdShift = sequenceBits + workerIdBits;
//时间戳需要左移位数 12+5+5=22位
private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
//上次时间戳，初始值为负数
private long lastTimestamp = -1L;
public static String getNextIdStr() {
return getNextId() + "";
}
public long getWorkerId() {
return workerId;
@@ -113,20 +125,4 @@ public class IdWorker {
private long timeGen() {
return System.currentTimeMillis();
}
//---------------测试---------------
public static void main(String[] args) {
IdWorker worker = new IdWorker(1, 1, 1);
for (int i = 0; i < 30; i++) {
System.out.println(worker.nextId());
}
}
public static long getNextId() {
return INSTANCE.nextId();
}
public static String getNextIdStr() {
return getNextId() + "";
}
}

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

@@ -4,7 +4,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.util.TypedValue;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;