Commit 59b07fb3 by 范玉宾

remove viewmodel for minetip

parent 8c6c00ec
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.50.44", "m-confide" : "0.0.50.44",
"m-consultant" : "0.0.60.68", "m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.69", "m-user" : "0.0.62.71",
"m-home" : "0.0.23.95", "m-home" : "0.0.23.95",
"m-im" : "0.0.21.64", "m-im" : "0.0.21.64",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
...@@ -94,7 +94,7 @@ ext { ...@@ -94,7 +94,7 @@ ext {
"m-confide" : "0.0.50.44", "m-confide" : "0.0.50.44",
"m-consultant" : "0.0.60.68", "m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.69", "m-user" : "0.0.62.71",
"m-home" : "0.0.23.95", "m-home" : "0.0.23.95",
"m-im" : "0.0.21.64", "m-im" : "0.0.21.64",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
......
package com.yidianling.user
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
class MineTipViewModel : ViewModel() {
var show = MutableLiveData<Boolean>()
}
\ No newline at end of file
...@@ -7,7 +7,6 @@ import android.os.Bundle ...@@ -7,7 +7,6 @@ import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.activityViewModels
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.ydl.course.api.ICourseService import com.ydl.course.api.ICourseService
import com.ydl.webview.H5Params import com.ydl.webview.H5Params
...@@ -35,7 +34,6 @@ import com.yidianling.dynamic.api.IDynamicService ...@@ -35,7 +34,6 @@ import com.yidianling.dynamic.api.IDynamicService
import com.yidianling.im.api.service.IImService import com.yidianling.im.api.service.IImService
import com.yidianling.im.message.param.MsgListParam import com.yidianling.im.message.param.MsgListParam
import com.yidianling.user.BuildConfig import com.yidianling.user.BuildConfig
import com.yidianling.user.MineTipViewModel
import com.yidianling.user.R import com.yidianling.user.R
import com.yidianling.user.UserHelper.getUserInfo import com.yidianling.user.UserHelper.getUserInfo
import com.yidianling.user.UserHelper.getUsetSetting import com.yidianling.user.UserHelper.getUsetSetting
...@@ -204,8 +202,6 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -204,8 +202,6 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
refreshCouponData() refreshCouponData()
} }
private val model:MineTipViewModel = MineTipViewModel()
private fun getConfideOrder(uid: String) { private fun getConfideOrder(uid: String) {
MineHttpImpl.getInstance().getHasConfideOrder(uid) MineHttpImpl.getInstance().getHasConfideOrder(uid)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -216,47 +212,30 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -216,47 +212,30 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
if (response.data.listenOrder == true) { if (response.data.listenOrder == true) {
iv_confide_tip.visibility = View.VISIBLE iv_confide_tip.visibility = View.VISIBLE
getLocal().setConfide(true) getLocal().setConfide(true)
model.show.postValue(true)
} else { } else {
iv_confide_tip.visibility = View.GONE iv_confide_tip.visibility = View.GONE
getLocal().setConfide(false) getLocal().setConfide(false)
model.show.postValue(false)
} }
if (response.data.consultOrder == true) { if (response.data.consultOrder == true) {
iv_order_tip.visibility = View.VISIBLE iv_order_tip.visibility = View.VISIBLE
getLocal().setConsult(true) getLocal().setConsult(true)
model.show.postValue(true)
} else { } else {
iv_order_tip.visibility = View.GONE iv_order_tip.visibility = View.GONE
getLocal().setConsult(false) getLocal().setConsult(false)
model.show.postValue(false)
} }
}else{ }else{
getLocal().setConfide(false) getLocal().setConfide(false)
getLocal().setConsult(false) getLocal().setConsult(false)
model.show.postValue(false)
} }
}else{ }else{
getLocal().setConfide(false) getLocal().setConfide(false)
getLocal().setConsult(false) getLocal().setConsult(false)
model.show.postValue(false)
} }
},{ },{
getLocal().setConfide(false) getLocal().setConfide(false)
getLocal().setConsult(false) getLocal().setConsult(false)
model.show.postValue(false)
}) })
} }
...@@ -270,8 +249,6 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -270,8 +249,6 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
getLocal().setConfide(false) getLocal().setConfide(false)
getLocal().setConsult(false) getLocal().setConsult(false)
model.show.postValue(false)
val userInfo = getUserInfo() ?: return val userInfo = getUserInfo() ?: return
if (userInfo.uid != null) { if (userInfo.uid != null) {
...@@ -288,19 +265,15 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -288,19 +265,15 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
if (response.data?.count ?: 0 > 0) { if (response.data?.count ?: 0 > 0) {
view_new_coupon.visibility = View.VISIBLE view_new_coupon.visibility = View.VISIBLE
getLocal().setCoupon(true) getLocal().setCoupon(true)
model.show.postValue(true)
} else { } else {
view_new_coupon.visibility = View.GONE view_new_coupon.visibility = View.GONE
getLocal().setCoupon(false) getLocal().setCoupon(false)
model.show.postValue(false)
} }
}else{ }else{
getLocal().setCoupon(false) getLocal().setCoupon(false)
model.show.postValue(false)
} }
}) { throwable: Throwable? -> }) { throwable: Throwable? ->
getLocal().setCoupon(false) getLocal().setCoupon(false)
model.show.postValue(false)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment