From 7e37ab11045ee67d6aa9beb1f153968767241886 Mon Sep 17 00:00:00 2001 From: Godfather <981964879@qq.com> Date: Tue, 22 Feb 2022 15:48:19 +0800 Subject: [PATCH] =?UTF-8?q?version:2.5=20fix:=E5=A2=9E=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=88=AB=E6=98=BE=E7=A4=BA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9WiFi=E8=8E=B7=E5=8F=96=20update:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- .../sn/activity/main/MainAContact.java | 26 ++++++++++--------- .../sn/activity/main/MainAPresenter.java | 2 ++ .../sn/activity/main/MainActivity.java | 15 +++++++++++ .../com/aoleyun/sn/bean/StudentsInfo.java | 20 ++++++++++---- .../java/com/aoleyun/sn/bean/WiFiAlias.java | 24 ++++++++--------- .../com/aoleyun/sn/network/HTTPInterface.java | 2 +- .../com/aoleyun/sn/network/UrlAddress.java | 2 +- .../network/api/newapi/GetWiFiAliasApi.java | 7 ++--- .../com/aoleyun/sn/tpush/MessageReceiver.java | 2 +- .../java/com/aoleyun/sn/utils/WiFiUtils.java | 16 +++++------- .../main/res/layout-land/activity_main.xml | 2 ++ .../main/res/layout-port/activity_main.xml | 2 ++ 13 files changed, 78 insertions(+), 46 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 245151d..d4180e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,8 +61,8 @@ android { //新平台正式 newly { flavorDimensions "default" - versionCode 15 - versionName "2.4" + versionCode 16 + versionName "2.5" /*********************************极光推送************************************/ manifestPlaceholders = [ XG_ACCESS_ID : "1500026372", diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java index d1c218a..e5a3e22 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java @@ -9,32 +9,34 @@ import com.aoleyun.sn.base.BaseView; public class MainAContact { public interface Presenter extends BasePresenter { - //设置二维码 + /*设置二维码*/ void getQRImage(String mac); - //获取学生信息 + /*获取学生信息*/ void getStudesInfo(); - //获取设备锁定状态 + /*获取设备锁定状态*/ void getLockedState(); - //手动获取设备信息更新 + /*手动获取设备信息更新*/ void buttonCheckUpdate(View view); } public interface MainView extends BaseView { - //获取二维码 + /*获取二维码*/ void setQRImage(Bitmap qrImage); - //设置批次信息 + /*设置账户类型*/ + void settrade_type(int tradeType); + /*设置批次信息*/ void setBatchText(String text, int visibility); - //设置班级信息 + /*设置班级信息*/ void setClassText(String text, int visibility); - //设置学号信息 + /*设置学号信息*/ void setNumberText(String text, int visibility); - //设置姓名信息 + /*设置姓名信息*/ void setNameText(String text, int visibility); - //设置头像 + /*设置头像*/ void setHead(String url); - //获取设备锁定状态 + /*获取设备锁定状态*/ void setLockedState(boolean loocked); - //手动获取设备信息更新 + /*手动获取设备信息更新*/ void buttonCheckUpdateFinish(boolean update, JsonObject jsonObject); } } diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java index 6d129e7..a3ea173 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainAPresenter.java @@ -119,6 +119,8 @@ public class MainAPresenter implements MainAContact.Presenter { requestSucceeded = true; Log.e(TAG + ":" + "getStudesInfo", "onNext: " + studentsInfoBaseResponse.data); if (studentsInfoBaseResponse.code == OK) { + int trade_type = studentsInfoBaseResponse.data.getTrade_type(); + mView.settrade_type(trade_type); String sno = studentsInfoBaseResponse.data.getSno(); String realname = studentsInfoBaseResponse.data.getRealname(); String classes = studentsInfoBaseResponse.data.getClasses(); diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java index 77ea0b5..e972dca 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java @@ -63,8 +63,12 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, TextView tv_version; @BindView(R.id.tv_batch) TextView tv_batch; + @BindView(R.id.tv_class_name) + TextView tv_class_name; @BindView(R.id.tv_class) TextView tv_class; + @BindView(R.id.tv_number_name) + TextView tv_number_name; @BindView(R.id.tv_number) TextView tv_number; @BindView(R.id.tv_name) @@ -228,6 +232,17 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, 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 public void setBatchText(String text, int visibility) { tv_batch.setText(text); diff --git a/app/src/main/java/com/aoleyun/sn/bean/StudentsInfo.java b/app/src/main/java/com/aoleyun/sn/bean/StudentsInfo.java index 4721bbd..198cdb4 100644 --- a/app/src/main/java/com/aoleyun/sn/bean/StudentsInfo.java +++ b/app/src/main/java/com/aoleyun/sn/bean/StudentsInfo.java @@ -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() { diff --git a/app/src/main/java/com/aoleyun/sn/bean/WiFiAlias.java b/app/src/main/java/com/aoleyun/sn/bean/WiFiAlias.java index 3d40da7..2ddd913 100644 --- a/app/src/main/java/com/aoleyun/sn/bean/WiFiAlias.java +++ b/app/src/main/java/com/aoleyun/sn/bean/WiFiAlias.java @@ -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; } diff --git a/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java b/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java index 64a26b2..3929bf2 100644 --- a/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java +++ b/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java @@ -924,7 +924,7 @@ public class HTTPInterface { }); } - public static void getWiFiPasswd(Context context) { + public static void getWiFiPasswd() { NetInterfaceManager.getInstance().getWiFiControl() .subscribe(new Observer>>() { @Override diff --git a/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java b/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java index 48adbde..832ca79 100644 --- a/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java +++ b/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java @@ -76,7 +76,7 @@ public class UrlAddress { /*获取远程关机时间*/ public static final String GET_POWEROFF_TIME = "And/getTimedShutdown"; /*获取WiFi名和密码*/ - public static final String GET_WIFI_ALIAS_PW = "And/getWifi"; + public static final String GET_WIFI_ALIAS_PW = "And/SnControl/getWifi"; /*获取log任务*/ public static final String GET_LOG_ORDER = "And/getSnRunLog"; /*上传log文件*/ diff --git a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetWiFiAliasApi.java b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetWiFiAliasApi.java index 6564133..6b6e09c 100644 --- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetWiFiAliasApi.java +++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetWiFiAliasApi.java @@ -10,7 +10,9 @@ import java.util.List; import io.reactivex.Observable; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; import retrofit2.http.POST; +import retrofit2.http.Query; /** * @author : fanhuitong @@ -20,9 +22,8 @@ import retrofit2.http.POST; * version: 1.0 */ public interface GetWiFiAliasApi { - @FormUrlEncoded - @POST(UrlAddress.GET_WIFI_ALIAS_PW) + @GET(UrlAddress.GET_WIFI_ALIAS_PW) Observable>> getWiFiAlias( - @Field("sn") String sn + @Query("sn") String sn ); } diff --git a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java index b192a76..078f179 100644 --- a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java @@ -720,7 +720,7 @@ public class MessageReceiver extends XGPushBaseReceiver { } break; case UPDATE_WIFI_PW: - HTTPInterface.getWiFiPasswd(mContext); + HTTPInterface.getWiFiPasswd(); break; case DEVICES_POWEROFF: HTTPInterface.getPoweroffTime(); diff --git a/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java b/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java index 6a8ecb3..3b2ba0a 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java @@ -10,8 +10,6 @@ import android.util.Log; import com.aoleyun.sn.bean.WiFiAlias; import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; @@ -195,7 +193,7 @@ public class WiFiUtils { return; } for (WiFiAlias wiFiAlias : oldWiFiAlias) { - WifiConfiguration tempConfig = isExist(wiFiAlias.getWifi_name()); + WifiConfiguration tempConfig = isExist(wiFiAlias.getName()); if (tempConfig != null) { mWifiManager.removeNetwork(tempConfig.networkId); } @@ -222,17 +220,17 @@ public class WiFiUtils { Log.e("comparedWiFiAlias", "addedWiFiAlias: " + addedWiFiAlias); if (removedWiFiAlias.size() != 0) { for (WiFiAlias alias : removedWiFiAlias) { - WifiConfiguration tempConfig = isExist(alias.getWifi_name()); + WifiConfiguration tempConfig = isExist(alias.getName()); if (tempConfig != null) { mWifiManager.removeNetwork(tempConfig.networkId); - Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getWifi_name()); + Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getName()); } } } Log.e("comparedWiFiAlias", "tempWiFiAlias: " + tempWiFiAlias); if (addedWiFiAlias.size() != 0) { for (WiFiAlias alias : tempWiFiAlias) { - if (!wifiSaved(alias.getWifi_name())) { + if (!wifiSaved(alias.getName())) { addWiFiNetwork(alias); } } @@ -246,10 +244,10 @@ public class WiFiUtils { private static void addWiFiNetwork(WiFiAlias alias) { int netId; - if (TextUtils.isEmpty(alias.getPassword())) { - netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), "", false)); + if (TextUtils.isEmpty(alias.getPwd())) { + netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), "", false)); } else { - netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), alias.getPassword(), true)); + netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), alias.getPwd(), true)); } mWifiManager.enableNetwork(netId, true); } diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 1615ba7..c5945e6 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -222,6 +222,7 @@ app:layout_constraintTop_toTopOf="parent" />