From 0be21e4bf04553d23e6829d33515c77dfb1ea649 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Mon, 20 Feb 2023 17:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0areacode=E5=8F=82=E6=95=B0=E3=80=81=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E9=80=89=E9=A1=B9?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- .../com/tengshisoft/BaseMyApplication.java | 8 +++ .../core/retrofit_net/BaseUrlApi.java | 21 +++---- .../retrofit_net/conver/AreaInterceptor.java | 22 ++++---- .../widget/views/BottomCancelOrderDialog.java | 21 +++++-- .../modulecultural/net/CulturalApi.java | 6 +- .../cultural/activitys/base/MainActivity.java | 2 +- .../activitys/base/SplashActivity.java | 4 +- .../mudulemain/cultural/net/HomeApi.java | 55 ++++++++++++------- .../tengshisoft/moduleplace/net/ApiPlace.java | 12 ++-- 10 files changed, 95 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 91d974a..a9bb743 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,9 +50,10 @@ android { } productFlavors { sangzhuzi { - applicationId "com.tenlion.cultural" + applicationId "com.tengshisoft.cultural" dimension 'market' - resValue "string", "APP_CHANNEL", "cultural" + resValue("string", "CITY_CODE", "540200000000") + resValue("string", "CITY_ID", "640675") manifestPlaceholders = [CHANNEL_VALUE: "cultural", APP_LOGO : "@drawable/app_logo", CITY_ID : "640675", diff --git a/app/src/main/java/com/tengshisoft/BaseMyApplication.java b/app/src/main/java/com/tengshisoft/BaseMyApplication.java index 23fdc53..4b61c7d 100755 --- a/app/src/main/java/com/tengshisoft/BaseMyApplication.java +++ b/app/src/main/java/com/tengshisoft/BaseMyApplication.java @@ -12,7 +12,9 @@ import com.baidu.mapapi.SDKInitializer; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.footer.ClassicsFooter; import com.sucstepsoft.cm_utils.core.widget.refresh.CustomRefreshHeader; +import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.cm_utils.utils.toast.ToastUtils; +import com.tengshisoft.cultural.R; import cn.jiguang.share.android.api.JShareInterface; import cn.leo.magic.screen.MagicScreenAdapter; @@ -46,6 +48,12 @@ public class BaseMyApplication extends Application { ToastUtils.init(this); ToastUtils.setGravity(Gravity.TOP, 0, 80); + getConfigCityCode(); + } + + private void getConfigCityCode() { + UserLgUtils.setCityCode(this.getResources().getString(R.string.CITY_CODE)); + UserLgUtils.setCityId(this.getResources().getString(R.string.CITY_ID)); } private void initShare() { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 70dee44..4886624 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -9,20 +9,15 @@ import com.sucstepsoft.cm_utils.constant.PathConfig; */ public class BaseUrlApi { - // public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */ + // public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 第一版正式IP */ // public static final String IP = "https://www.wgink.ink/usercenter/";/* 正式IP */ -// public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 正式IP */ - // public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/"; -// public static final String BASE_SYSTEM_IP = "http://121.36.71.250:58050/xzszwhy/"; -// public static final String IP = "http://49.233.36.36:58099/xzszwhy/";/* 测试IP */ -// public static final String IP = "http://v3.xzszwhy.cn/xzszwhy/";/* 测试IP */ - public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */ - // public static final String IP = "https://www.wgink.ink/usercenter/";/* 正式IP */ - public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 正式IP */ - // public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/"; - public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/"; - // public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/"; - // public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */ + + public static final String IP_URL = "http://192.168.0.120.:8081/";/* 测试IP */ +// public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 正式IP */ + + // public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/"; + public static final String BASE_SYSTEM_IP = "http://192.168.0.120.:8081/xzszwhy/";/*测试IP*/ + public static final String PROJECT_NAME = "app/"; public static final String BASE_URL = BASE_SYSTEM_IP; public static final int PHOTO_REQUEST = 233; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java index e5eb936..723542d 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java @@ -1,7 +1,6 @@ package com.sucstepsoft.cm_utils.core.retrofit_net.conver; import com.sucstepsoft.cm_utils.constant.PathConfig; -import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils; import com.sucstepsoft.cm_utils.utils.UserLgUtils; @@ -30,21 +29,20 @@ public class AreaInterceptor implements Interceptor { if (cityLevel == -1) { cityLevel = PathConfig.CITY_DEFAULT_LEVEL; } - String name = "area" + cityLevel; String areaCode = UserLgUtils.getCityCode(); -// if (TextUtils.isEmpty(areaId)) { -// areaId = PathConfig.CITY_DEFAULT_CODE; -// } -// String cityId = UserLgUtils.getCityId(); //判断是否需要添加 List baseUrlName = originalRequest.headers("is_need_area"); - LogUtils.e(baseUrlName); - if (baseUrlName.size() <= 0) { + if (baseUrlName.size() > 0) { //需要添加 - HttpUrl modifiedUrl = originalRequest.url().newBuilder() - .addPathSegment(areaCode) - .build(); - request = originalRequest.newBuilder().url(modifiedUrl).build(); + //判断值是什么 + if (Boolean.parseBoolean(baseUrlName.get(0))) { + HttpUrl modifiedUrl = originalRequest.url().newBuilder() + .addPathSegment(areaCode) + .build(); + request = originalRequest.newBuilder().url(modifiedUrl).build(); + } else { + request = originalRequest; + } } else { request = originalRequest; } diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BottomCancelOrderDialog.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BottomCancelOrderDialog.java index a6a99b4..e44b77c 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BottomCancelOrderDialog.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BottomCancelOrderDialog.java @@ -56,7 +56,8 @@ public class BottomCancelOrderDialog extends Dialog { private View view; private List list; - private BottomCancelOrderDialog(Context context, boolean isCancelable, boolean isBackCancelable, int gravity, List list) { + private BottomCancelOrderDialog(Context context, boolean isCancelable, boolean isBackCancelable, int gravity, + List list) { super(context, R.style.dialog_full_screen); this.context = context; this.gravity = gravity; @@ -76,8 +77,18 @@ public class BottomCancelOrderDialog extends Dialog { rlvReason.setLayoutManager(new LinearLayoutManager(context)); DicSelAdapter adapter = new DicSelAdapter(context, list); rlvReason.setAdapter(adapter); + if (list != null && list.size() > 0) { + list.get(0).setCheck(true); + } + adapter.addOnItemClickListener(baseDictionaryBean -> { - baseDictionaryBean.setCheck(!baseDictionaryBean.isCheck()); + for (BaseDictionaryBean b : list) { + if (b.getDataId().equals(baseDictionaryBean.getDataId())) { + b.setCheck(true); + } else { + b.setCheck(false); + } + } adapter.setData(list); }); tvCancel.setOnClickListener(v -> this.dismiss()); @@ -141,7 +152,8 @@ public class BottomCancelOrderDialog extends Dialog { //请求获得焦点 editText.requestFocus(); //调用系统输入法 - InputMethodManager inputManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); + InputMethodManager inputManager = + (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); inputManager.showSoftInput(editText, 0); } } @@ -232,7 +244,8 @@ public class BottomCancelOrderDialog extends Dialog { } public BottomCancelOrderDialog build() { - return new BottomCancelOrderDialog(this.mContext, this.isCancelable, this.mIsBackable, this.mGravity, this.list); + return new BottomCancelOrderDialog(this.mContext, this.isCancelable, this.mIsBackable, this.mGravity, + this.list); } } diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java index f59ccd3..1e2754c 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java @@ -46,14 +46,14 @@ public interface CulturalApi { /** * 获取非遗列表 */ - @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json","is_need_area:true"}) @GET("app/intangiblelibrary/listpageintangiblelibraryrelease") Observable getLegacyList(@Query("page") String page); /** * 获取非遗列表 */ - @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json","is_need_area:true"}) @GET("app/intangiblelibrary/listpageintangiblelibraryrelease") Observable getLegacyListByType(@Query("page") String page, @Query("rows") String rows, @Query("libraryDirectoriesId") String id); @@ -62,7 +62,7 @@ public interface CulturalApi { * GET /app/intangibledirectories/listztreeintangibledirectoriesrelease * GET /app/intangiblelibrary/listpageintangiblelibraryrelease */ - @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json","is_need_area:true"}) @GET("app/intangibledirectories/listztreeintangibledirectoriesrelease") Observable> getLegacyTypeList(@Query("id") String id); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java index addeadf..8ca5ceb 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java @@ -83,7 +83,7 @@ public class MainActivity extends BaseActivity { mRlTitleBar1.setVisibility(View.VISIBLE); mFragments = new ArrayList<>(); Fragment homefragment = FragmentUtils.getHomeFragment(); - Fragment shopFragment = FragmentUtils.getShopFragment(); + Fragment shopFragment = FragmentUtils.getActivityFragment(); Fragment placeFragment = FragmentUtils.getPlaceFragment(); Fragment culturalFragment = FragmentUtils.getCulturalFragment(); Fragment mineMainFragment = FragmentUtils.getMineFragment(); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java index e18c3b4..8542b52 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java @@ -9,6 +9,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PermissionConstants; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.PermissionUtils; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.cm_utils.utils.toast.ToastUtils; @@ -39,7 +40,7 @@ public class SplashActivity extends BaseActivity { refreshView(STATE_LOAD_SUCCESS); ImmersionBar.with(this).init(); mRlTitleBar1.setVisibility(View.GONE); - getCityCode(); +// getCityCode(); PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION, PermissionConstants.PHONE) .callback(new PermissionUtils.SimpleCallback() { @Override @@ -95,6 +96,7 @@ public class SplashActivity extends BaseActivity { ApplicationInfo info = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); cityCode = String.valueOf(info.metaData.get("CITY_CODE")); + LogUtils.e(cityCode); cityId = String.valueOf(info.metaData.get("CITY_ID")); UserLgUtils.setCityCode(cityCode); UserLgUtils.setCityId(cityId); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java index 9537666..fdd6976 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java @@ -56,7 +56,7 @@ public interface HomeApi { * @param user * @return */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) + @Headers({"Content-Type: application/json", "Accept: application/json", "is_need_area:false"}) @POST("app/sign/default") Observable doLogin(@Body RequestBody user); @@ -80,7 +80,7 @@ public interface HomeApi { /** * 获取非遗列表 */ - @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/intangiblelibrary/listpageintangiblelibraryrelease") Observable getLegacyList(@Query("page") String page, @Query("rows") String row); @@ -90,7 +90,8 @@ public interface HomeApi { * @param page * @return */ - @Headers({"base_url_name:activity", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:activity", "Content-Type:application/json", "Accept:application/json", "is_need_area" + + ":true"}) @GET("app/activitylibrary/listpageactivitylibraryrelease") Observable getMainActivityList(@Query("page") String page, @Query("rows") String rows); @@ -99,7 +100,7 @@ public interface HomeApi { * * @return */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newsdirectories/listnewsdirectoriesrelease") Observable> getNewsTabList(); @@ -108,7 +109,7 @@ public interface HomeApi { * * @return */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newsdirectories/listnewsdirectoriesrelease") Observable> getNewsTabListByPid(@Query("directoriesParentId") String pid); @@ -117,16 +118,18 @@ public interface HomeApi { * * @return */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getNewsTabListByPid(@Query("newsDirectoriesParentId") String pid, @Query("rows") String rows, @Query("page") String page); + Observable getNewsTabListByPid(@Query("newsDirectoriesParentId") String pid, + @Query("rows") String rows, @Query("page") String page); /** * 获取新闻列表-不需要token */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("page") String page); + Observable getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, + @Query("page") String page); /** * 获取新闻评论数量,多个新闻ID用下划线隔开(id_id_id) @@ -138,23 +141,26 @@ public interface HomeApi { /** * 获取新闻列表-不需要token */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("rows") String rows, @Query("page") String page); + Observable getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, + @Query("rows") String rows, @Query("page") String page); /** * 获取新闻列表-需要token */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newscontent/listpagenewscontent") - Observable getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("page") String page, @Header("token") String token); + Observable getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, + @Query("page") String page, @Header("token") String token); /** * 获取新闻列表-需要token */ - @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/newscontent/listpagenewscontent") - Observable getNewsMainListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("rows") String rows, @Query("page") String page, @Header("token") String token); + Observable getNewsMainListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, @Query( + "rows") String rows, @Query("page") String page, @Header("token") String token); /** * 获取评论列表 @@ -169,7 +175,8 @@ public interface HomeApi { */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) @GET("app/newscomment/listpagenewscomment") - Observable getCommentListByLogin(@Query("page") String page, @Query("newsContentId") String nId, @Header("token") String token); + Observable getCommentListByLogin(@Query("page") String page, @Query("newsContentId") String nId, + @Header("token") String token); /** @@ -177,7 +184,8 @@ public interface HomeApi { */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) @GET("app/newscomment/listpagenewscommentrelease") - Observable getCommentListByPId(@Query("page") String page, @Query("commentParentId") String pId, @Query("newsContentId") String nId); + Observable getCommentListByPId(@Query("page") String page, @Query("commentParentId") String pId, + @Query("newsContentId") String nId); /** * 获取评论列表 @@ -185,7 +193,10 @@ public interface HomeApi { */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"}) @GET("app/newscomment/listpagenewscomment") - Observable getCommentListByLoginByPid(@Query("page") String page, @Query("newsContentId") String nId, @Query("commentParentId") String pId, @Header("token") String token); + Observable getCommentListByLoginByPid(@Query("page") String page, + @Query("newsContentId") String nId, @Query( + "commentParentId") String pId, + @Header("token") String token); /** * 保存评论 @@ -237,13 +248,14 @@ public interface HomeApi { */ @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"}) @GET("app/venuesinfo/listpagevenuesinforelease") - Observable getPlaceByOrder(@Query("latitude") String lat, @Query("longitude") String lng, @Query("orderKey") String order, @Query("page") String page, @Query("rows") String rows); + Observable getPlaceByOrder(@Query("latitude") String lat, @Query("longitude") String lng, @Query( + "orderKey") String order, @Query("page") String page, @Query("rows") String rows); /** * 直播回放列表 * http://192.168.0.104:8084/live/ */ - @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json","is_need_area:false"}) + @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json", "is_need_area:false"}) @GET("app/liveplan/listpageliveplanrelease") Observable getLiveRecord(@Query("page") String page, @Query("rows") String rows); @@ -265,5 +277,6 @@ public interface HomeApi { */ @Headers({"Content-Type:application/json", "Accept:application/json"}) @GET("app/area/listpagearea") - Observable doSearchByKeyword(@Query("page") int page, @Query("keywords") String key, @Header("token") String token); + Observable doSearchByKeyword(@Query("page") int page, @Query("keywords") String key, + @Header("token") String token); } diff --git a/moduleplace/src/main/java/com/tengshisoft/moduleplace/net/ApiPlace.java b/moduleplace/src/main/java/com/tengshisoft/moduleplace/net/ApiPlace.java index cdabe31..8fa7ff1 100755 --- a/moduleplace/src/main/java/com/tengshisoft/moduleplace/net/ApiPlace.java +++ b/moduleplace/src/main/java/com/tengshisoft/moduleplace/net/ApiPlace.java @@ -37,7 +37,8 @@ public interface ApiPlace { */ @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"}) @GET("app/venuesinfo/listpagevenuesinforelease") - Observable getPlaceByOrder(@Query("latitude") String lat, @Query("longitude") String lng, @Query("orderKey") String order, @Query("page") String page, @Query("rows") String rows); + Observable getPlaceByOrder(@Query("latitude") String lat, @Query("longitude") String lng, @Query( + "orderKey") String order, @Query("page") String page, @Query("rows") String rows); /** * 获取场馆列表-根据类型 @@ -46,14 +47,16 @@ public interface ApiPlace { */ @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"}) @GET("app/venuesinfo/listpagevenuesinforelease") - Observable getPlaceByDictionId(@Query("latitude") String lat, @Query("longitude") String lng, @Query("venueType") String dId, @Query("page") String page, @Query("rows") String rows); + Observable getPlaceByDictionId(@Query("latitude") String lat, @Query("longitude") String lng, + @Query("venueType") String dId, @Query("page") String page, @Query( + "rows") String rows); /** * 获取场馆类型-全部 * * @return */ - @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json", "is_need_area:true"}) @GET("app/venuedictionary/listvenuedictionarybyparentidrelease/{dictionaryParentId}") Observable getPlaceTypeList(@Path("dictionaryParentId") String pId); @@ -138,7 +141,8 @@ public interface ApiPlace { */ @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"}) @DELETE("app/booking/removemyticketitem/{groundBookingId}/{bookingItemId}") - Observable deleteBookingItem(@Path("groundBookingId") String gId, @Path("bookingItemId") String id, @Header("token") String token); + Observable deleteBookingItem(@Path("groundBookingId") String gId, + @Path("bookingItemId") String id, @Header("token") String token); /** * 取消订单