Commit 54bc805d authored by fengruiyu's avatar fengruiyu

修改空指针问题

parent ec9831dd
...@@ -136,20 +136,23 @@ interface MainApi { ...@@ -136,20 +136,23 @@ interface MainApi {
* 精选体验展示图 * 精选体验展示图
*/ */
@POST("na/getChooseExperienceHeadData") @POST("na/getChooseExperienceHeadData")
fun getChooseExperienceHeadData(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<VreperienceBean>>> fun getChooseExperienceHeadData(@Body vo:@JvmSuppressWildcards Map<String,Any>)
:Observable<Response<BaseResponse<VreperienceBean>>>
/** /**
* 精选体验详情 * 精选体验详情
*/ */
@POST("na/getChooseExperienceData") @POST("na/getChooseExperienceData")
fun getChooseExperienceData(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<DetailedBean>>> fun getChooseExperienceData(@Body vo:@JvmSuppressWildcards Map<String,String?>)
:Observable<Response<BaseResponse<DetailedBean>>>
/** /**
* 热门景点 * 热门景点
*/ */
@POST("na/getAttractionsList") @POST("na/getAttractionsList")
fun getHotView(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<HotViewBean>>> fun getHotView(@Body vo:@JvmSuppressWildcards Map<String,Any>)
:Observable<Response<BaseResponse<HotViewBean>>>
/** /**
* 地图是否收费 * 地图是否收费
......
...@@ -53,8 +53,8 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel ...@@ -53,8 +53,8 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
myintent =getIntent(); myintent = intent;
viewModel.getChooseExperienceData(myintent?.getStringExtra("area")!!) viewModel.getChooseExperienceData(myintent?.getStringExtra("area"))
} }
override fun initViewObservable() { override fun initViewObservable() {
......
...@@ -17,8 +17,8 @@ class DetailedViewModel(application: Application) : BaseViewModel(application) { ...@@ -17,8 +17,8 @@ class DetailedViewModel(application: Application) : BaseViewModel(application) {
val detailbean: MutableLiveData<DetailedBean> = MutableLiveData() val detailbean: MutableLiveData<DetailedBean> = MutableLiveData()
fun getChooseExperienceData(name:String){ fun getChooseExperienceData(name:String?){
val vo = HashMap<String, Any>() val vo = HashMap<String, String?>()
vo["area"] = name vo["area"] = name
ApiModel.getChooseExperienceData(lifecycleProvider,vo).safeSubscribe( ApiModel.getChooseExperienceData(lifecycleProvider,vo).safeSubscribe(
object : HttpSubscribeImpl<BaseResponse<DetailedBean>>( object : HttpSubscribeImpl<BaseResponse<DetailedBean>>(
......
...@@ -109,7 +109,7 @@ object ApiModel { ...@@ -109,7 +109,7 @@ object ApiModel {
/** /**
* 精选体验详情 * 精选体验详情
*/ */
fun getChooseExperienceData(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, Any>):Observable<Response<BaseResponse<DetailedBean>>>{ fun getChooseExperienceData(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, String?>):Observable<Response<BaseResponse<DetailedBean>>>{
return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().getChooseExperienceData(map)) return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().getChooseExperienceData(map))
} }
/** /**
......
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