diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 5dff123..0e48703 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -1,6 +1,5 @@ package com.casic.xz.meterage.view -import android.util.Log import android.view.KeyEvent import android.view.MenuItem import androidx.fragment.app.Fragment @@ -20,7 +19,6 @@ import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_main.* @@ -36,11 +34,6 @@ pushConfigViewModel = ViewModelProvider(this)[PushConfigViewModel::class.java] val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String pushConfigViewModel.registerPush(clientId) - pushConfigViewModel.registerResult.observe(this) { - if (it.code == 200) { - Log.d(kTag, "推送注册结果: ${it.toJson()}") - } - } val configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getPrefixCode() diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 5dff123..0e48703 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -1,6 +1,5 @@ package com.casic.xz.meterage.view -import android.util.Log import android.view.KeyEvent import android.view.MenuItem import androidx.fragment.app.Fragment @@ -20,7 +19,6 @@ import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_main.* @@ -36,11 +34,6 @@ pushConfigViewModel = ViewModelProvider(this)[PushConfigViewModel::class.java] val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String pushConfigViewModel.registerPush(clientId) - pushConfigViewModel.registerResult.observe(this) { - if (it.code == 200) { - Log.d(kTag, "推送注册结果: ${it.toJson()}") - } - } val configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getPrefixCode() diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index 181c83c..bc4a173 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -21,28 +21,10 @@ private val gson by lazy { Gson() } - val registerResult = MutableLiveData() val stateResult = MutableLiveData() val changeStateResult = MutableLiveData() - fun registerPush(clientId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.registerPush(clientId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - registerResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) + fun registerPush(clientId: String) = launch({ RetrofitServiceManager.registerPush(clientId) }) fun getPushSwitchState() = launch({ loadState.value = LoadState.Loading