diff --git a/readme.md b/README.md similarity index 83% rename from readme.md rename to README.md index 1418fa8..7941789 100755 --- a/readme.md +++ b/README.md @@ -1,32 +1,43 @@ ## 2020-9-22 修改内容 + > 1修复微信分享,添加微信朋友圈分享 -> +> >2 修改新闻布局(条目标题行宽) > >3 修改App-logo 我的中添加服务专线 ## 2020-12-23 修改内容 + > 1修改域名 -> +> > 2电话号码校验正则添加191号段 ## 2021-1-5 修改内容 + > 1 新闻条目字体大小 -> +> > 2 新闻列表评论数量与条目信息拆分 - + ## 2021-3-27 添加新闻类型 + > 1 添加新闻类型 newsContentType=6 newsContentContent:链接 链接新闻 -> +> > 2 详情页 NewsWebActivity -> +> > 3 隐藏各种中心状态栏(ImmersionBar) ## 2022-12-6 修改接口 + > 1 修改接口 > > 2 适配android 12与11 Toast > > 3 升级 gradle > -> 4 多包名打包方式 \ No newline at end of file +> 4 多包名打包方式 + + +## 2022-12-19 + +> 1.App名称修改,以及动态获取 +> 2.首页地区选择去除 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3240b45..89d3811 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,19 +3,20 @@ apply plugin: 'com.android.application' android { signingConfigs { release { - storeFile file('/Users/adam/Documents/work/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } debug { - storeFile file('/Users/adam/Documents/work/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } } compileSdkVersion rootProject.ext.gCompileSdkVersion + buildToolsVersion '30.0.2' defaultConfig { applicationId "com.tengshisoft.cultural" minSdkVersion rootProject.ext.gMinSdkVersion @@ -58,112 +59,202 @@ android { applicationId "com.tenlion.cultural.sangzhuzi" dimension 'market' resValue "string", "APP_CHANNEL", "sangzhuzi" - manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi", CITY_CODE: "640676"] + manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi", + APP_LOGO : "@drawable/app_logoo", + CITY_ID : "640676", + CITY_CODE : "540202000000", + BD_KEY : "ipb1ae32sNDRMbwOOpApG6bVBji9K86R", + APP_NAME : "桑珠孜区数字文化云"] } nanmulin { applicationId "com.tenlion.cultural.nanmulin" dimension 'market' resValue "string", "APP_CHANNEL", "nanmulin" - manifestPlaceholders = [CHANNEL_VALUE: "nanmulin", CITY_CODE: "640865"] + manifestPlaceholders = [CHANNEL_VALUE: "nanmulin", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "640865", + CITY_CODE : "540221000000", + BD_KEY : "g0G2QLpGCAFV8QKxKo5irCZDwPlCPRTQ", + APP_NAME : "南木林县数字文化云"] } jiangzi { applicationId "com.tenlion.cultural.jiangzi" dimension 'market' resValue "string", "APP_CHANNEL", "jiangzi" - manifestPlaceholders = [CHANNEL_VALUE: "jiangzi", CITY_CODE: "641029"] + manifestPlaceholders = [CHANNEL_VALUE: "jiangzi", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641029", + CITY_CODE : "540222000000", + BD_KEY : "ZkcqIoGvjy8EfIwaal796KSNEWFsmObL", + APP_NAME : "江孜县数字文化云"] } dingri { applicationId "com.tenlion.cultural.dingri" dimension 'market' resValue "string", "APP_CHANNEL", "dingri" - manifestPlaceholders = [CHANNEL_VALUE: "dingri", CITY_CODE: "641204"] + manifestPlaceholders = [CHANNEL_VALUE: "dingri", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641204", + CITY_CODE : "540223000000", + BD_KEY : "ql1MLXVWxztmqN2cdxGpe7aYdcvNdRSd", + APP_NAME : "定日县数字文化云"] } sajia { applicationId "com.tenlion.cultural.sajia" dimension 'market' resValue "string", "APP_CHANNEL", "sajia" - manifestPlaceholders = [CHANNEL_VALUE: "sajia", CITY_CODE: "641393"] + manifestPlaceholders = [CHANNEL_VALUE: "sajia", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641393", + CITY_CODE : "540224000000", + BD_KEY : "PoMpzyP5FGptOGR4dFByXd6euQ66IDI5", + APP_NAME : "萨迦县数字文化云"] } lazi { applicationId "com.tenlion.cultural.lazi" dimension 'market' resValue "string", "APP_CHANNEL", "lazi" - manifestPlaceholders = [CHANNEL_VALUE: "lazi", CITY_CODE: "641512"] + manifestPlaceholders = [CHANNEL_VALUE: "lazi", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641512", + CITY_CODE : "540225000000", + BD_KEY : "LYw9cxjZ6eNLQ5vFIMvmcvafENtfIG8y", + APP_NAME : "拉孜县数字文化云"] } angren { applicationId "com.tenlion.cultural.angren" dimension 'market' resValue "string", "APP_CHANNEL", "angren" - manifestPlaceholders = [CHANNEL_VALUE: "angren", CITY_CODE: "641622"] + manifestPlaceholders = [CHANNEL_VALUE: "angren", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641622", + CITY_CODE : "540226000000", + BD_KEY : "YGTBM02Sgut6xqT9D5lrcfeYqBhE6Ncr", + APP_NAME : "昂仁县数字文化云"] } xietongmen { applicationId "com.tenlion.cultural.xietongmen" dimension 'market' resValue "string", "APP_CHANNEL", "xietongmen" - manifestPlaceholders = [CHANNEL_VALUE: "xietongmen", CITY_CODE: "641825"] + manifestPlaceholders = [CHANNEL_VALUE: "xietongmen", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641825", + CITY_CODE : "540227000000", + BD_KEY : "3Y4ZNEGjTGt9iFSHpF1r1iNdnCBxmYIg", + APP_NAME : "谢通门县数字文化云"] } bailang { applicationId "com.tenlion.cultural.bailang" dimension 'market' resValue "string", "APP_CHANNEL", "bailang" - manifestPlaceholders = [CHANNEL_VALUE: "bailang", CITY_CODE: "641940"] + manifestPlaceholders = [CHANNEL_VALUE: "bailang", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "641940", + CITY_CODE : "540228000000", + BD_KEY : "DlnhdI1CmTqBZBCRFkGdnxrDaStkQsu5", + APP_NAME : "白朗县数字文化云"] } renbu { applicationId "com.tenlion.cultural.renbu" dimension 'market' resValue "string", "APP_CHANNEL", "renbu" - manifestPlaceholders = [CHANNEL_VALUE: "renbu", CITY_CODE: "642063"] + manifestPlaceholders = [CHANNEL_VALUE: "renbu", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642063", + CITY_CODE : "540229000000", + BD_KEY : "UL2rUUtPhOq3xBBWpnDGiEuTNHLvtWuh", + APP_NAME : "仁布县数字文化云"] } kangma { applicationId "com.tenlion.cultural.kangma" dimension 'market' resValue "string", "APP_CHANNEL", "kangma" - manifestPlaceholders = [CHANNEL_VALUE: "kangma", CITY_CODE: "642146"] + manifestPlaceholders = [CHANNEL_VALUE: "kangma", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642146", + CITY_CODE : "540230000000", + BD_KEY : "kQsUL41b09E3nhtNIo2ohEKalWwhDFeV", + APP_NAME : "康马县数字文化云"] } dingjie { applicationId "com.tenlion.cultural.dingjie" dimension 'market' resValue "string", "APP_CHANNEL", "dingjie" - manifestPlaceholders = [CHANNEL_VALUE: "dingjie", CITY_CODE: "642203"] + manifestPlaceholders = [CHANNEL_VALUE: "dingjie", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642203", + CITY_CODE : "540231000000", + BD_KEY : "4rGrPthpteXXbkyrQXYkbX34YQ31PpH5", + APP_NAME : "定结县数字文化云"] } zhongba { applicationId "com.tenlion.cultural.zhongba" dimension 'market' resValue "string", "APP_CHANNEL", "zhongba" - manifestPlaceholders = [CHANNEL_VALUE: "zhongba", CITY_CODE: "642284"] + manifestPlaceholders = [CHANNEL_VALUE: "zhongba", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642284", + CITY_CODE : "540232000000", + BD_KEY : "HpPUfcA5QdexPDpP7QOakTFGHGGtmSQo", + APP_NAME : "仲巴县数字文化云"] } yadong { applicationId "com.tenlion.cultural.yadong" dimension 'market' resValue "string", "APP_CHANNEL", "yadong" - manifestPlaceholders = [CHANNEL_VALUE: "yadong", CITY_CODE: "642356"] + manifestPlaceholders = [CHANNEL_VALUE: "yadong", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642356", + CITY_CODE : "540233000000", + BD_KEY : "vICh5EdGtR5k2RdTaXYWoyDLBai2fVof", + APP_NAME : "亚东县数字文化云"] } jilong { applicationId "com.tenlion.cultural.jilong" dimension 'market' resValue "string", "APP_CHANNEL", "jilong" - manifestPlaceholders = [CHANNEL_VALUE: "jilong", CITY_CODE: "642389"] + manifestPlaceholders = [CHANNEL_VALUE: "jilong", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642389", + CITY_CODE : "540234000000", + BD_KEY : "1uYUV884B8jzRnQG3FlZe5484mWWBkr4", + APP_NAME : "吉隆县数字文化云"] } nielamu { applicationId "com.tenlion.cultural.nielamu" dimension 'market' resValue "string", "APP_CHANNEL", "nielamu" - manifestPlaceholders = [CHANNEL_VALUE: "nielamu", CITY_CODE: "642437"] + manifestPlaceholders = [CHANNEL_VALUE: "nielamu", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642437", + CITY_CODE : "540235000000", + BD_KEY : "EZOGc1TFrNolwpiwDNWgaTIzCYQOKrk0", + APP_NAME : "聂拉木县数字文化云"] } saga { applicationId "com.tenlion.cultural.saga" dimension 'market' resValue "string", "APP_CHANNEL", "saga" - manifestPlaceholders = [CHANNEL_VALUE: "saga", CITY_CODE: "642489"] + manifestPlaceholders = [CHANNEL_VALUE: "saga", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642489", + CITY_CODE : "540236000000", + BD_KEY : "FzlGpMenDV34XFpGWIuiO4s6Tw2otlIK", + APP_NAME : "萨嘎县数字文化云"] } gangba { applicationId "com.tenlion.cultural.gangba" dimension 'market' resValue "string", "APP_CHANNEL", "gangba" - manifestPlaceholders = [CHANNEL_VALUE: "gangba", CITY_CODE: "642536"] + manifestPlaceholders = [CHANNEL_VALUE: "gangba", + APP_LOGO : "@drawable/app_logo", + CITY_ID : "642536", + CITY_CODE : "540237000000", + BD_KEY : "PCSYjtiOsUEBCpK5SjZ2xsBN55jqfsIl", + APP_NAME : "岗巴县数字文化云"] } } - buildToolsVersion '30.0.2' + } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2394036..b270eec 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,26 +1,34 @@ + android:usesCleartextTraffic="true" + tools:replace="android:label"> + + --> + android:value="${BD_KEY}" /> diff --git a/camera/src/main/AndroidManifest.xml b/camera/src/main/AndroidManifest.xml index 585dd49..c54de3b 100755 --- a/camera/src/main/AndroidManifest.xml +++ b/camera/src/main/AndroidManifest.xml @@ -6,7 +6,6 @@ userInfos; - public String getAvatar() { - return avatar; + public String getUserAvatar() { + return userAvatar; } - public void setAvatar(String avatar) { - this.avatar = avatar; + public void setUserAvatar(String userAvatar) { + this.userAvatar = userAvatar; } - public String getEmail() { - return email; + public String getUserEmail() { + return userEmail; } - public void setEmail(String email) { - this.email = email; + public void setUserEmail(String userEmail) { + this.userEmail = userEmail; } - public String getName() { - return name; + public String getUserName() { + return userName; } - public void setName(String name) { - this.name = name; + public void setUserName(String userName) { + this.userName = userName; } - public String getPhone() { - return phone; + public String getUserPhone() { + return userPhone; } - public void setPhone(String phone) { - this.phone = phone; + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; } public List getUserInfos() { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java index 97fdcc8..853ae1b 100644 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java @@ -34,9 +34,9 @@ public class SaveUserInfoBean { private String userZipCode; // @ApiModelProperty(name = "userIntroduction", value = "人员简介") private String userIntroduction; - private String name; - private String email; - private String phone; + private String userName; + private String userEmail; + private String userPhone; public String getUserRealName() { return userRealName; @@ -166,27 +166,27 @@ public class SaveUserInfoBean { this.userIntroduction = userIntroduction; } - public String getName() { - return name; + public String getUserName() { + return userName; } - public void setName(String name) { - this.name = name; + public void setUserName(String userName) { + this.userName = userName; } - public String getEmail() { - return email; + public String getUserEmail() { + return userEmail; } - public void setEmail(String email) { - this.email = email; + public void setUserEmail(String userEmail) { + this.userEmail = userEmail; } - public String getPhone() { - return phone; + public String getUserPhone() { + return userPhone; } - public void setPhone(String phone) { - this.phone = phone; + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; } } 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 8077cac..63f8253 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 @@ -10,11 +10,11 @@ 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 = "http://49.233.36.36:58099/xzszwhy/";/* 测试IP */ + public static final String IP = "http://121.36.71.250:58050/xzszwhy/";/* 测试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://49.233.36.36:58099/xzszwhy/"; + public static final String BASE_SYSTEM_IP = "http://121.36.71.250:58050/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 PROJECT_NAME = "app/"; 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 a91ccf2..858f022 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 @@ -77,7 +77,8 @@ public interface BaseApiService { */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @GET("appversion/getappversionnumber/{appVersionId}") - Observable doCheckAppVersionByToken(@Path("appVersionId") String appVersionId, @Header("token") String token); + Observable doCheckAppVersionByToken(@Path("appVersionId") String appVersionId, + @Header("token") String token); /** * 获取App版本 @@ -85,7 +86,7 @@ public interface BaseApiService { * * @return */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) + @Headers({"Content-Type: application/json", "Accept: application/json", "is_need_area:false"}) @GET("app/appversion/get-number/{appVersionId}") Observable doCheckAppVersion(@Path("appVersionId") String appVersionId); @@ -106,12 +107,14 @@ public interface BaseApiService { @Headers({"base_url_name:social"}) @Multipart @POST("app/file/uploadimage") - Observable uploadImageToSocialByMap(@PartMap Map params, @Header("token") String token); + Observable uploadImageToSocialByMap(@PartMap Map params, + @Header("token") String token); @Headers({"base_url_name:social"}) @Multipart @POST("app/file/uploadimage") - Observable uploadImageToSocialBySingle(@Part MultipartBody.Part file, @Header("token") String token); + Observable uploadImageToSocialBySingle(@Part MultipartBody.Part file, + @Header("token") String token); /** * 上传图片文件 @@ -192,7 +195,8 @@ public interface BaseApiService { */ @Headers({"Content-Type:application/json", "Accept:application/json"}) @GET("app/data/listbyparentid/{dataParentId}") - Observable> getSystemDictionary(@Path("dataParentId") String id, @Header("token") String token); + Observable> getSystemDictionary(@Path("dataParentId") String id, + @Header("token") String token); /** * 用户注册 @@ -221,7 +225,8 @@ public interface BaseApiService { */ @Headers({"Content-Type:application/json", "Accept:application/json"}) @PUT("app/base/userexpand/update-byuserid/{userId}") - Observable editUserInfo(@Path("userId") String id, @Body RequestBody body, @Header("token") String token); + Observable editUserInfo(@Path("userId") String id, @Body RequestBody body, + @Header("token") String token); /** * 获取用户拓展信息 @@ -248,7 +253,8 @@ public interface BaseApiService { */ @Headers({"Content-Type:application/json", "Accept:application/json"}) @PUT("app/user/update-phone-username/{phone}") - Observable doChangePhone(@Body RequestBody body, @Path("phone") String phone, @Header("token") String token); + Observable doChangePhone(@Body RequestBody body, @Path("phone") String phone, + @Header("token") String token); /** * 修改密码 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 2d145c0..cf6d377 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,9 +1,6 @@ package com.sucstepsoft.cm_utils.core.retrofit_net.conver; -import android.text.TextUtils; - 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; @@ -11,11 +8,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; -import okhttp3.FormBody; import okhttp3.HttpUrl; import okhttp3.Interceptor; -import okhttp3.MediaType; -import okhttp3.MultipartBody; import okhttp3.Request; import okhttp3.RequestBody; import okio.Buffer; @@ -37,105 +31,23 @@ public class AreaInterceptor implements Interceptor { } String name = "area" + cityLevel; String areaId = UserLgUtils.getCurrentCityCode(); - if (TextUtils.isEmpty(areaId)) { - areaId = PathConfig.CITY_DEFAULT_CODE; - } - HttpUrl modifiedUrl = originalRequest.url().newBuilder() - .addQueryParameter(name, areaId) - .build(); - request = originalRequest.newBuilder().url(modifiedUrl).build(); - return chain.proceed(request); - // Request oldRequest = chain.request(); -// Request.Builder newRequestBuild = null; -// String method = oldRequest.method(); -// String postBodyString = ""; -// -// if ("POST".equals(method)) { -// RequestBody oldBody = oldRequest.body(); -// if (oldBody instanceof FormBody) { -// LogUtils.e("FormBody"); -// FormBody.Builder formBodyBuilder = new FormBody.Builder(); - -// formBodyBuilder.add(name, areaId); -// newRequestBuild = oldRequest.newBuilder(); -// RequestBody formBody = formBodyBuilder.build(); -// postBodyString = bodyToString(oldRequest.body()); -// postBodyString += ((postBodyString.length() > 0) ? "&" : "") + bodyToString(formBody); -// newRequestBuild.post(RequestBody.create(MediaType.parse("application/json;charset=UTF-8"), postBodyString)); -// } else if (oldBody instanceof MultipartBody) { -// LogUtils.e("MultipartBody"); -// MultipartBody oldBodyMultipart = (MultipartBody) oldBody; -// List oldPartList = oldBodyMultipart.parts(); -// MultipartBody.Builder builder = new MultipartBody.Builder(); -// builder.setType(MultipartBody.FORM); -// int cityLevel = UserLgUtils.getCityLevel(); -// if (cityLevel == -1) { -// cityLevel = PathConfig.CITY_DEFAULT_LEVEL; -// } -// String name = "area" + cityLevel; -// RequestBody requestBody1 = RequestBody.create(MediaType.parse("text/plain"), name); -// String areaId = UserLgUtils.getCurrentCityCode(); -// if (TextUtils.isEmpty(areaId)) { -// areaId = PathConfig.CITY_DEFAULT_CODE; -// } -// MultipartBody.Part partBody = MultipartBody.Part.createFormData(name, areaId, requestBody1); -// for (MultipartBody.Part part : oldPartList) { -// builder.addPart(part); -// postBodyString += (bodyToString(part.body()) + "\n"); -// } -// postBodyString += (bodyToString(requestBody1) + "\n"); -// builder.addPart(partBody); -// newRequestBuild = oldRequest.newBuilder(); -// newRequestBuild.post(builder.build()); -// } else { -// LogUtils.e("else"); -// newRequestBuild = oldRequest.newBuilder(); -// FormBody.Builder formBodyBuilder = new FormBody.Builder(); -// formBodyBuilder.addEncoded("Content-Type", "application/json;charset=UTF-8"); -// int cityLevel = UserLgUtils.getCityLevel(); -// if (cityLevel == -1) { -// cityLevel = PathConfig.CITY_DEFAULT_LEVEL; -// } -// String name = "area" + cityLevel; -// String areaId = UserLgUtils.getCurrentCityCode(); -// if (TextUtils.isEmpty(areaId)) { -// areaId = PathConfig.CITY_DEFAULT_CODE; -// } -// FormBody token = formBodyBuilder.add(name, areaId).build(); -// newRequestBuild.post(token); -// } -// } else { -// // 添加新的参数 -// int cityLevel = UserLgUtils.getCityLevel(); -// if (cityLevel == -1) { -// cityLevel = PathConfig.CITY_DEFAULT_LEVEL; -// } -// String name = "area" + cityLevel; -// String areaId = UserLgUtils.getCurrentCityCode(); -// if (TextUtils.isEmpty(areaId)) { -// areaId = PathConfig.CITY_DEFAULT_CODE; -// } -// -// HttpUrl.Builder commonParamsUrlBuilder = oldRequest.url() -// .newBuilder() -// .scheme(oldRequest.url().scheme()) -// .host(oldRequest.url().host()) -// .addQueryParameter(name, areaId); -// newRequestBuild = oldRequest.newBuilder() -// .method(oldRequest.method(), oldRequest.body()) -// .url(commonParamsUrlBuilder.build()); +// if (TextUtils.isEmpty(areaId)) { +// areaId = PathConfig.CITY_DEFAULT_CODE; // } -// Request newRequest = newRequestBuild -// .addHeader("Accept", "application/json") -// .addHeader("Accept-Language", "zh") -// .build(); -// -// okhttp3.Response response = chain.proceed(newRequest); -// MediaType mediaType = response.body().contentType(); -// String content = response.body().string(); -// return response.newBuilder() -// .body(okhttp3.ResponseBody.create(mediaType, content)) -// .build(); +// String cityId = UserLgUtils.getCityId(); + //判断是否需要添加 + List baseUrlName = originalRequest.headers("is_need_area"); + if (baseUrlName.size() <= 0) { + //需要添加 + HttpUrl modifiedUrl = originalRequest.url().newBuilder() + .addPathSegment(areaId) + .build(); + request = originalRequest.newBuilder().url(modifiedUrl).build(); + } else { + request = originalRequest; + } + return chain.proceed(request); + } private static String bodyToString(final RequestBody request) { @@ -155,17 +67,6 @@ public class AreaInterceptor implements Interceptor { private HashMap buildPublicParams() { HashMap params = new HashMap<>(); params.put("token", UserInfoSPUtils.getToken()); -// try { -// params.put("strName", BluetoothAdapter.getDefaultAdapter().getName() == null ? "" : BluetoothAdapter.getDefaultAdapter().getName());//手机系统版名称 -// params.put("strSysName", "Android");//手机系统版名称 -// params.put("strSysVersion", android.os.Build.VERSION.RELEASE == null ? "" : android.os.Build.VERSION.RELEASE);//手机系统版本号 -// params.put("phoneModel", android.os.Build.MODEL == null ? "" : android.os.Build.MODEL);//手机型号 -// params.put("strAppName", AppUtils.getAppName());//应用名称 -// params.put("strAppVersion", AppUtils.getAppVersionName());//应用版本名称 -// params.put("strAppBuild", String.valueOf(AppUtils.getAppVersionCode()));//应用版本号 -// } catch (Exception e) { -// LogUtils.e("Public parameter acquisition failed"); -// } return params; } 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 0fc75e3..7b8f9f5 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 @@ -1,7 +1,5 @@ package com.sucstepsoft.cm_utils.utils; -import com.nightonke.boommenu.Animation.BoomEnum; - public class UserLgUtils { // // private String id; @@ -195,4 +193,28 @@ public class UserLgUtils { public static void setCityLevel(int level) { SPUtils.getInstance(SP_USER_INFO).put("cityLevel", level); } + + public static void setAppName(String appName) { + SPUtils.getInstance(SP_USER_INFO).put("appName", appName); + } + + public static String getAppName() { + 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); + } } diff --git a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/net/ApiActivity.java b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/net/ApiActivity.java index af08bd5..13344db 100755 --- a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/net/ApiActivity.java +++ b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/net/ApiActivity.java @@ -62,7 +62,7 @@ public interface ApiActivity { * @param id * @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:false"}) @GET("app/dictionaryself/listdictionarybyparentidrelease/{dictionaryParentId}") Observable> getActivityTypeList(@Path("dictionaryParentId") String id); 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 8b68588..f59ccd3 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/net/CulturalApi.java @@ -331,7 +331,7 @@ public interface CulturalApi { * 直播回放列表 * http://192.168.0.104:8084/live/ */ - @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json"}) + @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); @@ -339,7 +339,7 @@ public interface CulturalApi { * 直播详情 * http://192.168.0.104:8084/live/app/liveplan/listpageliveplanrelease */ - @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json" ,"is_need_area:false"}) @GET("app/liveplan/getliveplanbyidrelease/{livePlanId}") Observable getLiveDetail(@Path("livePlanId") String id); @@ -347,7 +347,7 @@ public interface CulturalApi { * 直播回放文件 * GET /app/liverecord/listpageliverecordrelease/{planId} */ - @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json"}) + @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json" ,"is_need_area:false"}) @GET("app/liverecord/listpageliverecordrelease/{planId}") Observable getLiveFiles(@Path("planId") String id, @Query("page") String page); 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 c1af923..0ddfbd7 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 @@ -77,7 +77,7 @@ public class MainActivity extends BaseActivity { @Override public void initData() { mBind = ButterKnife.bind(this); - mTvBaseTitle.setText("日喀则市数字文化云"); + mTvBaseTitle.setText(UserLgUtils.getAppName()); refreshView(STATE_LOAD_SUCCESS); mIbBack.setVisibility(View.GONE); mRlTitleBar1.setVisibility(View.VISIBLE); @@ -100,6 +100,7 @@ public class MainActivity extends BaseActivity { } mVpContent.setAdapter(new MyFragmentPageAdapter(this)); mVpContent.setUserInputEnabled(false); + //TODO 系统字体 // mBnv.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); mBnv.setTypeface(Typeface.DEFAULT); @@ -117,10 +118,10 @@ public class MainActivity extends BaseActivity { mRlTitleBar1.setVisibility(View.VISIBLE); mIvInto.setVisibility(View.GONE); mVpContent.setCurrentItem(0, false); - mTvBaseTitle.setText("日喀则市数字文化云"); - mTvAppBack.setVisibility(View.VISIBLE); - String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); - mTvAppBack.setText(city); + mTvBaseTitle.setText(UserLgUtils.getAppName()); + mTvAppBack.setVisibility(View.GONE); +// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); +// mTvAppBack.setText(city); return true; } else if (itemId == R.id.tab_activity) { ImmersionBar.with(this) @@ -191,12 +192,12 @@ public class MainActivity extends BaseActivity { }); mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar1.setVisibility(View.VISIBLE); - mTvAppBack.setVisibility(View.VISIBLE); - String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); - mTvAppBack.setText(city); - mTvAppBack.setOnClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) - .navigation(mActivity, 1234)); + mTvAppBack.setVisibility(View.GONE); +// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); +// mTvAppBack.setText(city); +// mTvAppBack.setOnClickListener(v -> ARouter.getInstance() +// .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) +// .navigation(mActivity, 1234)); doCheckPermission(); checkAppVersion(); getUserInfo(); 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 3821686..e18c3b4 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,8 +9,8 @@ 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; import com.tengshisoft.mudulemain.R; @@ -39,7 +39,7 @@ public class SplashActivity extends BaseActivity { refreshView(STATE_LOAD_SUCCESS); ImmersionBar.with(this).init(); mRlTitleBar1.setVisibility(View.GONE); - + getCityCode(); PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION, PermissionConstants.PHONE) .callback(new PermissionUtils.SimpleCallback() { @Override @@ -84,16 +84,22 @@ public class SplashActivity extends BaseActivity { }).request(); } + /** * 获取城市代码 */ private void getCityCode() { String cityCode = ""; + String cityId = ""; try { 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); + String appName = String.valueOf(info.metaData.get("APP_NAME")); + UserLgUtils.setAppName(appName); } catch (Exception e) { e.printStackTrace(); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java index 854a1c3..a86d2aa 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java @@ -25,6 +25,11 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.core.content.FileProvider; +import androidx.core.widget.NestedScrollView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; @@ -43,6 +48,7 @@ import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider; import com.sucstepsoft.cm_utils.core.widget.views.NestedScrollWebView; import com.sucstepsoft.cm_utils.utils.ExceptionHandler; +import com.sucstepsoft.cm_utils.utils.FileUtils; import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.TimeUtils; @@ -65,10 +71,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import androidx.core.content.FileProvider; -import androidx.core.widget.NestedScrollView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -158,40 +160,42 @@ public class NewsDetailActivity extends BaseActivity { mUrl = getIntent().getStringExtra("url"); mTitle = getIntent().getStringExtra("title"); mPhoto = getIntent().getStringExtra("photo"); - Observable.create((ObservableOnSubscribe) emitter -> { - emitter.onNext(Glide.with(mActivity) - .asFile() - .load(mPhoto) - .submit(300, 300) - .get()); - emitter.onComplete(); - }).subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + if (!TextUtils.isEmpty(mPhoto) && !mPhoto.endsWith("/")) { + Observable.create((ObservableOnSubscribe) emitter -> { + emitter.onNext(Glide.with(mActivity) + .asFile() + .load(mPhoto) + .submit(300, 300) + .get()); + emitter.onComplete(); + }).subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(File file) { + @Override + public void onNext(File file) { -// File externalFilesDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES); -// String fileName = System.currentTimeMillis() + ".jpg"; -// mDestFile = new File(externalFilesDir, fileName); -// FileUtils.copyFile(file, mDestFile); - } + File externalFilesDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES); + String fileName = System.currentTimeMillis() + ".jpg"; + mDestFile = new File(externalFilesDir, fileName); + FileUtils.copyFile(file, mDestFile); + } - @Override - public void onError(Throwable e) { + @Override + public void onError(Throwable e) { - } + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); + } //是否可以评论 mIsComment = getIntent().getStringExtra("isComment"); if ("0".equals(mIsComment)) { @@ -256,7 +260,7 @@ public class NewsDetailActivity extends BaseActivity { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - if (url.contains(BaseUrlApi.BASE_SYSTEM_IP+"news/route/file/download/true")) { + if (url.contains(BaseUrlApi.BASE_SYSTEM_IP + "news/route/file/download/true")) { //TODO 数图资源 ARouter.getInstance() .build(PathConfig.PATH_MODULE_MAIN_NEWS_PDF) @@ -285,7 +289,8 @@ public class NewsDetailActivity extends BaseActivity { }); LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false); mRlvComment.setLayoutManager(manager); - mRlvComment.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2"))); + mRlvComment.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, + Color.parseColor("#F2F2F2"))); mRlvComment.setAdapter(mAdapter); mSrlContent.setEnableRefresh(false); mAdapter.addCommentListener(this::doCommentItem); @@ -413,7 +418,8 @@ public class NewsDetailActivity extends BaseActivity { @Override public void onError(Platform platform, int i, int i1, Throwable throwable) { - if (!TextUtils.isEmpty(throwable.getMessage()) && throwable.getMessage().contains("not install app")) { + if (!TextUtils.isEmpty(throwable.getMessage()) && throwable.getMessage().contains("not install " + + "app")) { String name = "微信"; if (type == 1) { name = "微信"; @@ -956,7 +962,8 @@ public class NewsDetailActivity extends BaseActivity { @Override public void onSuccess(File file) { RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); - MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); + MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), + requestFile); RetrofitManager.getInstance() .create(HomeApi.class) .uploadImage(body, UserLgUtils.getToken()) diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java index 06e4125..946f4fd 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java @@ -8,6 +8,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ethanhua.skeleton.RecyclerViewSkeletonScreen; @@ -47,10 +52,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -115,12 +116,15 @@ public class HomeFragment extends BaseFragment { setStateView(STATE_SUCCESS); mSrlView.setEnableLoadMore(false); mSrlView.setEnableRefresh(false); -// mLlMainNews.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation()); +// mLlMainNews.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN) +// .navigation()); mRlvMainNews.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false)); - mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2"))); + mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, + Color.parseColor("#F2F2F2"))); mRlvMainNews.setAdapter(mMAdapter); mRlvLives.setLayoutManager(new GridLayoutManager(mActivity, 2)); - mRlvLives.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2"))); + mRlvLives.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, + Color.parseColor("#F2F2F2"))); mLiveAdapter = new LiveAdapter(mActivity, mLiveBeans); mRlvLives.setAdapter(mLiveAdapter); mMAdapter = new NewsAdapter(mActivity, mNewsBeans); @@ -221,7 +225,8 @@ public class HomeFragment extends BaseFragment { }); // ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation() // ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation() -// mLlLive.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation()); +// mLlLive.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE) +// .navigation()); } @@ -395,7 +400,8 @@ public class HomeFragment extends BaseFragment { .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("photo", + BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("title", rowsBean.getNewsContentTitle()) .withInt("type", newsType) .navigation(); @@ -425,7 +431,8 @@ public class HomeFragment extends BaseFragment { BaseImageBean bean = new BaseImageBean(); bean.setName(rows.get(i).getNewsContentTitle()); bean.setId(rows.get(i).getNewsContentId()); - List newsContentCoverList = rows.get(i).getNewsContentCoverList(); + List newsContentCoverList = + rows.get(i).getNewsContentCoverList(); String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId(); bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId); bean.setUrl(rowsBean.getTemplateRecordUrl()); @@ -461,7 +468,7 @@ public class HomeFragment extends BaseFragment { private void buildBannerData() { mBannerList.clear(); BaseImageBean bean = new BaseImageBean(); - bean.setName("日喀则市数字文化云"); + bean.setName(UserLgUtils.getAppName()); mBannerList.add(bean); mBannerImageAdapter = new BannerImageTextAdapter(mBannerList); mBanner.setAdapter(mBannerImageAdapter); 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 47195b1..9537666 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 @@ -243,7 +243,7 @@ public interface HomeApi { * 直播回放列表 * http://192.168.0.104:8084/live/ */ - @Headers({"base_url_name:live", "Content-Type:application/json", "Accept:application/json"}) + @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); diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoDetailActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoDetailActivity.java index 8694e5a..d6306db 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoDetailActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoDetailActivity.java @@ -181,9 +181,9 @@ public class MineInfoDetailActivity extends BaseActivity { private EditUserInfo buildConfirmUserInfo() { EditUserInfo userInfo = new EditUserInfo(); String email = mEtEmail.getText().toString().trim(); - userInfo.setEmail(email); + userInfo.setUserEmail(email); String nickName = mEtName.getText().toString().trim(); - userInfo.setName(nickName); + userInfo.setUserName(nickName); List infoBeans = new ArrayList<>(); if (mAllViews != null && mAllViews.size() > 0) { LogUtils.e(mAllViews.size()); diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java index ac1ddf1..d7aa0dd 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java @@ -226,9 +226,9 @@ public class MineInfoEditActivity extends BaseActivity { private EditUserInfo buildConfirmUserInfo() { EditUserInfo userInfo = new EditUserInfo(); String email = mEtEmail.getText().toString().trim(); - userInfo.setEmail(email); + userInfo.setUserEmail(email); String nickName = mEtName.getText().toString().trim(); - userInfo.setName(nickName); + userInfo.setUserName(nickName); List infoBeans = new ArrayList<>(); if (mAllViews != null && mAllViews.size() > 0) { LogUtils.e(mAllViews.size()); diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java index 02d2d6f..ff9717e 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java @@ -383,11 +383,11 @@ public class NewMineInfoEditActivity extends BaseActivity { private RequestBody buildConfirmUserInfo() { SaveUserInfoBean bean = new SaveUserInfoBean(); String nickName = mEtNickName.getText().toString().trim(); - bean.setName(nickName); + bean.setUserName(nickName); String email = mEtEmail.getText().toString().trim(); - bean.setEmail(email); + bean.setUserEmail(email); String phone = mEtPhone.getText().toString().trim(); - bean.setPhone(phone); + bean.setUserPhone(phone); String name = mEtName.getText().toString().trim(); bean.setUserRealName(name); if (mSelSex != null) {