tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.5

Browse Source 
fix:增加根据类别显示标签，修改WiFi获取
update:
This commit is contained in:
Godfather
2022-02-22 15:48:19 +08:00
parent 2230ea5161
commit 7e37ab1104
13 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -61,8 +61,8 @@ android {
//新平台正式 //新平台正式
newly { newly {
flavorDimensions "default" flavorDimensions "default"
versionCode 15 versionCode 16
versionName "2.4" versionName "2.5"
/*********************************极光推送************************************/ /*********************************极光推送************************************/
manifestPlaceholders = [ manifestPlaceholders = [
XG_ACCESS_ID : "1500026372", XG_ACCESS_ID : "1500026372",

26
app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java
View File

@@ -9,32 +9,34 @@ import com.aoleyun.sn.base.BaseView;
public class MainAContact { public class MainAContact {
public interface Presenter extends BasePresenter<MainView> { public interface Presenter extends BasePresenter<MainView> {
//设置二维码 /*设置二维码*/
void getQRImage(String mac); void getQRImage(String mac);
//获取学生信息 /*获取学生信息*/
void getStudesInfo(); void getStudesInfo();
//获取设备锁定状态 /*获取设备锁定状态*/
void getLockedState(); void getLockedState();
//手动获取设备信息更新 /*手动获取设备信息更新*/
void buttonCheckUpdate(View view); void buttonCheckUpdate(View view);
} }
public interface MainView extends BaseView { public interface MainView extends BaseView {
//获取二维码 /*获取二维码*/
void setQRImage(Bitmap qrImage); void setQRImage(Bitmap qrImage);
//设置批次信息 /*设置账户类型*/
void settrade_type(int tradeType);
/*设置批次信息*/
void setBatchText(String text, int visibility); void setBatchText(String text, int visibility);
//设置班级信息 /*设置班级信息*/
void setClassText(String text, int visibility); void setClassText(String text, int visibility);
//设置学号信息 /*设置学号信息*/
void setNumberText(String text, int visibility); void setNumberText(String text, int visibility);
//设置姓名信息 /*设置姓名信息*/
void setNameText(String text, int visibility); void setNameText(String text, int visibility);
//设置头像 /*设置头像*/
void setHead(String url); void setHead(String url);
//获取设备锁定状态 /*获取设备锁定状态*/
void setLockedState(boolean loocked); void setLockedState(boolean loocked);
//手动获取设备信息更新 /*手动获取设备信息更新*/
void buttonCheckUpdateFinish(boolean update, JsonObject jsonObject); void buttonCheckUpdateFinish(boolean update, JsonObject jsonObject);
} }
} }

2
app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java
View File

@@ -119,6 +119,8 @@ public class MainAPresenter implements MainAContact.Presenter {
requestSucceeded = true; requestSucceeded = true;
Log.e(TAG + ":" + "getStudesInfo", "onNext: " + studentsInfoBaseResponse.data); Log.e(TAG + ":" + "getStudesInfo", "onNext: " + studentsInfoBaseResponse.data);
if (studentsInfoBaseResponse.code == OK) { if (studentsInfoBaseResponse.code == OK) {
int trade_type = studentsInfoBaseResponse.data.getTrade_type();
mView.settrade_type(trade_type);
String sno = studentsInfoBaseResponse.data.getSno(); String sno = studentsInfoBaseResponse.data.getSno();
String realname = studentsInfoBaseResponse.data.getRealname(); String realname = studentsInfoBaseResponse.data.getRealname();
String classes = studentsInfoBaseResponse.data.getClasses(); String classes = studentsInfoBaseResponse.data.getClasses();

15
app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java
View File

@@ -63,8 +63,12 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
TextView tv_version; TextView tv_version;
@BindView(R.id.tv_batch) @BindView(R.id.tv_batch)
TextView tv_batch; TextView tv_batch;
@BindView(R.id.tv_class_name)
TextView tv_class_name;
@BindView(R.id.tv_class) @BindView(R.id.tv_class)
TextView tv_class; TextView tv_class;
@BindView(R.id.tv_number_name)
TextView tv_number_name;
@BindView(R.id.tv_number) @BindView(R.id.tv_number)
TextView tv_number; TextView tv_number;
@BindView(R.id.tv_name) @BindView(R.id.tv_name)
@@ -228,6 +232,17 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
head.setImageBitmap(qrImage); head.setImageBitmap(qrImage);
} }
@Override
public void settrade_type(int tradeType) {
if (tradeType == 1) {
tv_class_name.setText("班级");
tv_number_name.setText("学号");
} else if (tradeType == 2) {
tv_class_name.setText("部门");
tv_number_name.setText("工号");
}
}
@Override @Override
public void setBatchText(String text, int visibility) { public void setBatchText(String text, int visibility) {
tv_batch.setText(text); tv_batch.setText(text);

20
app/src/main/java/com/aoleyun/sn/bean/StudentsInfo.java
View File

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

24
app/src/main/java/com/aoleyun/sn/bean/WiFiAlias.java
View File

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

2
app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java
View File

@@ -924,7 +924,7 @@ public class HTTPInterface {
}); });
} }
public static void getWiFiPasswd(Context context) { public static void getWiFiPasswd() {
NetInterfaceManager.getInstance().getWiFiControl() NetInterfaceManager.getInstance().getWiFiControl()
.subscribe(new Observer<BaseResponse<List<WiFiAlias>>>() { .subscribe(new Observer<BaseResponse<List<WiFiAlias>>>() {
@Override @Override

2
app/src/main/java/com/aoleyun/sn/network/UrlAddress.java
View File

@@ -76,7 +76,7 @@ public class UrlAddress {
/*获取远程关机时间*/ /*获取远程关机时间*/
public static final String GET_POWEROFF_TIME = "And/getTimedShutdown"; public static final String GET_POWEROFF_TIME = "And/getTimedShutdown";
/*获取WiFi名和密码*/ /*获取WiFi名和密码*/
public static final String GET_WIFI_ALIAS_PW = "And/getWifi"; public static final String GET_WIFI_ALIAS_PW = "And/SnControl/getWifi";
/*获取log任务*/ /*获取log任务*/
public static final String GET_LOG_ORDER = "And/getSnRunLog"; public static final String GET_LOG_ORDER = "And/getSnRunLog";
/*上传log文件*/ /*上传log文件*/

7
app/src/main/java/com/aoleyun/sn/network/api/newapi/GetWiFiAliasApi.java
View File

@@ -10,7 +10,9 @@ import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import retrofit2.http.Field; import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded; import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.Query;
/** /**
* @author : fanhuitong * @author : fanhuitong
@@ -20,9 +22,8 @@ import retrofit2.http.POST;
* version: 1.0 * version: 1.0
*/ */
public interface GetWiFiAliasApi { public interface GetWiFiAliasApi {
@FormUrlEncoded @GET(UrlAddress.GET_WIFI_ALIAS_PW)
@POST(UrlAddress.GET_WIFI_ALIAS_PW)
Observable<BaseResponse<List<WiFiAlias>>> getWiFiAlias( Observable<BaseResponse<List<WiFiAlias>>> getWiFiAlias(
@Field("sn") String sn @Query("sn") String sn
); );
} }

2
app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
View File

@@ -720,7 +720,7 @@ public class MessageReceiver extends XGPushBaseReceiver {
} }
break; break;
case UPDATE_WIFI_PW: case UPDATE_WIFI_PW:
HTTPInterface.getWiFiPasswd(mContext); HTTPInterface.getWiFiPasswd();
break; break;
case DEVICES_POWEROFF: case DEVICES_POWEROFF:
HTTPInterface.getPoweroffTime(); HTTPInterface.getPoweroffTime();

16
app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java
View File

@@ -10,8 +10,6 @@ import android.util.Log;
import com.aoleyun.sn.bean.WiFiAlias; import com.aoleyun.sn.bean.WiFiAlias;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV; import com.tencent.mmkv.MMKV;
@@ -195,7 +193,7 @@ public class WiFiUtils {
return; return;
} }
for (WiFiAlias wiFiAlias : oldWiFiAlias) { for (WiFiAlias wiFiAlias : oldWiFiAlias) {
WifiConfiguration tempConfig = isExist(wiFiAlias.getWifi_name()); WifiConfiguration tempConfig = isExist(wiFiAlias.getName());
if (tempConfig != null) { if (tempConfig != null) {
mWifiManager.removeNetwork(tempConfig.networkId); mWifiManager.removeNetwork(tempConfig.networkId);
} }
@@ -222,17 +220,17 @@ public class WiFiUtils {
Log.e("comparedWiFiAlias", "addedWiFiAlias: " + addedWiFiAlias); Log.e("comparedWiFiAlias", "addedWiFiAlias: " + addedWiFiAlias);
if (removedWiFiAlias.size() != 0) { if (removedWiFiAlias.size() != 0) {
for (WiFiAlias alias : removedWiFiAlias) { for (WiFiAlias alias : removedWiFiAlias) {
WifiConfiguration tempConfig = isExist(alias.getWifi_name()); WifiConfiguration tempConfig = isExist(alias.getName());
if (tempConfig != null) { if (tempConfig != null) {
mWifiManager.removeNetwork(tempConfig.networkId); mWifiManager.removeNetwork(tempConfig.networkId);
Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getWifi_name()); Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getName());
} }
} }
} }
Log.e("comparedWiFiAlias", "tempWiFiAlias: " + tempWiFiAlias); Log.e("comparedWiFiAlias", "tempWiFiAlias: " + tempWiFiAlias);
if (addedWiFiAlias.size() != 0) { if (addedWiFiAlias.size() != 0) {
for (WiFiAlias alias : tempWiFiAlias) { for (WiFiAlias alias : tempWiFiAlias) {
if (!wifiSaved(alias.getWifi_name())) { if (!wifiSaved(alias.getName())) {
addWiFiNetwork(alias); addWiFiNetwork(alias);
} }
} }
@@ -246,10 +244,10 @@ public class WiFiUtils {
private static void addWiFiNetwork(WiFiAlias alias) { private static void addWiFiNetwork(WiFiAlias alias) {
int netId; int netId;
if (TextUtils.isEmpty(alias.getPassword())) { if (TextUtils.isEmpty(alias.getPwd())) {
netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), "", false)); netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), "", false));
} else { } else {
netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), alias.getPassword(), true)); netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), alias.getPwd(), true));
} }
mWifiManager.enableNetwork(netId, true); mWifiManager.enableNetwork(netId, true);
} }

2
app/src/main/res/layout-land/activity_main.xml
View File

@@ -222,6 +222,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_class_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@@ -263,6 +264,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_number_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"

2
app/src/main/res/layout-port/activity_main.xml
View File

@@ -194,6 +194,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_class_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@@ -235,6 +236,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_number_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"