diff --git a/app/build.gradle b/app/build.gradle index 8ee3896eaa..f2c6b611a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,7 +123,6 @@ android { publish { dimension "nonsense" buildConfigField "String", "API_HOST", "\"${API_HOST}\"" - buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\"" buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\"" buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\"" @@ -140,7 +139,6 @@ android { versionNameSuffix "-debug" buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\"" - buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\"" buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\"" buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\"" 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 8945f8b6c0..f57530b9bb 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -31,7 +31,6 @@ import io.reactivex.schedulers.Schedulers; public class Config { public static final String API_HOST = BuildConfig.API_HOST; - public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST; /** * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)} diff --git a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java index 79e977e416..beb116d2cf 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java @@ -85,7 +85,7 @@ public class CommentManager { ObservableUtil.io(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - String key = TimestampUtils.addTimestamp(StringUtils.buildString(Config.COMMENT_HOST, "article/", comment_id, "/comment/num")); + String key = TimestampUtils.addTimestamp(StringUtils.buildString(Config.API_HOST, "article/", comment_id, "/comment/num")); byte[] data = OkHttpCache.getCache(context, key); if (data != null) { try { @@ -108,7 +108,7 @@ public class CommentManager { } public void addUrl(String ids) { - String url = StringUtils.buildString(Config.COMMENT_HOST, "article/", ids, "/comment/num"); + String url = StringUtils.buildString(Config.API_HOST, "article/", ids, "/comment/num"); if (!urlList.contains(url)) { urlList.add(url); } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index 4a3b315b8f..25845e0167 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -408,7 +408,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa } private void modifyNewsCommentOkhttpCache(int offset, JSONObject commentData, String id) { - String key = TimestampUtils.addTimestamp(Config.COMMENT_HOST + "article/" + id + "/comment?limit=10&offset=" + offset); + String key = TimestampUtils.addTimestamp(Config.API_HOST + "article/" + id + "/comment?limit=10&offset=" + offset); byte[] data = OkHttpCache.getCache(getContext(), key); if (data != null) { try { diff --git a/gradle.properties b/gradle.properties index 118c72db6f..7547e192c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,11 +46,9 @@ LETO_APPID=1001276 TTAD_APPID=5065631 # hosts -DEV_API_HOST=https\://dev.api.ghzs666.com/v4d0d0/ -DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v4d0d0/ +DEV_API_HOST=https\://dev.api.ghzs666.com/v4d0d1/ API_HOST=https\://api.ghzs.com/v4d0d0/ -COMMENT_HOST=https\://api.ghzs.com/v4d0d0/ # 请不要手动改动下面的值,除非你明确需要以某个apk作为基准包,需要打包请以scripts/tinker*.sh为准 TINKER_ENABLE=