From 5618891fd1430d40073ab07070d13f795f6fd2b3 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 10 Mar 2023 14:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cm_utils/constant/PathConfig.java | 3 +- .../core/retrofit_net/BaseUrlApi.java | 10 +- .../core/retrofit_net/api/BaseApiService.java | 2 - .../retrofit_net/conver/AreaInterceptor.java | 14 +- .../conver/BaseUrlInterceptor.java | 2 +- .../core/widget/base/BaseActivity.java | 42 ++- .../widget/views/BottomCancelOrderDialog.java | 4 + .../ExpandableTextView.java | 15 +- .../cm_utils/utils/UserLgUtils.java | 76 +++-- .../main/res/drawable/shape_tab_bg_no_ra.xml | 27 ++ .../src/main/res/layout/base_activity.xml | 4 +- .../main/res/layout/item_banner_text_all.xml | 0 .../src/main/res/layout/layout_search.xml | 2 +- cm_utils/src/main/res/values/strings.xml | 1 + .../activity/ActivityDetailActivity.java | 3 + .../activitys/CulturalLiveDetailActivity.java | 3 + .../CulturalLiveLookBackActivity.java | 12 +- .../activitys/LegacyDetailActivity.java | 3 + .../VolunteerActivityDetailActivity.java | 4 + .../fragments/CulturalMainFragment.java | 6 +- .../modulecultural/net/CulturalApi.java | 6 +- .../activity_register_volunteer_single.xml | 259 +++++++++------ .../activity_register_volunteer_team.xml | 41 ++- .../res/layout/activity_vounteer_publish.xml | 147 ++++++++- modulecultural/src/main/res/values/styles.xml | 29 +- .../controller/AudioControlView.java | 284 ++++++++++++++++ .../controller/AudioPrepareView.java | 136 ++++++++ .../dkplayer_layout_audio_control_view.xml | 69 ++++ .../activitys/news/NewsDetailActivity.java | 4 + .../activitys/news/NewsListActivity.java | 7 +- .../news/NewsLocalDetailActivity.java | 304 ++++++++++++++++-- .../activitys/news/NewsMainActivity.java | 8 +- .../activitys/news/NewsSearchActivity.java | 81 ++--- .../cultural/adapter/NewsAdapter.java | 11 +- .../cultural/adapter/NewsCategoryAdapter.java | 51 +++ .../cultural/adapter/NewsTabAdapter.java | 0 .../cultural/beans/NewsDetailBean.java | 9 + .../cultural/fragment/NewsFragment.java | 97 +++--- .../cultural/holder/NewsCategoryHolder.java | 24 ++ .../cultural/holder/NewsTabHolder.java | 7 +- .../mudulemain/cultural/net/HomeApi.java | 46 ++- .../res/layout/activity_news_local_detail.xml | 11 + .../main/res/layout/item_news_category.xml | 13 + .../modulemine/activity/CollectActivity.java | 2 +- .../layout/activity_new_mine_info_edit.xml | 1 - .../layout/activity_new_mine_infor_detail.xml | 2 +- .../src/main/res/layout/activity_setting.xml | 56 ++-- .../activitys/PlaceDetailActivity.java | 4 + .../moduleplace/adapter/PlaceFuncAdapter.java | 2 + .../moduleplace/adapter/PlaceListAdapter.java | 2 + .../tengshisoft/moduleplace/net/ApiPlace.java | 10 +- .../main/res/layout/fragment_place_main.xml | 18 +- .../activitys/GoodsDetailActivity.java | 24 +- .../activitys/OrderConfirmActivity.java | 2 +- .../activitys/OrderListActivity.java | 2 +- .../tenlionsoft/moduleshop/net/ShopApi.java | 32 +- 56 files changed, 1602 insertions(+), 432 deletions(-) create mode 100755 cm_utils/src/main/res/drawable/shape_tab_bg_no_ra.xml mode change 100644 => 100755 cm_utils/src/main/res/layout/item_banner_text_all.xml create mode 100755 moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioControlView.java create mode 100755 moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioPrepareView.java create mode 100755 moduleijkplayer/src/main/res/layout/dkplayer_layout_audio_control_view.xml create mode 100755 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsCategoryAdapter.java mode change 100644 => 100755 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsTabAdapter.java create mode 100755 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsCategoryHolder.java mode change 100644 => 100755 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsTabHolder.java create mode 100644 modulemain/src/main/res/layout/item_news_category.xml diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index eb3aebf..ccf7c20 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java @@ -96,7 +96,6 @@ public class PathConfig { public static final String PATH_MODULE_MAIN_PLAN = "/modulemain/activity/planMap"; public static final String PATH_MODULE_MAIN_LOGIN = "/modulemain/activity/login";//登录 public static final String PATH_MODULE_MAIN_NEWS_DETAIL = "/modulemain/activity/news/detail";//详情页面 - public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式 public static final String PATH_MODULE_MAIN_FRAGMENT_MAIN = "/modulemain/fragment/main";//首页fragment public static final String PATH_MODULE_MAIN_NEWS_LIST = "/modulemain/activity/newslist"; @@ -111,6 +110,7 @@ public class PathConfig { public static final String PATH_MODULE_MAIN_CHOOSE_CITY = "/modulemain/activity/choosecity";//选择城市 public static final String PATH_MODULE_MAIN_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页 + public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式 public static final String PATH_MODULE_MAIN_NEWS_SEARCH = "/modulemain/activity/newsSearch";//新闻收搜 //======================Map================================================== public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图 @@ -276,5 +276,4 @@ public class PathConfig { public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单 public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地 - } 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 61b26d5..c21b4ef 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 @@ -12,7 +12,7 @@ public class BaseUrlApi { public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */ // public static final String IP_URL = "http://192.168.0.120:8081/";/* 测试IP */ -// public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/ + // public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/ public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/";/*正式IP*/ public static final String PROJECT_NAME = "app/"; @@ -53,13 +53,14 @@ public class BaseUrlApi { public static final String BASE_ACTIVIY_IP = BASE_SYSTEM_IP;/* 活动URL */ public static final String BASE_PLACE_IP = BASE_SYSTEM_IP;/* 场馆 */ public static final String BASE_VOLUNTEER_IP = BASE_SYSTEM_IP;/* 志愿者 */ - public static final String BASE_LIVE_IP = BASE_SYSTEM_IP + "live/"; + public static final String BASE_LIVE_IP = IP_URL + "live/"; + + public static final String BASE_BIG_DATA = IP_URL + "module/";//大数据接口 public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url public static final String BASE_CULTURAL_SHARE = BASE_SYSTEM_IP;/* 文化分享 */ public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP;//非遗数据库 public static final String BASE_NEWS_IP = BASE_SYSTEM_IP;//新闻 - public static final String BASE_SHOP_IP = IP_URL + "xzshop";//商城 - public static final String BASE_BIG_DATA = IP_URL + "module/";//大数据接口 + public static final String BASE_SHOP_IP = IP_URL + "xzshop/";//商城 // public static final String BASE_PLACE_IP = TEMP_IP + "venuebooking/";/* 场馆 */ public static final String BASE_PLACE_IMG_IP = BASE_PLACE_IP + "route/file/download/true/";/* 场馆 */ public static final String BASE_CULTURAL_IP = BASE_SYSTEM_IP + "culturalactivity/";/* 文化URL */ @@ -69,6 +70,7 @@ public class BaseUrlApi { public static final String BASE_NEWS_DETAIL = IP_URL;//新闻 + // public static final String BASE_NEWS_DETAIL = "http://192.168.0.120:80/";//新闻 // public static final String BASE_IMG_URL = BASE_IP + "route/file/download/true/"; // GET /app/appversion/downloadapp/{appVersionId} public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java index a23f714..d1d7f6a 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java @@ -314,7 +314,6 @@ public interface BaseApiService { @GET("app/area/getrelease/{areaId}") Observable getAreaDetail(@Path("areaId") String pId); - /** * 大数据-浏览量 * 详情浏览量 (网页|安卓|小程序)[a-zA-Z0-9-]{36}(新闻|活动|非遗|场馆|直播|志愿) 我后台正则是这样的 @@ -325,5 +324,4 @@ public interface BaseApiService { @Headers({"base_url_name:bigdata", "Content-Type:application/json", "Accept:application/json"}) @GET("app/contentcensusrelease/log") Observable bigDataRead(@Query("requestUrl") String id); - } 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 bc3f793..2f6d7ea 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,6 +1,5 @@ package com.sucstepsoft.cm_utils.core.retrofit_net.conver; -import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.utils.UserInfoSPUtils; import com.sucstepsoft.cm_utils.utils.UserLgUtils; @@ -25,26 +24,17 @@ public class AreaInterceptor implements Interceptor { public okhttp3.Response intercept(Chain chain) throws IOException { Request originalRequest = chain.request(); Request request; - int cityLevel = UserLgUtils.getCityLevel(); - 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("need_area"); if (baseUrlName.size() > 0) { - if(Boolean.parseBoolean(baseUrlName.get(0))){ + if (Boolean.parseBoolean(baseUrlName.get(0))) { //需要添加 HttpUrl modifiedUrl = originalRequest.url().newBuilder() .addPathSegment(areaCode) .build(); request = originalRequest.newBuilder().url(modifiedUrl).build(); - }else{ + } else { request = originalRequest; } } else { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java index 7bb0b40..c87843b 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java @@ -46,7 +46,7 @@ public class BaseUrlInterceptor implements Interceptor { newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_CULTURAL_SHARE); } else if ("shop".equals(headerValue)) { newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_SHOP_IP); - } else if ("bigdata".equals(headerValue)) { + }else if("bigdata".equals(headerValue)){ newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_BIG_DATA); } else { newBaseUrl = oldHttpUrl; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java index 013c3db..2b46895 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java @@ -130,6 +130,25 @@ public abstract class BaseActivity extends AppCompatActivity { mRlNotify.setVisibility(View.GONE); } + public void setEditTextInhibitInputSpeChat(EditText editText) { + InputFilter inputFilter = new InputFilter() { + Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]", + Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE); + + @Override + public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { + Matcher emojiMatcher = emoji.matcher(source); + if (emojiMatcher.find()) { + // Toast.makeText(MainActivity.this,"不支持输入表情", 0).show(); + ToastUtils.showShort("不支持输入表情"); + return ""; + } + return null; + } + }; + editText.setFilters(new InputFilter[]{inputFilter}); + + } /** * 大数据-详情浏览 @@ -165,27 +184,6 @@ public abstract class BaseActivity extends AppCompatActivity { }); } - - public void setEditTextInhibitInputSpeChat(EditText editText) { - InputFilter inputFilter = new InputFilter() { - Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]", - Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE); - - @Override - public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { - Matcher emojiMatcher = emoji.matcher(source); - if (emojiMatcher.find()) { - // Toast.makeText(MainActivity.this,"不支持输入表情", 0).show(); - ToastUtils.showShort("不支持输入表情"); - return ""; - } - return null; - } - }; - editText.setFilters(new InputFilter[]{inputFilter}); - - } - /** * 设置只能输入汉字.字母.数字 * @@ -665,7 +663,7 @@ public abstract class BaseActivity extends AppCompatActivity { /** * 是否登录 * - * @return + * @return true 已经登录 false 未登录 */ protected boolean isLogin() { return !TextUtils.isEmpty(UserLgUtils.getToken()); 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 ebd32bb..736c9fb 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 @@ -80,6 +80,10 @@ public class BottomCancelOrderDialog extends Dialog { } DicSelAdapter adapter = new DicSelAdapter(context, list); rlvReason.setAdapter(adapter); + if (list != null && list.size() > 0) { + list.get(0).setCheck(true); + } + adapter.addOnItemClickListener(baseDictionaryBean -> { for (BaseDictionaryBean b : list) { if (b.getDataId().equals(baseDictionaryBean.getDataId())) { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/expandabletextview/ExpandableTextView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/expandabletextview/ExpandableTextView.java index 9fcfe56..c9f1146 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/expandabletextview/ExpandableTextView.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/expandabletextview/ExpandableTextView.java @@ -28,10 +28,6 @@ import android.view.MotionEvent; import android.view.View; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatTextView; - import com.sucstepsoft.cm_utils.R; import java.util.ArrayList; @@ -42,6 +38,11 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; + /** * @date: on 2018-08-24 * @author: cretin @@ -56,8 +57,7 @@ public class ExpandableTextView extends AppCompatTextView { public static String TEXT_TARGET = "网页链接"; public static final String IMAGE_TARGET = "图"; public static final String TARGET = IMAGE_TARGET + TEXT_TARGET; - public static final String DEFAULT_CONTENT = " " + - " "; + public static final String DEFAULT_CONTENT = " "; private static int retryTime = 0; @@ -65,8 +65,7 @@ public class ExpandableTextView extends AppCompatTextView { * http?://([-\\w\\.]+)+(:\\d+)?(/([\\w/_\\.]*(\\?\\S+)?)?)? */ -// public static final String regexp = "((http[s]{0,1}|ftp)://[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)|((www.)|[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4}) -// (:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)"; +// public static final String regexp = "((http[s]{0,1}|ftp)://[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)|((www.)|[a-zA-Z0-9\\.\\-]+\\.([a-zA-Z]{2,4})(:\\d+)?(/[a-zA-Z0-9\\.\\-~!@#$%^&*+?:_/=<>]*)?)"; // public static final String regexp = "http?://([-\\w\\.]+)+(:\\d+)?(/([\\w/_\\.]*(\\?\\S+)?)?)?"; public static final String regexp_mention = "@[\\w\\p{InCJKUnifiedIdeographs}-]{1,26}"; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java index 32783f2..c367b70 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java @@ -64,6 +64,33 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("email"); } + //===============地理信息===================== + + public static void setCurrentCity(String city) { + SPUtils.getInstance(SP_USER_INFO).put("currentCity", city); + } + + public static String getCurrentCity() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCity"); + } + + public static String getCurrentCityCode() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCityCode"); + } + + public static void setCurrentCityCode(String code) { + SPUtils.getInstance(SP_USER_INFO).put("currentCityCode", code); + } + + public static void setCurrentCityId(String city) { + SPUtils.getInstance(SP_USER_INFO).put("currentCityId", city); + } + + public static String getCurrentCityId() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCityId"); + } + + //============================== public static void setLoginInfo(String userInfo) { SPUtils.getInstance(SP_USER_INFO).put("userInfos", userInfo); @@ -146,21 +173,6 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("city"); } - public static void setCurrentCity(String city) { - SPUtils.getInstance(SP_USER_INFO).put("currentCity", city); - } - - public static String getCurrentCity() { - return SPUtils.getInstance(SP_USER_INFO).getString("currentCity"); - } - - public static String getCurrentCityCode() { - return SPUtils.getInstance(SP_USER_INFO).getString("currentCityCode"); - } - - public static void setCurrentCityCode(String code) { - SPUtils.getInstance(SP_USER_INFO).put("currentCityCode", code); - } public static void setLocationAddress(String address) { SPUtils.getInstance(SP_USER_INFO).put("address", address); @@ -203,22 +215,6 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("appName"); } - public static String getCityCode() { - return SPUtils.getInstance(SP_USER_INFO).getString("cityCode"); - } - - public static void setCityCode(String code) { - SPUtils.getInstance(SP_USER_INFO).put("cityCode", code); - } - - public static String getCityId() { - return SPUtils.getInstance(SP_USER_INFO).getString("cityId"); - } - - public static void setCityId(String code) { - SPUtils.getInstance(SP_USER_INFO).put("cityId", code); - } - public static String getShopCar() { return SPUtils.getInstance(SP_USER_INFO).getString("shopCar"); } @@ -226,4 +222,22 @@ public class UserLgUtils { public static void setShopCar(String data) { SPUtils.getInstance(SP_USER_INFO).put("shopCar", data); } + + + public static void setCityCode(String code) { + SPUtils.getInstance(SP_USER_INFO).put("cityCode", code); + } + + public static String getCityCode() { + return SPUtils.getInstance(SP_USER_INFO).getString("cityCode"); + } + + + public static void setCityId(String code) { + SPUtils.getInstance(SP_USER_INFO).put("cityId", code); + } + + public static String getCityId() { + return SPUtils.getInstance(SP_USER_INFO).getString("cityId"); + } } diff --git a/cm_utils/src/main/res/drawable/shape_tab_bg_no_ra.xml b/cm_utils/src/main/res/drawable/shape_tab_bg_no_ra.xml new file mode 100755 index 0000000..164476e --- /dev/null +++ b/cm_utils/src/main/res/drawable/shape_tab_bg_no_ra.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cm_utils/src/main/res/layout/base_activity.xml b/cm_utils/src/main/res/layout/base_activity.xml index bdbeea7..c9223d4 100755 --- a/cm_utils/src/main/res/layout/base_activity.xml +++ b/cm_utils/src/main/res/layout/base_activity.xml @@ -164,8 +164,8 @@ diff --git a/cm_utils/src/main/res/layout/item_banner_text_all.xml b/cm_utils/src/main/res/layout/item_banner_text_all.xml old mode 100644 new mode 100755 diff --git a/cm_utils/src/main/res/layout/layout_search.xml b/cm_utils/src/main/res/layout/layout_search.xml index 16e6447..9591d68 100644 --- a/cm_utils/src/main/res/layout/layout_search.xml +++ b/cm_utils/src/main/res/layout/layout_search.xml @@ -49,4 +49,4 @@ android:clickable="true" android:focusable="true" android:text="搜索" /> - + \ No newline at end of file diff --git a/cm_utils/src/main/res/values/strings.xml b/cm_utils/src/main/res/values/strings.xml index f8fcd87..b50b665 100755 --- a/cm_utils/src/main/res/values/strings.xml +++ b/cm_utils/src/main/res/values/strings.xml @@ -31,6 +31,7 @@ 正在检查版本 安卓%1$s%2$s%3$s + 收起 展开 网页链接 diff --git a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityDetailActivity.java b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityDetailActivity.java index 676bf23..115bd32 100755 --- a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityDetailActivity.java +++ b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityDetailActivity.java @@ -153,6 +153,9 @@ public class ActivityDetailActivity extends BaseActivity { } else { getActivityDetailByIdToken(mId); } + String read = String.format(getResources().getString(R.string.big_data_str), "", mId, "活动"); + LogUtils.e(read); + bigDataRead(read); } /** diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java index f7588b0..4613e40 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java @@ -89,6 +89,9 @@ public class CulturalLiveDetailActivity extends BaseActivity { getLiveDetail(id); }); mSrlContent.setEnableLoadMore(false); + String read = String.format(getResources().getString(R.string.big_data_str), "", id, "直播"); + LogUtils.e(read); + bigDataRead(read); } private void getLiveDetail(String id) { diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveLookBackActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveLookBackActivity.java index e06bdb5..00a1ea0 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveLookBackActivity.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveLookBackActivity.java @@ -1,7 +1,6 @@ package com.tengshisoft.modulecultural.activitys; import android.annotation.SuppressLint; -import android.os.Bundle; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -19,17 +18,11 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; import com.sucstepsoft.cm_utils.core.widget.base.GlideRoundTransform; import com.sucstepsoft.cm_utils.utils.ExceptionHandler; +import com.sucstepsoft.cm_utils.utils.LogUtils; import com.tengshisoft.modulecultural.R; import com.tengshisoft.modulecultural.R2; import com.tengshisoft.modulecultural.bean.CulturalLiveDetailBean; import com.tengshisoft.modulecultural.net.CulturalApi; -import com.tengshisoft.moduleijkplayer.controller.CompleteView; -import com.tengshisoft.moduleijkplayer.controller.ErrorView; -import com.tengshisoft.moduleijkplayer.controller.GestureView; -import com.tengshisoft.moduleijkplayer.controller.LiveControlView; -import com.tengshisoft.moduleijkplayer.controller.PrepareView; -import com.tengshisoft.moduleijkplayer.controller.StandardVideoController; -import com.tengshisoft.moduleijkplayer.controller.TitleView; import butterknife.BindView; import butterknife.ButterKnife; @@ -73,6 +66,9 @@ public class CulturalLiveLookBackActivity extends BaseActivity { mSrlContent.setEnableRefresh(false); mSrlContent.setEnableLoadMore(false); getLiveDetail(id); + String read = String.format(getResources().getString(R.string.big_data_str), "", id, "直播"); + LogUtils.e(read); + bigDataRead(read); } /** diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java index bdf2f02..f07862e 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java @@ -109,6 +109,9 @@ public class LegacyDetailActivity extends BaseActivity { .placeholder(R.drawable.ic_img_default_banner) .transform(roundedCornersTransform); getLegacyDetail(id); + String read = String.format(getResources().getString(R.string.big_data_str), "", id, "非遗"); + LogUtils.e(read); + bigDataRead(read); } /** diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerActivityDetailActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerActivityDetailActivity.java index aef3518..4bdb1ec 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerActivityDetailActivity.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerActivityDetailActivity.java @@ -27,6 +27,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseBannerImageAdapter; import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; import com.sucstepsoft.cm_utils.utils.ConvertUtils; import com.sucstepsoft.cm_utils.utils.ExceptionHandler; +import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.cm_utils.utils.toast.ToastUtils; @@ -154,6 +155,9 @@ public class VolunteerActivityDetailActivity extends BaseActivity { .navigation(); } }); + String read = String.format(getResources().getString(R.string.big_data_str), "", mId, "志愿"); + LogUtils.e(read); + bigDataRead(read); } /** diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java index 9c43bf6..7103769 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java @@ -56,9 +56,9 @@ public class CulturalMainFragment extends BaseFragment { private LegacyMainAdapter mMainAdapter; private List mFuncStr = new ArrayList<>(); - // private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化直播", "文化分享"}; - // private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; - +// private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化直播", "文化分享"}; +// private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; +// private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化分享"}; private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; 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 0b3ebf5..30010ff 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java @@ -45,14 +45,14 @@ public interface CulturalApi { /** * 获取非遗列表 */ - @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json","need_area:true"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json", "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" ,"need_area:true"}) + @Headers({"base_url_name:legacy", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @GET("app/intangiblelibrary/listpageintangiblelibraryrelease") Observable getLegacyListByType(@Query("page") String page, @Query("rows") String rows, @Query("libraryDirectoriesId") String id); @@ -61,7 +61,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/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml b/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml index a61732d..6d6a119 100755 --- a/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml +++ b/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml @@ -1,8 +1,6 @@ @@ -261,78 +259,6 @@ android:hint="请选择从业状况" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -347,7 +273,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="horizontal"> + android:gravity="right" + android:orientation="horizontal" + android:paddingRight="20dp"> - - - - - - - + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:background="@color/gray_line_deep" /> + android:text="服务区域:" /> - + + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:background="@color/gray_line_deep" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml b/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml index 1f33e79..a631f01 100755 --- a/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml +++ b/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml @@ -1,7 +1,5 @@ @@ -21,9 +19,18 @@ + + + + @@ -53,6 +69,7 @@ android:hint="请选择团队成员" /> + + android:drawablePadding="10dp" + android:gravity="right" + android:hint="请选择所属区域" + android:paddingRight="0dp" /> - + + + diff --git a/modulecultural/src/main/res/layout/activity_vounteer_publish.xml b/modulecultural/src/main/res/layout/activity_vounteer_publish.xml index ee955d5..04bf13c 100755 --- a/modulecultural/src/main/res/layout/activity_vounteer_publish.xml +++ b/modulecultural/src/main/res/layout/activity_vounteer_publish.xml @@ -22,9 +22,19 @@ + android:drawablePadding="10dp" + android:gravity="right" + android:hint="请选择活动区域" + android:paddingRight="0dp" /> + + + + + + + + - + + + - + + + @@ -114,10 +169,18 @@ + + + + + android:drawablePadding="10dp" + android:gravity="right" + android:hint="请选择开始时间" + android:paddingRight="0dp" /> + + + android:drawablePadding="10dp" + android:gravity="right" + android:hint="请选择结束时间" + android:paddingRight="0dp" /> + + + android:gravity="right" + android:orientation="horizontal" + android:paddingRight="10dp"> + + @@ -199,22 +302,32 @@ + android:drawablePadding="10dp" + android:gravity="right" + android:hint="请选择志愿者团队" + android:paddingRight="0dp" /> - + + + + android:layout_marginTop="5dp" /> 10dp 10dp 1 - @drawable/shape_bottom_line + 5dp + 5dp + 5dp + 5dp + 13sp + + + + + + + " + + ""; + return "" + head + "" + content + ""; + } + + /** + * 对图片进行重置大小，宽度就是手机屏幕宽度，高度根据宽度比便自动缩放 + **/ + private void imgReset() { + mWvContent.loadUrl("javascript:(function(){" + + "var objs = document.getElementsByTagName('img'); " + + "for(var i=0;i fileList = b.getFileList(); + if (i == 0) { + fileList.get(i).setCheck(true); + } else { + fileList.get(i).setCheck(false); + } + } + mCategoryAdapter = new NewsCategoryAdapter(mActivity, b.getFileList()); + mRlvAudioCategory.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false)); + mRlvAudioCategory.setAdapter(mCategoryAdapter); + mCategoryAdapter.addOnItemClickListener(fileListBean -> { + for (int i = 0; i < b.getFileList().size(); i++) { + NewsDetailBean.FileListBean fileBean = b.getFileList().get(i); + if (fileBean.getContentFileFileId().equals(fileListBean.getContentFileFileId())) { + fileBean.setCheck(true); + } else { + fileBean.setCheck(false); + } + } + mCategoryAdapter.setData(b.getFileList()); + setAudioUrl(fileListBean); + }); + StandardVideoController controller = new StandardVideoController(mActivity); + controller.setEnableOrientation(true); + AudioPrepareView prepareView = new AudioPrepareView(this);//准备播放界面 + ImageView thumb = prepareView.findViewById(com.tengshisoft.moduleijkplayer.R.id.thumb);//封面图 + Glide.with(mActivity).load(com.tengshisoft.moduleijkplayer.R.drawable.ic_img_default).into(thumb); + controller.addControlComponent(prepareView); + prepareView.setClickStart(); + CompleteView completeView = new CompleteView(this); + controller.addControlComponent(completeView);//自动完成播放界面 + ErrorView errorView = new ErrorView(this); + controller.addControlComponent(errorView);//错误界面 + TitleView titleView = new TitleView(this);//标题栏 + controller.addControlComponent(titleView); + //根据是否为直播设置不同的底部控制条 + AudioControlView vodControlView = new AudioControlView(this);//点播控制条 + controller.addControlComponent(vodControlView); + GestureView gestureControlView = new GestureView(this);//滑动控制视图 + controller.addControlComponent(gestureControlView); + controller.setCanChangePosition(false); + //设置标题 + titleView.setTitle(mTitle); + mAudio.setVideoController(controller); + mAudio.setUrl(BaseUrlApi.BASE_IMG_URL + b.getFileList().get(0).getContentFileFileId()); + mAudio.setLooping(true); + mTvAudioTxt.setText(b.getFileList().get(0).getContentFileText()); + } + + /** + * 设置音频Url + */ + private void setAudioUrl(NewsDetailBean.FileListBean b) { + if (mAudio == null) { + return; + } + if (mAudio.isPlaying()) { + mAudio.pause(); + mAudio.release(); + } + mAudio.setUrl(BaseUrlApi.BASE_IMG_URL + b.getContentFileFileId()); + mAudio.start(); + mTvAudioTxt.setText(b.getContentFileText()); } /** * 加载视频新闻 */ - private void createVideoView() { + private void createVideoView(NewsDetailBean b) { + mLlVideo.setVisibility(View.VISIBLE); + for (int i = 0; i < b.getFileList().size(); i++) { + List fileList = b.getFileList(); + if (i == 0) { + fileList.get(i).setCheck(true); + } else { + fileList.get(i).setCheck(false); + } + } + mCategoryAdapter = new NewsCategoryAdapter(mActivity, b.getFileList()); + mRlvVideoCategory.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false)); + mRlvVideoCategory.setAdapter(mCategoryAdapter); + mCategoryAdapter.addOnItemClickListener(fileListBean -> { + for (int i = 0; i < b.getFileList().size(); i++) { + NewsDetailBean.FileListBean fileBean = b.getFileList().get(i); + if (fileBean.getContentFileFileId().equals(fileListBean.getContentFileFileId())) { + fileBean.setCheck(true); + } else { + fileBean.setCheck(false); + } + } + mCategoryAdapter.setData(b.getFileList()); + setVideoUrl(fileListBean); + }); + StandardVideoController controller = new StandardVideoController(mActivity); + controller.setEnableOrientation(true); + PrepareView prepareView = new PrepareView(this);//准备播放界面 + ImageView thumb = prepareView.findViewById(com.tengshisoft.moduleijkplayer.R.id.thumb);//封面图 + Glide.with(mActivity).load(com.tengshisoft.moduleijkplayer.R.drawable.ic_img_default).into(thumb); + controller.addControlComponent(prepareView); + prepareView.setClickStart(); + CompleteView completeView = new CompleteView(this); + controller.addControlComponent(completeView);//自动完成播放界面 + ErrorView errorView = new ErrorView(this); + controller.addControlComponent(errorView);//错误界面 + TitleView titleView = new TitleView(this);//标题栏 + controller.addControlComponent(titleView); + //根据是否为直播设置不同的底部控制条 + VodControlView vodControlView = new VodControlView(this);//点播控制条 + controller.addControlComponent(vodControlView); + GestureView gestureControlView = new GestureView(this);//滑动控制视图 + controller.addControlComponent(gestureControlView); + controller.setCanChangePosition(false); + //设置标题 + titleView.setTitle(mTitle); + mVideo.setVideoController(controller); + mVideo.setUrl(BaseUrlApi.BASE_IMG_URL + b.getFileList().get(0).getContentFileFileId()); + mTvVideoTxt.setText(b.getFileList().get(0).getContentFileText()); +// mVideo.addOnStateChangeListener(mOnStateChangeListener); +// mVideo.start(); } + /** + * 设置视频URL + */ + private void setVideoUrl(NewsDetailBean.FileListBean b) { + if (mVideo == null) { + return; + } + if (mVideo.isPlaying()) { + mVideo.pause(); + mVideo.release(); + } + mVideo.setUrl(BaseUrlApi.BASE_IMG_URL + b.getContentFileFileId()); + mVideo.start(); + mTvVideoTxt.setText(b.getContentFileText()); + } + + /** * 加载图片新闻 */ private void createImgView(NewsDetailBean b) { mRlImg.setVisibility(View.VISIBLE); List mBannerList = new ArrayList<>(); + int screenHeight = ScreenUtils.getScreenHeight(); + RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(mBnImg.getLayoutParams()); + LogUtils.e(screenHeight); + params.height = screenHeight - ConvertUtils.dp2px(96) - 50; + mBnImg.setLayoutParams(params); for (int i = 0; i < b.getFileList().size(); i++) { NewsDetailBean.FileListBean fileListBean = b.getFileList().get(i); BaseImageBean bannerBean = new BaseImageBean(); -// bannerBean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + fileListBean.getContentFileFileId()); - if (i / 2 == 0) { -// bannerBean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + fileListBean.getContentFileFileId()); - bannerBean.setImgUrl("https://lmg.jj20.com/up/allimg/tp08/46042223542701-lp.jpg"); - } else { - bannerBean.setImgUrl("https://www.ssfiction.com/wp-content/uploads/2020/08/20200805_5f2b1669e9a24.jpg"); - } + bannerBean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + fileListBean.getContentFileFileId()); bannerBean.setName(fileListBean.getContentFileText()); mBannerList.add(bannerBean); } BannerImageTextAllAdapter mBannerImageAdapter = new BannerImageTextAllAdapter(mBannerList); mBnImg.setAdapter(mBannerImageAdapter); mBnImg.setPageTransformer(new ScaleInTransformer()); - mBnImg.setDelayTime(10000L); + mBnImg.setDelayTime(12000L); mBnImg.start(); + + mIvImgLeft.setOnClickListener(v -> mBnImg.setCurrentItem(mBnImg.getCurrentItem() - 1)); + mIvImgRight.setOnClickListener(v -> mBnImg.setCurrentItem(mBnImg.getCurrentItem() + 1)); } /** @@ -1201,12 +1410,51 @@ public class NewsLocalDetailActivity extends BaseActivity { buttomDialogView.show(); } + + @Override + protected void onResume() { + super.onResume(); + if (mLlAudio.getVisibility() == View.VISIBLE) { + if (mAudio != null) { + mAudio.pause(); + } + } + if (mLlVideo.getVisibility() == View.VISIBLE) { + if (mVideo != null) { + mVideo.pause(); + } + } + } + + @Override + protected void onPause() { + super.onPause(); + if (mLlAudio.getVisibility() == View.VISIBLE) { + if (mAudio != null) { + mAudio.pause(); + } + } + if (mLlVideo.getVisibility() == View.VISIBLE) { + if (mVideo != null) { + mVideo.pause(); + } + } + } + @Override protected void onDestroy() { mContentView = null; + if (mAudio != null) { + mAudio.pause(); + mAudio.release(); + } + if (mVideo != null) { + mVideo.pause(); + mVideo.release(); + } if (mBind != null) { mBind.unbind(); } super.onDestroy(); } -} +} \ No newline at end of file diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java index d611b99..a8b16c0 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java @@ -70,7 +70,6 @@ public class NewsMainActivity extends BaseActivity { .withString("id", mId) .withBoolean("isTab", true) .navigation()); - getNewsTabs(); } @@ -95,16 +94,17 @@ public class NewsMainActivity extends BaseActivity { if (newsTabBeans != null && newsTabBeans.size() > 0) { NewsTabBean allBean = new NewsTabBean(); allBean.setDirectoriesName("全部"); - allBean.setNewsDirectoriesId(mId); - allBean.setDirectoriesParentId(mId); + allBean.setNewsDirectoriesId(mPId); + allBean.setDirectoriesParentId(mPId); allBean.setDirectoriesView("2"); newsTabBeans.add(0, allBean); + mTabs = newsTabBeans; for (int i = 0; i < newsTabBeans.size(); i++) { Bundle bundle = new Bundle(); bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId()); + bundle.putBoolean("isAll","全部".equals(newsTabBeans.get(i).getDirectoriesName())); bundle.putString("pId", ""); - bundle.putBoolean("isAll", "全部".equals(newsTabBeans.get(i).getDirectoriesName())); BaseFragment fragment = null; //0 外部链接 1存在子集 2没有子集 if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) { diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java index cc818db..82e2f9b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java @@ -142,45 +142,46 @@ public class NewsSearchActivity extends BaseActivity { * @param type */ private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { - String url = ""; - if ("6".equals(rowsBean.getNewsContentType())) { - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) - .withString("title", rowsBean.getNewsContentTitle()) - .withString("url", rowsBean.getNewsContentContent()) - .navigation(); - } else { - int newsType = 0; - if (type == 1) { - //1自定义列表 - //3列表详情 - if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { - //列表 - url = rowsBean.getTemplateRecordUrl(); - newsType = 0; - } else { - //内容 - url = rowsBean.getNewsConfigDescriptionText(); - newsType = 1; - } - } else { - newsType = 0; - url = rowsBean.getTemplateRecordUrl(); - } - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接 -// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 - .withString("id", rowsBean.getNewsContentId()) - .withString("url", url) - .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 - .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 - .withString("isCollect", rowsBean.getNewsContentCollectStatus()) - .withString("photo", - BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) - .withString("title", rowsBean.getNewsContentTitle()) - .withInt("type", newsType) - .navigation(); - } + ARouter.getInstance() +// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接 + .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 + .withString("id", rowsBean.getNewsContentId()) + .withString("url", "") + .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 + .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 + .withString("isCollect", rowsBean.getNewsContentCollectStatus()) + .withString("photo", + BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) + .withString("title", rowsBean.getNewsContentTitle()) + .withInt("type", 2) + .navigation(); +// String url = ""; +// if ("6".equals(rowsBean.getNewsContentType())) { +// ARouter.getInstance() +// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) +// .withString("title", rowsBean.getNewsContentTitle()) +// .withString("url", rowsBean.getNewsContentContent()) +// .navigation(); +// } else { +// int newsType = 0; +// if (type == 1) { +// //1自定义列表 +// //3列表详情 +// if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { +// //列表 +// url = rowsBean.getTemplateRecordUrl(); +// newsType = 0; +// } else { +// //内容 +// url = rowsBean.getNewsConfigDescriptionText(); +// newsType = 1; +// } +// } else { +// newsType = 0; +// url = rowsBean.getTemplateRecordUrl(); +// } + +// } } /** @@ -313,4 +314,4 @@ public class NewsSearchActivity extends BaseActivity { } }); } -} +} \ No newline at end of file diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java index 6ac9dbd..01b8232 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java @@ -1,28 +1,24 @@ package com.tengshisoft.mudulemain.cultural.adapter; import android.content.Context; - -import androidx.recyclerview.widget.RecyclerView; - import android.net.http.SslError; import android.os.Build; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.SslErrorHandler; -import android.webkit.WebResourceRequest; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; +import androidx.recyclerview.widget.RecyclerView; + import com.bumptech.glide.Glide; -import com.bumptech.glide.load.MultiTransformation; -import com.bumptech.glide.load.resource.bitmap.FitCenter; +import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; -import com.sucstepsoft.cm_utils.core.widget.base.GlideRoundTransform; import com.sucstepsoft.cm_utils.core.widget.base.RoundedCornersTransform; import com.sucstepsoft.cm_utils.utils.ConvertUtils; import com.sucstepsoft.cm_utils.utils.LogUtils; @@ -54,6 +50,7 @@ public class NewsAdapter extends BaseRecyclerAdapter { + + public NewsCategoryAdapter(Context ctx, List list) { + super(ctx, list); + } + + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public NewsCategoryHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_category, parent, false); + return new NewsCategoryHolder(itemView); + } + + @Override + public void bindHolder(NewsCategoryHolder h, int i) { + NewsDetailBean.FileListBean b = mData.get(i); + if (b.isCheck()) { + h.mTvName.setBackgroundResource(R.drawable.shape_red_line_ra_2); + } else { + h.mTvName.setBackgroundResource(0); + } + h.mTvName.setText(String.valueOf(i + 1)); + } + + +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsTabAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsTabAdapter.java old mode 100644 new mode 100755 diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsDetailBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsDetailBean.java index 0a06f9e..ead087b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsDetailBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsDetailBean.java @@ -338,6 +338,15 @@ public class NewsDetailBean { private String contentFileText; private String newsContentFileId; private String newsContentId; + private boolean isCheck; + + public boolean isCheck() { + return isCheck; + } + + public void setCheck(boolean check) { + isCheck = check; + } public String getContentFileFileId() { return contentFileFileId; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java index 612a9b1..98b23ed 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java @@ -59,8 +59,8 @@ public class NewsFragment extends BaseFragment { private NewsAdapter mAdapter; private int mTotalPage = 0; private int mCurrentPage = 1; - private String mType;//newsID - private String mPId;//newsPid + private String mType;//newsId + private String mPid;//newsPid private RecyclerViewSkeletonScreen mNewsSkeleton; private Disposable mD1; private Disposable mD2; @@ -73,8 +73,8 @@ public class NewsFragment extends BaseFragment { setStateView(STATE_SUCCESS); mAdapter = new NewsAdapter(mActivity, mNewsDatas); mType = getArguments().getString("type"); - mPId = getArguments().getString("pId"); - mIsAll = getArguments().getBoolean("isAll", false); + mPid = getArguments().getString("pId"); + mIsAll = getArguments().getBoolean("isAll"); mCurrentPage = 1; mTotalPage = 0; mNewsDatas.clear(); @@ -114,45 +114,45 @@ public class NewsFragment extends BaseFragment { } private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) - .withString("id", rowsBean.getNewsContentId()) - .withString("url", "") - .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 - .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 - .withString("isCollect", rowsBean.getNewsContentCollectStatus()) - .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) - .withString("title", rowsBean.getNewsContentTitle()) - .withInt("type", -1) - .navigation(); -// String url = ""; -// if ("6".equals(rowsBean.getNewsContentType())) { -// //链接新闻 -// ARouter.getInstance() -// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) -// .withString("url", rowsBean.getNewsContentContent()) -// .withString("title", rowsBean.getNewsContentTitle()) -// .navigation(); -// } else { -// int newsType = 0; -// if (type == 1) { -// //1自定义列表 -// //3列表详情 -// if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { -// //列表 -// url = rowsBean.getTemplateRecordUrl(); -// newsType = 0; -// } else { -// //内容 -// url = rowsBean.getNewsConfigDescriptionText(); -// newsType = 1; -// } -// } else { -// newsType = 0; -// url = rowsBean.getTemplateRecordUrl(); -// } -// -// } + String url = ""; + if ("6".equals(rowsBean.getNewsContentType())) { + //链接新闻 + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) + .withString("url", rowsBean.getNewsContentContent()) + .withString("title", rowsBean.getNewsContentTitle()) + .navigation(); + } else { + int newsType = 0; + if (type == 1) { + //1自定义列表 + //3列表详情 + if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { + //列表 + url = rowsBean.getTemplateRecordUrl(); + newsType = 0; + } else { + //内容 + url = rowsBean.getNewsConfigDescriptionText(); + newsType = 1; + } + } else { + newsType = 0; + url = rowsBean.getTemplateRecordUrl(); + } + ARouter.getInstance() +// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)//TODO 详情模板 + .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 + .withString("id", rowsBean.getNewsContentId()) + .withString("url", url) + .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 + .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 + .withString("isCollect", rowsBean.getNewsContentCollectStatus()) + .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) + .withString("title", rowsBean.getNewsContentTitle()) + .withInt("type", newsType) + .navigation(); + } } private void getNewsListByTypeToken(int page) { @@ -176,24 +176,24 @@ public class NewsFragment extends BaseFragment { if (newsItemBean != null && newsItemBean.getRows().size() > 0) { mTotalPage = newsItemBean.getTotal(); getCommentCount(1, newsItemBean); -// mNewsDatas = newsItemBean.getRows(); +// mNewsDatas.addAll(newsItemBean.getRows()); // mAdapter.setData(mNewsDatas); -// setStateView(STATE_SUCCESS); + setStateView(STATE_SUCCESS); } else { setStateView(STATE_EMPTY); } - mSrlView.finishRefresh(); + } else { if (newsItemBean != null) { // mNewsDatas.addAll(newsItemBean.getRows()); // mAdapter.setData(mNewsDatas); getCommentCount(2, newsItemBean); - mSrlView.finishLoadMore(); } else { mSrlView.setNoMoreData(true); } } - + mSrlView.finishLoadMore(); + mSrlView.finishRefresh(); } @Override @@ -222,7 +222,6 @@ public class NewsFragment extends BaseFragment { * @param id */ private void getNewsSubMenu(String id) { - RetrofitManager.getInstance() .create(HomeApi.class) .getNewsTabListByPid(id) diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsCategoryHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsCategoryHolder.java new file mode 100755 index 0000000..681d633 --- /dev/null +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsCategoryHolder.java @@ -0,0 +1,24 @@ +package com.tengshisoft.mudulemain.cultural.holder; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; +import com.tengshisoft.mudulemain.R; + +/** + * 作者: adam + * 日期: 2020/5/28 - 10:18 AM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewsCategoryHolder extends RecyclerView.ViewHolder { + public TypeFaceTextView mTvName; + + public NewsCategoryHolder(@NonNull View itemView) { + super(itemView); + mTvName = itemView.findViewById(R.id.tv_category); + } +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsTabHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsTabHolder.java old mode 100644 new mode 100755 index bc7f2e5..48bb5d5 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsTabHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsTabHolder.java @@ -8,6 +8,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; import com.tengshisoft.mudulemain.R; +/** + * 作者: adam + * 日期: 2020/5/28 - 10:18 AM + * 邮箱: itgaojian@163.com + * 描述: + */ public class NewsTabHolder extends RecyclerView.ViewHolder { public View mVLine; public TypeFaceTextView mTvName; @@ -18,4 +24,3 @@ public class NewsTabHolder extends RecyclerView.ViewHolder { mTvName = itemView.findViewById(R.id.tv_name); } } - 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 9626f3c..ea35ade 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 @@ -57,7 +57,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); @@ -82,7 +82,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); @@ -101,7 +101,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(); @@ -136,15 +136,18 @@ public interface HomeApi { */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getNewsTabListByPid(@Query("newsDirectoriesId") String id, @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); +// Observable getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @Query("rows") String rows, @Query("page") String page); + Observable getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @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", "need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("page") String page); + Observable getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, + @Query("newsDirectoriesParentId") String pId, + @Query("page") String page); + /** * 获取新闻列表-不需要token @@ -169,23 +172,26 @@ public interface HomeApi { */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @GET("app/newscontent/listpagenewscontentrelease") - Observable getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("rows") String rows, - @Query("page") String page); + Observable getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, + @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", "need_area:true"}) @GET("app/newscontent/listpagenewscontent") - Observable getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("page") String page, - @Header("token") String token); + Observable getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, + @Query("newsDirectoriesParentId") String pId, + @Query("page") String page, @Header("token") String token); /** * 获取新闻列表-需要token */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "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); /** * 获取新闻详情 @@ -194,7 +200,6 @@ public interface HomeApi { @GET("app/newscontent/getnewscontentbyidrelease/{id}") Observable getNewsDetail(@Path("id") String id); - /** * 获取评论列表 */ @@ -208,7 +213,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); /** @@ -216,7 +222,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); /** * 获取评论列表 @@ -224,7 +231,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); /** * 保存评论 @@ -276,7 +286,8 @@ public interface HomeApi { */ @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @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); /** * 直播回放列表 @@ -304,5 +315,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/modulemain/src/main/res/layout/activity_news_local_detail.xml b/modulemain/src/main/res/layout/activity_news_local_detail.xml index 814c367..5aa8635 100644 --- a/modulemain/src/main/res/layout/activity_news_local_detail.xml +++ b/modulemain/src/main/res/layout/activity_news_local_detail.xml @@ -141,6 +141,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + + + + + \ No newline at end of file diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java index c4084cd..ec4bbb5 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java @@ -92,7 +92,7 @@ public class CollectActivity extends BaseActivity { url = rowsBean.getTemplateRecordUrl(); } ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) + .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId()) .withString("url", url) .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 diff --git a/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml index bc397c5..6ea551a 100644 --- a/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml +++ b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml @@ -207,7 +207,6 @@ android:layout_marginRight="10dp" android:background="@color/gray_line_deep" /> - - - - + android:visibility="gone" + app:cardCornerRadius="5dp" + app:cardElevation="3dp"> - + android:layout_margin="5dp" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="8dp"> - - + + + + + - showPlaceDetail()); mMrbLevel.setIsIndicator(true); + String read = String.format(getResources().getString(R.string.big_data_str), "", mId, "场馆"); + LogUtils.e(read); + bigDataRead(read); } /** diff --git a/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceFuncAdapter.java b/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceFuncAdapter.java index 1e34857..cefb008 100755 --- a/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceFuncAdapter.java +++ b/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceFuncAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import com.bumptech.glide.Glide; +import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; import com.tengshisoft.moduleplace.R; @@ -36,6 +37,7 @@ public class PlaceFuncAdapter extends BaseRecyclerAdapter 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); /** * 获取场馆列表-根据类型 * * @return */ - @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json","need_area:true"}) + @Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @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); @@ -54,7 +55,7 @@ public interface ApiPlace { * * @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); @@ -139,7 +140,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); /** * 取消订单 diff --git a/moduleplace/src/main/res/layout/fragment_place_main.xml b/moduleplace/src/main/res/layout/fragment_place_main.xml index 6b3de03..24a3067 100755 --- a/moduleplace/src/main/res/layout/fragment_place_main.xml +++ b/moduleplace/src/main/res/layout/fragment_place_main.xml @@ -26,8 +26,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" - android:padding="5dp" - android:orientation="horizontal"> + android:orientation="horizontal" + android:padding="5dp"> - + android:layout_height="match_parent" + android:fillViewport="true"> + + + diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java index e997d92..fa6a216 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java @@ -154,10 +154,26 @@ public class GoodsDetailActivity extends BaseActivity { mTvGoodsStock.setText("库存:" + b.getGoodsItemTotal()); mStandardAdapter.setSelPos(p); }); - mTvAddCar.setOnClickListener(v -> addToCar(mCurrentBean)); - mLlCar.setOnClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR) - .navigation()); + mTvAddCar.setOnClickListener(v -> { + if (isLogin()) { + addToCar(mCurrentBean); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_LOGIN) + .navigation(); + } + }); + mLlCar.setOnClickListener(v -> { + if (isLogin()) { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR) + .navigation(); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_LOGIN) + .navigation(); + } + }); } private void parserShopCar() { diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java index ec351f5..407392c 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java @@ -174,7 +174,7 @@ public class OrderConfirmActivity extends BaseActivity { for (int i = 0; i < mDatas.size(); i++) { price += (mDatas.get(i).getCarAmount() * mDatas.get(i).getGoodsPrice()); } - mTvPrice.setText(price + ""); + mTvPrice.setText("¥ " + price + ""); } @Override diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java index c93a77d..064591a 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java @@ -29,7 +29,7 @@ import butterknife.Unbinder; import io.reactivex.disposables.Disposable; /** - * 我的订单 + * 我的商城订单 */ @Route(path = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER) public class OrderListActivity extends BaseActivity { diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/net/ShopApi.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/net/ShopApi.java index fd1e4d5..7462f5a 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/net/ShopApi.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/net/ShopApi.java @@ -26,13 +26,13 @@ import retrofit2.http.Query; public interface ShopApi { //获取商品分类 - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/category/listztreerelease") Observable> getShopCategoryList(); //根据分类ID商品检索 - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopgoods/solrrelease") Observable getGoodsList(@Query("page") String page, @Query("rows") String rows, @@ -50,7 +50,7 @@ public interface ShopApi { * @param uE 商品评分 * @return */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopgoods/solrrelease") Observable getGoodsList(@Query("page") String page, @Query("rows") String rows, @@ -63,14 +63,14 @@ public interface ShopApi { /** * 获取商品详情 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopgoods/getrelease/{goodsId}") Observable getGoodsDetailById(@Path("goodsId") String goodsId); /** * 获取商品规格 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopgoodsitem/listrelease/{goodsId}") Observable> getStandardListByGoodsId(@Path("goodsId") String goodsId); @@ -78,21 +78,21 @@ public interface ShopApi { /** * 提交订单 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @POST("app/order/savebycart") Observable doSaveOrder(@Body RequestBody goods, @Header("token") String token); /** * 新增收货地址 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @POST("app/shopaddress/save") Observable doSaveAddress(@Body RequestBody goods, @Header("token") String token); /** * 修改收货地址 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @PUT("app/shopaddress/update/{shopAddressId}") Observable doEditAddress(@Body RequestBody goods, @Path("shopAddressId") String addressId, @@ -101,35 +101,35 @@ public interface ShopApi { /** * 设置默认收货地址 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @PUT("app/shopaddress/updatedefault/{shopAddressId}") Observable doSetDefaultAddress(@Path("shopAddressId") String id, @Header("token") String token); /** * 获取默认地址 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopaddress/getdefault") Observable getDefaultAddress(@Header("token") String token); /** * 删除收货地址 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @DELETE("app/shopaddress/remove/{ids}") Observable doDelShippingAddress(@Path("ids") String id, @Header("token") String token); /** * 收货地址列表 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/shopaddress/list") Observable> getShippingAddressList(@Header("token") String token); /** * 我的订单 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/order/listpage") Observable getMineShopOrderList(@Query("orderStatus") String status, @Query("page") String page, @@ -140,14 +140,14 @@ public interface ShopApi { /** * 删除订单 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @DELETE("app/order/delete/{orderId}") Observable doDelOrder(@Path("orderId") String id, @Header("token") String token); /** * 取消订单 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @PUT("app/order/updatebuyersclose/{orderId}") Observable doCancelOrder(@Path("orderId") String id, @Body RequestBody body, @@ -156,7 +156,7 @@ public interface ShopApi { /** * 获取取消原因 */ - @Headers({"base_url_name:shop", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:shop", "is_need_area:false", "Content-Type:application/json", "Accept:application/json"}) @GET("app/data/listbyparentid/{id}") Observable> getCancelData(@Path("id") String id, @Header("token") String token);