Commit d456924d authored by fengruiyu's avatar fengruiyu

1.1.0.0的版本可以测试

parent c7934779
...@@ -109,8 +109,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE ...@@ -109,8 +109,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
SearchMapActivity.startSearchMapActivity(this) SearchMapActivity.startSearchMapActivity(this)
} }
RxUtils.onMultiClick(binding.ivClick){ RxUtils.onMultiClick(binding.ivClick){
if (userManager.getVipFlag()) {//是会员 if (userManager.userIsLogin() &&userManager.getVipFlag()) {//是会员
MintsWebViewActivity.startWebView("") viewModel.authorized("",currentLat.toString(), currentLon.toString())
}else{ }else{
startActivity(OpenvipActivity::class.java) startActivity(OpenvipActivity::class.java)
} }
......
...@@ -25,6 +25,8 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel ...@@ -25,6 +25,8 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
private var vLayout: VirtualLayoutManager? = null private var vLayout: VirtualLayoutManager? = null
private var mAdapter: DelegateAdapter? = null private var mAdapter: DelegateAdapter? = null
private var gridMapAdapter: GridMapAdapter? = null private var gridMapAdapter: GridMapAdapter? = null
//private var enterDestinationAdapter: EnterDestinationAdapter? = null
override fun initContentView( override fun initContentView(
inflater: LayoutInflater?, inflater: LayoutInflater?,
container: ViewGroup?, container: ViewGroup?,
...@@ -58,10 +60,10 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel ...@@ -58,10 +60,10 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
viewModel.VrmapBean.observe(this, Observer<VrmapBean> { viewModel.VrmapBean.observe(this, Observer<VrmapBean> {
binding.srlMy.finishRefresh(true) binding.srlMy.finishRefresh(true)
/*if(enterDestinationAdapter == null){ // if(enterDestinationAdapter == null){
enterDestinationAdapter = EnterDestinationAdapter(context!!,it.abroad ) // enterDestinationAdapter = EnterDestinationAdapter(context!!,it.abroad )
mAdapter?.addAdapter(enterDestinationAdapter) // mAdapter?.addAdapter(enterDestinationAdapter)
}*/ // }
if (gridMapAdapter == null){ if (gridMapAdapter == null){
gridMapAdapter = GridMapAdapter(context!!, it.internal) gridMapAdapter = GridMapAdapter(context!!, it.internal)
mAdapter?.addAdapter(gridMapAdapter) mAdapter?.addAdapter(gridMapAdapter)
......
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