From 5b639d78cf8ea8e286c581e4bfa06cee4edba020 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 15 Jul 2019 11:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 -- .../java/com/gh/common/constant/Config.java | 5 -- .../adapter/MessageDetailAdapter.java | 10 +-- .../retrofit/service/CommentService.java | 64 ------------------ .../retrofit/service/LibaoService.java | 67 ------------------- .../retrofit/service/MessageService.java | 60 ----------------- .../retrofit/service/UserService.java | 41 ------------ gradle.properties | 12 +--- 8 files changed, 8 insertions(+), 257 deletions(-) delete mode 100644 app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java delete mode 100644 app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java delete mode 100644 app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java delete mode 100644 app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java diff --git a/app/build.gradle b/app/build.gradle index 4448b972e5..79f1ec2644 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,10 +113,7 @@ android { publish { dimension "nonsense" buildConfigField "String", "API_HOST", "\"${API_HOST}\"" - buildConfigField "String", "USER_HOST", "\"${USER_HOST}\"" buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\"" - buildConfigField "String", "LIBAO_HOST", "\"${LIBAO_HOST}\"" - buildConfigField "String", "MESSAGE_HOST", "\"${MESSAGE_HOST}\"" buildConfigField "String", "DATA_HOST", "\"${DATA_HOST}\"" buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\"" @@ -134,10 +131,7 @@ android { versionNameSuffix "-debug" buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\"" - buildConfigField "String", "USER_HOST", "\"${DEV_USER_HOST}\"" buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\"" - buildConfigField "String", "LIBAO_HOST", "\"${DEV_LIBAO_HOST}\"" - buildConfigField "String", "MESSAGE_HOST", "\"${DEV_MESSAGE_HOST}\"" buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\"" buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\"" diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 2e2c813e1f..eb4939ad6b 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -20,17 +20,12 @@ import java.util.List; public class Config { public static final String API_HOST = BuildConfig.API_HOST; - public static final String USER_HOST = BuildConfig.USER_HOST; public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST; public static final String DATA_HOST = BuildConfig.DATA_HOST; - public static final String LIBAO_HOST = BuildConfig.LIBAO_HOST; - public static final String MESSAGE_HOST = BuildConfig.MESSAGE_HOST; /** * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)} */ -// @Deprecated -// public static final String PREFERENCE = "ghzhushou"; // Third-Party confs public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 4fdd4db63d..8c552e0861 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -386,16 +386,16 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { CheckLoginUtils.checkLogin(mContext, "资讯文章详情-评论详情-点赞", () -> CommentUtils.postVote(mContext, finalCommentEntity, holder.commentLikeCountTv, holder.commentLikeIv, () -> { - int index1 = (finalCommentPosition / 10) * 10; + int index1 = (finalCommentPosition / 10); // todo index1 有可能不等于 page //获取需要修改缓存的链接 String cacheUrl; if (finalIsHotComment) { - cacheUrl = StringUtils.buildString(Config.COMMENT_HOST, "article/", mConcernEntity.getId(), - "/comment?order=hot&limit=10", "&offset=0"); // 热门评论固定链接 + cacheUrl = StringUtils.buildString(Config.API_HOST, "article/", mConcernEntity.getId(), + "/comments?filter=order:hot&page_size=10", "&page=1"); // 热门评论固定链接 } else { - cacheUrl = StringUtils.buildString(Config.COMMENT_HOST, "article/", mConcernEntity.getId(), - "/comment?limit=10&offset=", String.valueOf(index1)); + cacheUrl = StringUtils.buildString(Config.API_HOST, "article/", mConcernEntity.getId(), + "/comments?page_size=10&page=", String.valueOf(index1)); } modifyVolleyCache(finalCommentEntity.getId(), cacheUrl); //修改缓存 diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java deleted file mode 100644 index 8069b0fb8a..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java +++ /dev/null @@ -1,64 +0,0 @@ -//package com.gh.gamecenter.retrofit.service; -// -//import com.gh.gamecenter.entity.CommentEntity; -//import com.gh.gamecenter.entity.CommentnumEntity; -// -//import java.util.List; -// -//import okhttp3.RequestBody; -//import okhttp3.ResponseBody; -//import retrofit2.http.Body; -//import retrofit2.http.GET; -//import retrofit2.http.Header; -//import retrofit2.http.Headers; -//import retrofit2.http.POST; -//import retrofit2.http.Path; -//import retrofit2.http.Query; -//import rx.Observable; -// -///** -// * Created by LGT on 2016/11/9. -// * comment.ghzs666.com -// */ -//public interface CommentService { -// -// @GET("article/{ids}/comment/num") -// // 获取新闻评论数 -// Observable> getNewsCommentnum(@Path("ids") String ids); -// -// @POST("report") -// //提交投诉信息 -// Observable postReportData(@Body RequestBody reportData, @Header("TOKEN") String token); -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("article/{news_id}/comment") -// // 发布评论 -// Observable postNewsComment(@Header("TOKEN") String token, @Path("news_id") String news_id, -// @Body RequestBody body); -// -// @POST("comment/{comment_id}/vote") -// // 评论点赞 -// Observable postCommentVote(@Header("TOKEN") String token, @Path("comment_id") String comment_id); -// -// @GET("article/{news_id}/comment?order=hot") -// // 获取新闻评论 -// Observable> getHotComment(@Path("news_id") String news_id, @Query("limit") int limit, -// @Query("offset") int offset); -// -// @GET("article/{news_id}/comment") -// // 获取新闻评论 -// Observable> getComment(@Path("news_id") String news_id, @Query("limit") int limit, -// @Query("offset") int offset); -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("article/comment/{comment_id}/reply") -// // 发布评论 -// Observable postReplyComment(@Header("TOKEN") String token, @Path("comment_id") String comment_id, -// @Body RequestBody body); -// -// @GET("article/comment/{comment_id}/trace") -// // 获取评论对话 -// Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("limit") int limit, -// @Query("offset") int offset); -// -//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java deleted file mode 100644 index a80d195251..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java +++ /dev/null @@ -1,67 +0,0 @@ -//package com.gh.gamecenter.retrofit.service; -// -//import com.gh.gamecenter.entity.LibaoDetailEntity; -//import com.gh.gamecenter.entity.LibaoEntity; -//import com.gh.gamecenter.entity.LibaoStatusEntity; -// -//import java.util.List; -// -//import okhttp3.ResponseBody; -//import retrofit2.http.DELETE; -//import retrofit2.http.GET; -//import retrofit2.http.Header; -//import retrofit2.http.POST; -//import retrofit2.http.Path; -//import retrofit2.http.Query; -//import rx.Observable; -// -///** -// * libao.ghzs666.com -// */ -//public interface LibaoService { -// -// @GET("libao?limit=20") -// Observable> getLibao(@Query("offset") int offset); //获取礼包列表数据 -// -// @GET("libao?limit=20") -// Observable> getLibaoBySearch(@Query("keyword") String searchKey, @Query("offset") int offset); //搜索礼包列表数据 -// -// @GET("libao?limit=20") -// Observable> getLibaoByConcern(@Query("key") String key, @Query("offset") int offset); //关注礼包列表数据 -// -// @GET("libao") -// Observable> getLibaoByGame(@Query("game_id") String libaoId, -// @Query("offset") int offset, @Query("limit") int limit); //获取游戏详情礼包数据 -// -// @GET("libao/{libao_id}/detail") -// Observable getLibaoDetail(@Path("libao_id") String libaoId); //获取礼包详情数据 -// -// @GET("libao/{libao_id}/digest") -// Observable getLibaoDigest(@Path("libao_id") String libaoId); //获取礼包摘要数据 -// -// @GET("libao/status") -// Observable> getLibaoStatus(@Query("ids") String libaoIds); //获取礼包领取按钮状态 -// -// @GET("libao/cunhaoxiang") -// Observable> getCunHaoXiang(@Header("TOKEN") String token); // 获取礼包存号箱数据 -// -// @POST("libao/{libao_id}/ling") -// Observable postLibaoLing(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 领取礼包 -// -// @POST("libao/{libao_id}/ling") -// Observable postLibaoLing(@Header("TOKEN") String token, @Header("CODE") String captchaCode, -// @Path("libao_id") String libaoId); // 领取礼包 带验证数据 -// -// @POST("libao/{libao_id}/tao") -// Observable postLibaoTao(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 礼包 淘号 -// -// @DELETE("libao/code/{code}") -// Observable deleteLibaoCode(@Header("TOKEN") String token, @Path("code") String code); //删除存号箱的礼包 -// -// @POST("libao/captcha") -// Observable getCaptchaData(@Header("TOKEN") String token); //获取验证码数据 -// -// @GET("libao") -// Observable> getHistoryLibao(@Query("history") String history, @Query("offset") int offset); //获取历史礼包数据 -// -//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java deleted file mode 100644 index 85e9506f69..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java +++ /dev/null @@ -1,60 +0,0 @@ -//package com.gh.gamecenter.retrofit.service; -// -//import com.gh.gamecenter.entity.MessageCommentEntity; -//import com.gh.gamecenter.entity.MessageKeFuEntity; -//import com.gh.gamecenter.entity.MessageNoticeEntity; -//import com.gh.gamecenter.entity.MessageUnreadEntity; -// -//import java.util.List; -// -//import okhttp3.RequestBody; -//import okhttp3.ResponseBody; -//import retrofit2.http.Body; -//import retrofit2.http.GET; -//import retrofit2.http.Header; -//import retrofit2.http.Headers; -//import retrofit2.http.POST; -//import retrofit2.http.Query; -//import rx.Observable; -// -///** -// * Created by khy on 2017/4/25. -// */ -// -//public interface MessageService { -// -// @GET("message/private") -// Observable> getMessageKeFuData(@Header("TOKEN") String token, -// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 -// -// @GET("message/sync") -// Observable getMessageUnread(@Header("TOKEN") String token); // 获取消息未读数据 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("message/private/confirm/receive") -// Observable postKeFuDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //确认接收客服消息 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("message/private/confirm/read") -// Observable postMarkKeFuRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 -// -// @GET("message/user/announcement") -// Observable> getMessageNoticeData(@Header("TOKEN") String token, -// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("message/user/announcement/confirm/read") -// Observable postMarkNoticeRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读公告消息 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("message/user/announcement/confirm/receive") -// Observable postNoticeDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 -// -// @GET("message/user/comment") -// Observable> getMessageCommentData(@Header("TOKEN") String token, -// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-评论数据 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("message/user/comment/confirm/read") -// Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读评论消息 -//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java deleted file mode 100644 index 57288335ee..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java +++ /dev/null @@ -1,41 +0,0 @@ -//package com.gh.gamecenter.retrofit.service; -// -//import okhttp3.RequestBody; -//import okhttp3.ResponseBody; -//import retrofit2.http.Body; -//import retrofit2.http.Header; -//import retrofit2.http.Headers; -//import retrofit2.http.POST; -//import retrofit2.http.Path; -//import rx.Observable; -// -///** -// * Created by LGT on 2016/12/5. -// * user.ghzs666.com -// */ -//public interface UserService { -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("name") -// Observable postName(@Header("TOKEN") String token, @Body RequestBody body); // 修改昵称 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("device/{device_id}") -// Observable postDevice(@Header("TOKEN") String token, @Body RequestBody body, -// @Path("device_id") String device_id); // 修改设备信息 -// -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("device/register") -// Observable postRegister(@Body RequestBody body); // 注册设备 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("login") -// Observable postLogin(@Body RequestBody body); // 用户登录 -// -// @Headers({"Content-Type: application/json", "Accept: application/json"}) -// @POST("icon-default") -// // 上传用户所使用的助手信息 -// Observable postDefaultIcon(@Header("TOKEN") String token, @Body RequestBody body); -// -//} diff --git a/gradle.properties b/gradle.properties index d7b31b780e..0ae8a5a6d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,29 +45,23 @@ BUGLY_APPID=d5de44c594 # hosts DEV_API_HOST=https\://dev.api.ghzs666.com/v3d6d6/ -DEV_LIBAO_HOST=https\://dev.api.ghzs666.com/v3d6d6/ -DEV_MESSAGE_HOST=https\://dev.api.ghzs666.com/v3d6d6/ -DEV_USER_HOST=https\://dev.api.ghzs666.com/v3d6d6/ DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d6d6/ DEV_DATA_HOST=http\://data.ghzs666.com/ API_HOST=https\://api.ghzs.com/v3d6d6/ -LIBAO_HOST=https\://api.ghzs.com/v3d6d6/ -MESSAGE_HOST=https\://api.ghzs.com/v3d6d6/ -USER_HOST=https\://api.ghzs.com/v3d6d6/ COMMENT_HOST=https\://api.ghzs.com/v3d6d6/ DATA_HOST=http\://data.ghzs666.com/ -# 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准 +# \u8BF7\u4E0D\u8981\u624B\u52A8\u6539\u52A8\u4E0B\u9762\u7684\u503C\uFF0C\u9664\u975E\u4F60\u660E\u786E\u9700\u8981\u4EE5\u67D0\u4E2Aapk\u4F5C\u4E3A\u57FA\u51C6\u5305\uFF0C\u9700\u8981\u6253\u5305\u8BF7\u4EE5scripts/tinker*.sh\u4E3A\u51C6 TINKER_ENABLE= TINKER_ID=386c7b19 TINKER_BASE_APK_DIR=app-0603-17-52-20_386c7b19 android.useAndroidX=true android.enableJetifier=true -# tinker 要新版本才支持 R8，在没有更新 tinker 的情况下暂时关闭 R8。https://github.com/Tencent/tinker/issues/1099 +# tinker \u8981\u65B0\u7248\u672C\u624D\u652F\u6301 R8\uFF0C\u5728\u6CA1\u6709\u66F4\u65B0 tinker \u7684\u60C5\u51B5\u4E0B\u6682\u65F6\u5173\u95ED R8\u3002https://github.com/Tencent/tinker/issues/1099 android.enableR8 = false -# kapt 编译 +# kapt \u7F16\u8BD1 kapt.use.worker.api = true kapt.incremental.apt = true