diff --git a/app/src/main/java/com/abbidot/tracker/bean/WiFiZoneBean.kt b/app/src/main/java/com/abbidot/tracker/bean/WiFiZoneBean.kt index 3d9f238..eef29a3 100644 --- a/app/src/main/java/com/abbidot/tracker/bean/WiFiZoneBean.kt +++ b/app/src/main/java/com/abbidot/tracker/bean/WiFiZoneBean.kt @@ -18,7 +18,9 @@ data class WiFiZoneBean( var wifiName: String, var longitude: Double, var latitude: Double, + var wifiPass: String, + var wifiAuth: Int, var type: Int //1是home 2是office ) : Parcelable { - constructor() : this("", "", "", "", "", "", 0.0, 0.0, 1) + constructor() : this("", "", "", "", "", "", 0.0, 0.0, "", 0, 1) } diff --git a/app/src/main/java/com/abbidot/tracker/constant/ConstantString.kt b/app/src/main/java/com/abbidot/tracker/constant/ConstantString.kt index 5a6153e..fd2287a 100644 --- a/app/src/main/java/com/abbidot/tracker/constant/ConstantString.kt +++ b/app/src/main/java/com/abbidot/tracker/constant/ConstantString.kt @@ -53,6 +53,7 @@ import androidx.annotation.StringDef ConstantString.Id, ConstantString.PetWeight, ConstantString.Upgrade, + ConstantString.Password, ConstantString.PackageUnitMonth, ConstantString.PackageUnitYear, ConstantString.SetMealIndex @@ -105,6 +106,7 @@ annotation class ConstantString { const val UserBean = "userBean" const val HistoryDataBean = "historyDataBean" const val Upgrade = "upgrade" + const val Password = "password" //套餐单位 const val PackageUnitMonth = "MONTH" diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt index 78ce3de..4f8276e 100644 --- a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt +++ b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt @@ -567,6 +567,8 @@ interface INetworkService { @Field("wifiName") wifiName: String, @Field("longitude") longitude: Double, @Field("latitude") latitude: Double, + @Field("wifiPass") wifiPass: String, + @Field("wifiAuth") wifiAuth: Int, @Field("type") type: Int ): BaseResponse diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt index 99ec582..f569300 100644 --- a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt +++ b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt @@ -475,10 +475,21 @@ object NetworkApi : BaseNetworkApi(INetworkService.BASE_URL) { wifiName: String, longitude: Double, latitude: Double, + wifiPass: String, + wifiAuth: Int, type: Int ) = getResult { service.addWifiZone( - deviceId, wifiZoneName, address, wifiMac, wifiName, longitude, latitude, type + deviceId, + wifiZoneName, + address, + wifiMac, + wifiName, + longitude, + latitude, + wifiPass, + wifiAuth, + type ) } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPasswordActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPasswordActivity.kt index dfa42ac..89cccb7 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPasswordActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPasswordActivity.kt @@ -283,6 +283,8 @@ class AddWifiPasswordActivity : intent.putExtra(ConstantString.Pet, mPetBean) intent.putExtra(ConstantString.Latitude, mPetCurrentLat) intent.putExtra(ConstantString.Longitude, mPetCurrentLon) + val pws = mViewBinding.ilAddWifiPwdPassword.etInputContent.text.toString() + intent.putExtra(ConstantString.Password, pws) startActivityFinish(intent) }) } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt index 573d5e5..c396e42 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt @@ -221,9 +221,11 @@ class EditWifiPowerZoneActivity : } private fun initWifiData() { + var pws = "" intent.extras?.apply { isFirstBind = getBoolean(ConstantString.isFirstBind, false) isDisabledMode = getBoolean(ConstantString.isCheck, false) + pws = getString(ConstantString.Password, "") //设备里的wifi数据,添加使用到 mWiFiBean = Util.getParcelableAdaptive(intent, ConstantString.WiFi, WiFiBean::class.java) @@ -264,6 +266,8 @@ class EditWifiPowerZoneActivity : mWiFiBean?.let { wifiName = it.name wifiMac = it.mac + wifiAuth = it.auth_type + wifiPass = pws wifiZoneName = getString(R.string.txt_home) } mViewBinding.let { diff --git a/app/src/main/java/com/abbidot/tracker/vm/WiFiZoneViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/WiFiZoneViewModel.kt index c17586c..ce17316 100644 --- a/app/src/main/java/com/abbidot/tracker/vm/WiFiZoneViewModel.kt +++ b/app/src/main/java/com/abbidot/tracker/vm/WiFiZoneViewModel.kt @@ -29,7 +29,16 @@ class WiFiZoneViewModel : ViewModel() { viewModelScope.launch { wiFiZoneBean.apply { val result = NetworkApi.addWifiZone( - deviceId, wifiZoneName, address, wifiMac, wifiName, longitude, latitude, type + deviceId, + wifiZoneName, + address, + wifiMac, + wifiName, + longitude, + latitude, + wifiPass, + wifiAuth, + type ) mAddWiFiZoneLiveData.value = result }