version:2.5

fix:增加根据类别显示标签,修改WiFi获取
update:
This commit is contained in:
2022-02-22 15:48:19 +08:00
parent 2230ea5161
commit 7e37ab1104
13 changed files with 78 additions and 46 deletions

View File

@@ -11,12 +11,14 @@ public class StudentsInfo implements Serializable {
private static final long serialVersionUID = -1489445700991359595L;
private String batch;
private String sno;
private String realname;
private String classes;
private int admin_id;
String batch;
String sno;
String realname;
String classes;
int admin_id;
String head_img;
/*1教育2商用*/
int trade_type;
public String getBatch() {
return batch;
@@ -66,6 +68,14 @@ public class StudentsInfo implements Serializable {
this.head_img = head_img;
}
public int getTrade_type() {
return trade_type;
}
public void setTrade_type(int trade_type) {
this.trade_type = trade_type;
}
@NonNull
@Override
public String toString() {

View File

@@ -15,36 +15,36 @@ import java.io.Serializable;
public class WiFiAlias implements Serializable {
private static final long serialVersionUID = 5635003554729670707L;
private String wifi_name;
private String password;
private String name;
private String pwd;
public String getWifi_name() {
return wifi_name;
public String getName() {
return name;
}
public void setWifi_name(String wifi_name) {
this.wifi_name = wifi_name;
public void setName(String name) {
this.name = name;
}
public String getPassword() {
return password;
public String getPwd() {
return pwd;
}
public void setPassword(String password) {
this.password = password;
public void setPwd(String pwd) {
this.pwd = pwd;
}
@NonNull
@Override
public String toString() {
return wifi_name + ":" + password;
return name + ":" + pwd;
}
@Override
public boolean equals(@Nullable Object obj) {
if (obj instanceof WiFiAlias) {
WiFiAlias alias = (WiFiAlias) obj;
return wifi_name.equals(alias.wifi_name) && password.equals(alias.password);
return name.equals(alias.name) && pwd.equals(alias.pwd);
} else {
return false;
}