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 a2fb29a..0c977fd 100644 --- a/app/src/main/java/com/casic/br/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/view/MainActivity.kt @@ -3,13 +3,18 @@ import android.view.KeyEvent import android.view.MenuItem import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import androidx.viewpager.widget.ViewPager import com.casic.br.R import com.casic.br.adapter.ViewPagerAdapter import com.casic.br.fragment.* +import com.casic.br.utils.DeserializeModel +import com.casic.br.utils.LocaleConstant +import com.casic.br.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -33,7 +38,12 @@ } override fun initData() { - + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + //每次都更新PUSH_ID,防止收不到消息 + val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_CLIENT_ID, "") as String + val currentUser = DeserializeModel.getUserModel() ?: return + currentUser.attr1 = clientId + userViewModel.updateUserInfo(currentUser) } override fun observeRequestState() { 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 a2fb29a..0c977fd 100644 --- a/app/src/main/java/com/casic/br/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/view/MainActivity.kt @@ -3,13 +3,18 @@ import android.view.KeyEvent import android.view.MenuItem import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import androidx.viewpager.widget.ViewPager import com.casic.br.R import com.casic.br.adapter.ViewPagerAdapter import com.casic.br.fragment.* +import com.casic.br.utils.DeserializeModel +import com.casic.br.utils.LocaleConstant +import com.casic.br.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -33,7 +38,12 @@ } override fun initData() { - + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + //每次都更新PUSH_ID,防止收不到消息 + val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_CLIENT_ID, "") as String + val currentUser = DeserializeModel.getUserModel() ?: return + currentUser.attr1 = clientId + userViewModel.updateUserInfo(currentUser) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/br/view/RegisterActivity.kt b/app/src/main/java/com/casic/br/view/RegisterActivity.kt index 38ee1f7..f7dc307 100644 --- a/app/src/main/java/com/casic/br/view/RegisterActivity.kt +++ b/app/src/main/java/com/casic/br/view/RegisterActivity.kt @@ -121,7 +121,6 @@ "${userPhone}的家", aMapLocation.longitude, aMapLocation.latitude, aMapLocation.address, arrayListOf("1"), object : ITuyaHomeResultCallback { override fun onSuccess(bean: HomeBean?) { - registerWithTuya( userPhone, userPassword,