diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 70ecf10..5d4dff1 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -2,8 +2,11 @@ import android.graphics.Color import android.util.Log +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.casic.br.R import com.casic.br.extensions.compressImage +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.GlideLoadEngine import com.casic.br.utils.LocaleConstant import com.casic.smarttube.callback.OnImageCompressListener @@ -17,6 +20,9 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_edit_user.* +import kotlinx.android.synthetic.main.activity_edit_user.userNameView +import kotlinx.android.synthetic.main.activity_edit_user.userPhoneView +import kotlinx.android.synthetic.main.fragment_mine.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File import java.util.* @@ -38,7 +44,12 @@ } override fun initData() { - + val userModel = DeserializeModel.getUserModel() ?: return + userNameView.text = resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile +// genderView.text = userModel.mobile +// birthdayView.text = userModel.mobile } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 70ecf10..5d4dff1 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -2,8 +2,11 @@ import android.graphics.Color import android.util.Log +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.casic.br.R import com.casic.br.extensions.compressImage +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.GlideLoadEngine import com.casic.br.utils.LocaleConstant import com.casic.smarttube.callback.OnImageCompressListener @@ -17,6 +20,9 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_edit_user.* +import kotlinx.android.synthetic.main.activity_edit_user.userNameView +import kotlinx.android.synthetic.main.activity_edit_user.userPhoneView +import kotlinx.android.synthetic.main.fragment_mine.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File import java.util.* @@ -38,7 +44,12 @@ } override fun initData() { - + val userModel = DeserializeModel.getUserModel() ?: return + userNameView.text = resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile +// genderView.text = userModel.mobile +// birthdayView.text = userModel.mobile } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt index 54975e3..c2d36d2 100644 --- a/app/src/main/java/com/casic/br/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt @@ -8,6 +8,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.android.user.api.ILoginCallback @@ -57,6 +58,7 @@ .loginWithPhonePassword("86", userPhone, userPassword, object : ILoginCallback { override fun onSuccess(user: User?) { SaveKeyValues.putValue(LocaleConstant.USER_IS_LOGIN, true) + SaveKeyValues.putValue(LocaleConstant.USER_MODEL, user!!.toJson()) LoadingDialogHub.dismiss() navigatePageTo() PageNavigationManager.finishAllActivity() diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 70ecf10..5d4dff1 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -2,8 +2,11 @@ import android.graphics.Color import android.util.Log +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.casic.br.R import com.casic.br.extensions.compressImage +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.GlideLoadEngine import com.casic.br.utils.LocaleConstant import com.casic.smarttube.callback.OnImageCompressListener @@ -17,6 +20,9 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_edit_user.* +import kotlinx.android.synthetic.main.activity_edit_user.userNameView +import kotlinx.android.synthetic.main.activity_edit_user.userPhoneView +import kotlinx.android.synthetic.main.fragment_mine.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File import java.util.* @@ -38,7 +44,12 @@ } override fun initData() { - + val userModel = DeserializeModel.getUserModel() ?: return + userNameView.text = resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile +// genderView.text = userModel.mobile +// birthdayView.text = userModel.mobile } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt index 54975e3..c2d36d2 100644 --- a/app/src/main/java/com/casic/br/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt @@ -8,6 +8,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.android.user.api.ILoginCallback @@ -57,6 +58,7 @@ .loginWithPhonePassword("86", userPhone, userPassword, object : ILoginCallback { override fun onSuccess(user: User?) { SaveKeyValues.putValue(LocaleConstant.USER_IS_LOGIN, true) + SaveKeyValues.putValue(LocaleConstant.USER_MODEL, user!!.toJson()) LoadingDialogHub.dismiss() navigatePageTo() PageNavigationManager.finishAllActivity() diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt index 25f4254..cc88165 100644 --- a/app/src/main/java/com/casic/br/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/view/MainActivity.kt @@ -12,7 +12,6 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.home.sdk.bean.HomeBean @@ -48,13 +47,13 @@ * IoT 设备的添加、编辑、移除、状态变化的监听基于家庭下。 * 用户账号下创建任意多个家庭。 * */ - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { TuyaHomeSdk.getHomeManagerInstance() .createHome("北燃生活体验馆", 116.486394, 39.885734, "西直门内南小街", arrayListOf("1"), object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean?) { - SaveKeyValues.putValue(LocaleConstant.HOME_DETAIL_MODEL, bean!!.toJson()) + SaveKeyValues.putValue(LocaleConstant.HOME_ID, bean?.homeId.toString()) } override fun onError(errorCode: String?, errorMsg: String?) { diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 70ecf10..5d4dff1 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -2,8 +2,11 @@ import android.graphics.Color import android.util.Log +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.casic.br.R import com.casic.br.extensions.compressImage +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.GlideLoadEngine import com.casic.br.utils.LocaleConstant import com.casic.smarttube.callback.OnImageCompressListener @@ -17,6 +20,9 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_edit_user.* +import kotlinx.android.synthetic.main.activity_edit_user.userNameView +import kotlinx.android.synthetic.main.activity_edit_user.userPhoneView +import kotlinx.android.synthetic.main.fragment_mine.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File import java.util.* @@ -38,7 +44,12 @@ } override fun initData() { - + val userModel = DeserializeModel.getUserModel() ?: return + userNameView.text = resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile +// genderView.text = userModel.mobile +// birthdayView.text = userModel.mobile } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt index 54975e3..c2d36d2 100644 --- a/app/src/main/java/com/casic/br/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt @@ -8,6 +8,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.android.user.api.ILoginCallback @@ -57,6 +58,7 @@ .loginWithPhonePassword("86", userPhone, userPassword, object : ILoginCallback { override fun onSuccess(user: User?) { SaveKeyValues.putValue(LocaleConstant.USER_IS_LOGIN, true) + SaveKeyValues.putValue(LocaleConstant.USER_MODEL, user!!.toJson()) LoadingDialogHub.dismiss() navigatePageTo() PageNavigationManager.finishAllActivity() diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt index 25f4254..cc88165 100644 --- a/app/src/main/java/com/casic/br/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/view/MainActivity.kt @@ -12,7 +12,6 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.home.sdk.bean.HomeBean @@ -48,13 +47,13 @@ * IoT 设备的添加、编辑、移除、状态变化的监听基于家庭下。 * 用户账号下创建任意多个家庭。 * */ - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { TuyaHomeSdk.getHomeManagerInstance() .createHome("北燃生活体验馆", 116.486394, 39.885734, "西直门内南小街", arrayListOf("1"), object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean?) { - SaveKeyValues.putValue(LocaleConstant.HOME_DETAIL_MODEL, bean!!.toJson()) + SaveKeyValues.putValue(LocaleConstant.HOME_ID, bean?.homeId.toString()) } override fun onError(errorCode: String?, errorMsg: String?) { diff --git a/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt b/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt index 4dc700e..bd5363c 100644 --- a/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt +++ b/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt @@ -5,11 +5,8 @@ import android.view.View import com.casic.br.R import com.casic.br.extensions.initLayoutImmersionBar -import com.casic.br.model.HomeModel import com.casic.br.utils.LoadingDialogHub import com.casic.br.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo @@ -31,7 +28,6 @@ private val kTag = "ResetDeviceActivity" private val context: Context = this@ResetDeviceActivity - private val gson by lazy { Gson() } private lateinit var params: ArrayList override fun initLayoutView(): Int = R.layout.activity_reset_device @@ -58,36 +54,36 @@ return@setOnClickListener } LoadingDialogHub.show(this, "设备配网中，请稍后") - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.getActivatorInstance().getActivatorToken(homeModel.homeId.toLong(), + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + TuyaHomeSdk.getActivatorInstance().getActivatorToken(homeId.toLong(), object : ITuyaActivatorGetToken { override fun onSuccess(token: String) { Log.d(kTag, "token: $token") //调用 配网接口 需要提供路由器的 SSID（即 Wi-Fi 名称）、密码、从云端获取的 Token 等。 - val builder = object : ActivatorBuilder() {} - builder.ssid = params[0] - builder.context = context - builder.password = params[1] - builder.activatorModel = ActivatorModelEnum.TY_EZ - builder.timeOut = 100 - builder.token = token - builder.listener = object : ITuyaSmartActivatorListener { - override fun onError(errorCode: String?, errorMsg: String?) { - Log.i(kTag, "onError: $errorMsg") - LoadingDialogHub.dismiss() - } + val builder = ActivatorBuilder().apply { + this.ssid = params[0] + this.context = context + this.password = params[1] + this.activatorModel = ActivatorModelEnum.TY_EZ + this.timeOut = 100 + this.token = token + this.listener = object : ITuyaSmartActivatorListener { + override fun onError(errorCode: String?, errorMsg: String?) { + Log.i(kTag, "onError: $errorMsg") + LoadingDialogHub.dismiss() + } - override fun onActiveSuccess(devResp: DeviceBean?) { - LoadingDialogHub.dismiss() - Log.d(kTag, devResp!!.toJson()) - navigatePageTo() - } + override fun onActiveSuccess(devResp: DeviceBean?) { + LoadingDialogHub.dismiss() + Log.d(kTag, devResp!!.toJson()) + navigatePageTo() + } - override fun onStep(step: String?, data: Any?) { - Log.i(kTag, "step: $step") - Log.i(kTag, "data: $data") - LoadingDialogHub.dismiss() + override fun onStep(step: String?, data: Any?) { + Log.i(kTag, "step: $step") + Log.i(kTag, "data: $data") + LoadingDialogHub.dismiss() + } } } TuyaHomeSdk.getActivatorInstance().newMultiActivator(builder).start() diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index 4ef912b..b9e32f4 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -7,7 +7,6 @@ import com.casic.br.adapter.RecommendAdapter import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.model.AddedDeviceModel -import com.casic.br.model.HomeModel import com.casic.br.model.RecommendModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddDeviceActivity @@ -15,8 +14,6 @@ import com.casic.br.view.device.FireplaceActivity import com.casic.br.view.device.RangeHoodActivity import com.casic.br.view.device.WaterHeaterActivity -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson @@ -33,7 +30,6 @@ class DevicePageFragment : KotlinBaseFragment() { private val kTag = "DevicePageFragment" - private val gson by lazy { Gson() } override fun initLayoutView(): Int = R.layout.fragment_device @@ -114,12 +110,11 @@ override fun onResume() { super.onResume() - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { return } - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.newHomeInstance(homeModel.homeId.toLong()) + TuyaHomeSdk.newHomeInstance(homeId.toLong()) .getHomeDetail(object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean) { val deviceList: List = bean.deviceList diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index afc5de7..9a8cf5a 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter import com.casic.br.extensions.initLayoutImmersionBar +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant import com.casic.br.view.AddressManagerActivity import com.casic.br.view.EditUserActivity @@ -98,11 +99,33 @@ } override fun onResume() { - Glide.with(this) - .load(R.mipmap.ic_launcher) - .apply(RequestOptions.circleCropTransform()) - .placeholder(R.mipmap.load_image_error) - .into(userAvatarView) super.onResume() + val userModel = DeserializeModel.getUserModel() + if (userModel == null) { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + userNameView.text = "未登录" + userPhoneView.text = "" + return + } + if (userModel.headPic == "") { + Glide.with(this) + .load(R.mipmap.ic_launcher) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } else { + Glide.with(this) + .load(userModel.headPic) + .apply(RequestOptions.circleCropTransform()) + .placeholder(R.mipmap.load_image_error) + .into(userAvatarView) + } + userNameView.text = requireContext().resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/model/HomeModel.java b/app/src/main/java/com/casic/br/model/HomeModel.java deleted file mode 100644 index 638d420..0000000 --- a/app/src/main/java/com/casic/br/model/HomeModel.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.casic.br.model; - -import java.util.List; - -public class HomeModel { - - private boolean admin; - private String geoName; - private int homeId; - private int homeStatus; - private double lat; - private double lon; - private String name; - private int role; - private List rooms; - - public boolean isAdmin() { - return admin; - } - - public void setAdmin(boolean admin) { - this.admin = admin; - } - - public String getGeoName() { - return geoName; - } - - public void setGeoName(String geoName) { - this.geoName = geoName; - } - - public int getHomeId() { - return homeId; - } - - public void setHomeId(int homeId) { - this.homeId = homeId; - } - - public int getHomeStatus() { - return homeStatus; - } - - public void setHomeStatus(int homeStatus) { - this.homeStatus = homeStatus; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRole() { - return role; - } - - public void setRole(int role) { - this.role = role; - } - - public List getRooms() { - return rooms; - } - - public void setRooms(List rooms) { - this.rooms = rooms; - } - - public static class RoomsModel { - private int displayOrder; - private String name; - private int roomId; - private boolean sel; - - public int getDisplayOrder() { - return displayOrder; - } - - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getRoomId() { - return roomId; - } - - public void setRoomId(int roomId) { - this.roomId = roomId; - } - - public boolean isSel() { - return sel; - } - - public void setSel(boolean sel) { - this.sel = sel; - } - } -} diff --git a/app/src/main/java/com/casic/br/model/UserModel.java b/app/src/main/java/com/casic/br/model/UserModel.java new file mode 100644 index 0000000..0190af4 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/UserModel.java @@ -0,0 +1,326 @@ +package com.casic.br.model; + +public class UserModel { + + private int dataVersion; + private DomainModel domain; + private String ecode; + private String email; + private ExtrasModel extras; + private String headPic; + private String mobile; + private String nickName; + private String partnerIdentity; + private String phoneCode; + private int productCount; + private int regFrom; + private String sid; + private String snsNickname; + private int tempUnit; + private String timezoneId; + private String uid; + private int userType; + private String username; + + public int getDataVersion() { + return dataVersion; + } + + public void setDataVersion(int dataVersion) { + this.dataVersion = dataVersion; + } + + public DomainModel getDomain() { + return domain; + } + + public void setDomain(DomainModel domain) { + this.domain = domain; + } + + public String getEcode() { + return ecode; + } + + public void setEcode(String ecode) { + this.ecode = ecode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public ExtrasModel getExtras() { + return extras; + } + + public void setExtras(ExtrasModel extras) { + this.extras = extras; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPartnerIdentity() { + return partnerIdentity; + } + + public void setPartnerIdentity(String partnerIdentity) { + this.partnerIdentity = partnerIdentity; + } + + public String getPhoneCode() { + return phoneCode; + } + + public void setPhoneCode(String phoneCode) { + this.phoneCode = phoneCode; + } + + public int getProductCount() { + return productCount; + } + + public void setProductCount(int productCount) { + this.productCount = productCount; + } + + public int getRegFrom() { + return regFrom; + } + + public void setRegFrom(int regFrom) { + this.regFrom = regFrom; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getSnsNickname() { + return snsNickname; + } + + public void setSnsNickname(String snsNickname) { + this.snsNickname = snsNickname; + } + + public int getTempUnit() { + return tempUnit; + } + + public void setTempUnit(int tempUnit) { + this.tempUnit = tempUnit; + } + + public String getTimezoneId() { + return timezoneId; + } + + public void setTimezoneId(String timezoneId) { + this.timezoneId = timezoneId; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public static class DomainModel { + private String aispeechHttpsUrl; + private String aispeechQuicUrl; + private boolean defaultRegion; + private String fusionUrl; + private String gwApiUrl; + private String gwMqttUrl; + private String mobileApiUrl; + private String mobileMediaMqttUrl; + private String mobileMqttUrl; + private String mobileMqttsUrl; + private String mobileQuicUrl; + private String mqttQuicUrl; + private String regionCode; + private String tuyaAppUrl; + private String tuyaImagesUrl; + + public String getAispeechHttpsUrl() { + return aispeechHttpsUrl; + } + + public void setAispeechHttpsUrl(String aispeechHttpsUrl) { + this.aispeechHttpsUrl = aispeechHttpsUrl; + } + + public String getAispeechQuicUrl() { + return aispeechQuicUrl; + } + + public void setAispeechQuicUrl(String aispeechQuicUrl) { + this.aispeechQuicUrl = aispeechQuicUrl; + } + + public boolean isDefaultRegion() { + return defaultRegion; + } + + public void setDefaultRegion(boolean defaultRegion) { + this.defaultRegion = defaultRegion; + } + + public String getFusionUrl() { + return fusionUrl; + } + + public void setFusionUrl(String fusionUrl) { + this.fusionUrl = fusionUrl; + } + + public String getGwApiUrl() { + return gwApiUrl; + } + + public void setGwApiUrl(String gwApiUrl) { + this.gwApiUrl = gwApiUrl; + } + + public String getGwMqttUrl() { + return gwMqttUrl; + } + + public void setGwMqttUrl(String gwMqttUrl) { + this.gwMqttUrl = gwMqttUrl; + } + + public String getMobileApiUrl() { + return mobileApiUrl; + } + + public void setMobileApiUrl(String mobileApiUrl) { + this.mobileApiUrl = mobileApiUrl; + } + + public String getMobileMediaMqttUrl() { + return mobileMediaMqttUrl; + } + + public void setMobileMediaMqttUrl(String mobileMediaMqttUrl) { + this.mobileMediaMqttUrl = mobileMediaMqttUrl; + } + + public String getMobileMqttUrl() { + return mobileMqttUrl; + } + + public void setMobileMqttUrl(String mobileMqttUrl) { + this.mobileMqttUrl = mobileMqttUrl; + } + + public String getMobileMqttsUrl() { + return mobileMqttsUrl; + } + + public void setMobileMqttsUrl(String mobileMqttsUrl) { + this.mobileMqttsUrl = mobileMqttsUrl; + } + + public String getMobileQuicUrl() { + return mobileQuicUrl; + } + + public void setMobileQuicUrl(String mobileQuicUrl) { + this.mobileQuicUrl = mobileQuicUrl; + } + + public String getMqttQuicUrl() { + return mqttQuicUrl; + } + + public void setMqttQuicUrl(String mqttQuicUrl) { + this.mqttQuicUrl = mqttQuicUrl; + } + + public String getRegionCode() { + return regionCode; + } + + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getTuyaAppUrl() { + return tuyaAppUrl; + } + + public void setTuyaAppUrl(String tuyaAppUrl) { + this.tuyaAppUrl = tuyaAppUrl; + } + + public String getTuyaImagesUrl() { + return tuyaImagesUrl; + } + + public void setTuyaImagesUrl(String tuyaImagesUrl) { + this.tuyaImagesUrl = tuyaImagesUrl; + } + } + + public static class ExtrasModel { + private int developer; + + public int getDeveloper() { + return developer; + } + + public void setDeveloper(int developer) { + this.developer = developer; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/DeserializeModel.kt b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt new file mode 100644 index 0000000..2ad11bd --- /dev/null +++ b/app/src/main/java/com/casic/br/utils/DeserializeModel.kt @@ -0,0 +1,19 @@ +package com.casic.br.utils + +import com.casic.br.model.UserModel +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.utils.SaveKeyValues + +object DeserializeModel { + + private val gson by lazy { Gson() } + + fun getUserModel(): UserModel? { + val userJson = SaveKeyValues.getValue(LocaleConstant.USER_MODEL, "") as String + if (userJson == "") { + return null + } + return gson.fromJson(userJson, object : TypeToken() {}.type) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt index dd365ad..d140792 100644 --- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt @@ -54,7 +54,8 @@ * ============================================================================================= * */ const val USER_IS_LOGIN = "isLogin" - const val HOME_DETAIL_MODEL = "homeDetailModel" + const val HOME_ID = "homeId" + const val USER_MODEL = "userModel" const val SERVER_BASE_URL = "http://111.198.10.15:11304" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val ACCOUNT = "account" diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 70ecf10..5d4dff1 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -2,8 +2,11 @@ import android.graphics.Color import android.util.Log +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions import com.casic.br.R import com.casic.br.extensions.compressImage +import com.casic.br.utils.DeserializeModel import com.casic.br.utils.GlideLoadEngine import com.casic.br.utils.LocaleConstant import com.casic.smarttube.callback.OnImageCompressListener @@ -17,6 +20,9 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_edit_user.* +import kotlinx.android.synthetic.main.activity_edit_user.userNameView +import kotlinx.android.synthetic.main.activity_edit_user.userPhoneView +import kotlinx.android.synthetic.main.fragment_mine.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File import java.util.* @@ -38,7 +44,12 @@ } override fun initData() { - + val userModel = DeserializeModel.getUserModel() ?: return + userNameView.text = resources.getString(R.string.app_name) + + userModel.username.subSequence(10, 14) + userPhoneView.text = userModel.mobile +// genderView.text = userModel.mobile +// birthdayView.text = userModel.mobile } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt index 54975e3..c2d36d2 100644 --- a/app/src/main/java/com/casic/br/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt @@ -8,6 +8,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.android.user.api.ILoginCallback @@ -57,6 +58,7 @@ .loginWithPhonePassword("86", userPhone, userPassword, object : ILoginCallback { override fun onSuccess(user: User?) { SaveKeyValues.putValue(LocaleConstant.USER_IS_LOGIN, true) + SaveKeyValues.putValue(LocaleConstant.USER_MODEL, user!!.toJson()) LoadingDialogHub.dismiss() navigatePageTo() PageNavigationManager.finishAllActivity() diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt index 25f4254..cc88165 100644 --- a/app/src/main/java/com/casic/br/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/view/MainActivity.kt @@ -12,7 +12,6 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.home.sdk.bean.HomeBean @@ -48,13 +47,13 @@ * IoT 设备的添加、编辑、移除、状态变化的监听基于家庭下。 * 用户账号下创建任意多个家庭。 * */ - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - if (s == "") { + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + if (homeId == "") { TuyaHomeSdk.getHomeManagerInstance() .createHome("北燃生活体验馆", 116.486394, 39.885734, "西直门内南小街", arrayListOf("1"), object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean?) { - SaveKeyValues.putValue(LocaleConstant.HOME_DETAIL_MODEL, bean!!.toJson()) + SaveKeyValues.putValue(LocaleConstant.HOME_ID, bean?.homeId.toString()) } override fun onError(errorCode: String?, errorMsg: String?) { diff --git a/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt b/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt index 4dc700e..bd5363c 100644 --- a/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt +++ b/app/src/main/java/com/casic/br/view/ResetDeviceActivity.kt @@ -5,11 +5,8 @@ import android.view.View import com.casic.br.R import com.casic.br.extensions.initLayoutImmersionBar -import com.casic.br.model.HomeModel import com.casic.br.utils.LoadingDialogHub import com.casic.br.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo @@ -31,7 +28,6 @@ private val kTag = "ResetDeviceActivity" private val context: Context = this@ResetDeviceActivity - private val gson by lazy { Gson() } private lateinit var params: ArrayList override fun initLayoutView(): Int = R.layout.activity_reset_device @@ -58,36 +54,36 @@ return@setOnClickListener } LoadingDialogHub.show(this, "设备配网中，请稍后") - val s = SaveKeyValues.getValue(LocaleConstant.HOME_DETAIL_MODEL, "") as String - val homeModel = gson.fromJson(s, object : TypeToken() {}.type) - TuyaHomeSdk.getActivatorInstance().getActivatorToken(homeModel.homeId.toLong(), + val homeId = SaveKeyValues.getValue(LocaleConstant.HOME_ID, "") as String + TuyaHomeSdk.getActivatorInstance().getActivatorToken(homeId.toLong(), object : ITuyaActivatorGetToken { override fun onSuccess(token: String) { Log.d(kTag, "token: $token") //调用 配网接口 需要提供路由器的 SSID（即 Wi-Fi 名称）、密码、从云端获取的 Token 等。 - val builder = object : ActivatorBuilder() {} - builder.ssid = params[0] - builder.context = context - builder.password = params[1] - builder.activatorModel = ActivatorModelEnum.TY_EZ - builder.timeOut = 100 - builder.token = token - builder.listener = object : ITuyaSmartActivatorListener { - override fun onError(errorCode: String?, errorMsg: String?) { - Log.i(kTag, "onError: $errorMsg") - LoadingDialogHub.dismiss() - } + val builder = ActivatorBuilder().apply { + this.ssid = params[0] + this.context = context + this.password = params[1] + this.activatorModel = ActivatorModelEnum.TY_EZ + this.timeOut = 100 + this.token = token + this.listener = object : ITuyaSmartActivatorListener { + override fun onError(errorCode: String?, errorMsg: String?) { + Log.i(kTag, "onError: $errorMsg") + LoadingDialogHub.dismiss() + } - override fun onActiveSuccess(devResp: DeviceBean?) { - LoadingDialogHub.dismiss() - Log.d(kTag, devResp!!.toJson()) - navigatePageTo() - } + override fun onActiveSuccess(devResp: DeviceBean?) { + LoadingDialogHub.dismiss() + Log.d(kTag, devResp!!.toJson()) + navigatePageTo() + } - override fun onStep(step: String?, data: Any?) { - Log.i(kTag, "step: $step") - Log.i(kTag, "data: $data") - LoadingDialogHub.dismiss() + override fun onStep(step: String?, data: Any?) { + Log.i(kTag, "step: $step") + Log.i(kTag, "data: $data") + LoadingDialogHub.dismiss() + } } } TuyaHomeSdk.getActivatorInstance().newMultiActivator(builder).start() diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index fefb0ae..d7983db 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -31,8 +31,7 @@ + android:layout_height="75dp" /> @@ -55,7 +53,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="@dimen/dp_3" - android:text="1310000001" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" />