diff --git a/app/build.gradle b/app/build.gradle index 1004f4e14a..ceb6c373de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ android { productFlavors { // public release host pub { - buildConfigField "String", "HOST", "\"${HOST}\"" + buildConfigField "String", "API_HOST", "\"${API_HOST}\"" buildConfigField "String", "USER_HOST", "\"${USER_HOST}\"" buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\"" buildConfigField "String", "LIBAO_HOST", "\"${LIBAO_HOST}\"" @@ -119,7 +119,7 @@ android { } // internal dev host dev { - buildConfigField "String", "HOST", "\"${DEV_HOST}\"" + 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}\"" 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 3cc566cf5a..425a4bbb94 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -9,7 +9,7 @@ import com.gh.gamecenter.BuildConfig; public class Config { - public static final String HOST = BuildConfig.HOST; + 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; diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java index df3c0d827e..e40d6aa6a0 100644 --- a/app/src/main/java/com/gh/common/util/TimestampUtils.java +++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java @@ -23,78 +23,78 @@ public class TimestampUtils { private static void initIntervalMap() { intervalMap = new ArrayMap<>(); - intervalMap.put("^" + Config.HOST + "index/slides" + "$", 5); - intervalMap.put("^" + Config.HOST + "game/chajian" + "$", 10); - intervalMap.put("^" + Config.HOST + "game/tuijian" + "$", 15); - intervalMap.put("^" + Config.HOST + "game/.+/detail" + "$", 20); - intervalMap.put("^" + Config.HOST + "game/.+/digest" + "$", 25); - intervalMap.put("^" + Config.HOST + "game/remenkapai" + "$", 30); - intervalMap.put("^" + Config.HOST + "game/.+/news_digest" + "$", 35); - intervalMap.put("^" + Config.HOST + "game/column/.+\\?page=.+" + "$", 40); - intervalMap.put("^" + Config.HOST + "support/package/.+/game/digest" + "$", 45); - intervalMap.put("^" + Config.HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", 50); - intervalMap.put("^" + Config.HOST + "news/.+/digest" + "$", 55); - intervalMap.put("^" + Config.HOST + "news/.+/detail" + "$", 60); - intervalMap.put("^" + Config.HOST + "news/.+/suggestion" + "$", 65); - intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=3" + "$", 70); - intervalMap.put("^" + Config.HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", 75); - intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", 80); - intervalMap.put("^" + Config.HOST + "zixun/yuanchuang\\?limit=20\\&offset=.+" + "$", 85); - intervalMap.put("^" + Config.HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", 90); - intervalMap.put("^" + Config.HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", 95); - intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", 100); - intervalMap.put("^" + Config.HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", 105); - intervalMap.put("^" + Config.HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", 110); - intervalMap.put("^" + Config.HOST + "search/game\\?keyword=.+" + "$", 115); - intervalMap.put("^" + Config.HOST + "support/setting/platform" + "$", 120); - intervalMap.put("^" + Config.HOST + "update/package/.+" + "$", 125); - intervalMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", 130); + intervalMap.put("^" + Config.API_HOST + "index/slides" + "$", 5); + intervalMap.put("^" + Config.API_HOST + "game/chajian" + "$", 10); + intervalMap.put("^" + Config.API_HOST + "game/tuijian" + "$", 15); + intervalMap.put("^" + Config.API_HOST + "game/.+/detail" + "$", 20); + intervalMap.put("^" + Config.API_HOST + "game/.+/digest" + "$", 25); + intervalMap.put("^" + Config.API_HOST + "game/remenkapai" + "$", 30); + intervalMap.put("^" + Config.API_HOST + "game/.+/news_digest" + "$", 35); + intervalMap.put("^" + Config.API_HOST + "game/column/.+\\?page=.+" + "$", 40); + intervalMap.put("^" + Config.API_HOST + "support/package/.+/game/digest" + "$", 45); + intervalMap.put("^" + Config.API_HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", 50); + intervalMap.put("^" + Config.API_HOST + "news/.+/digest" + "$", 55); + intervalMap.put("^" + Config.API_HOST + "news/.+/detail" + "$", 60); + intervalMap.put("^" + Config.API_HOST + "news/.+/suggestion" + "$", 65); + intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=3" + "$", 70); + intervalMap.put("^" + Config.API_HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", 75); + intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", 80); + intervalMap.put("^" + Config.API_HOST + "zixun/yuanchuang\\?limit=20\\&offset=.+" + "$", 85); + intervalMap.put("^" + Config.API_HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", 90); + intervalMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", 95); + intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", 100); + intervalMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", 105); + intervalMap.put("^" + Config.API_HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", 110); + intervalMap.put("^" + Config.API_HOST + "search/game\\?keyword=.+" + "$", 115); + intervalMap.put("^" + Config.API_HOST + "support/setting/platform" + "$", 120); + intervalMap.put("^" + Config.API_HOST + "update/package/.+" + "$", 125); + intervalMap.put("^" + Config.API_HOST + "update/game/.+/package/.+" + "$", 130); intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", 135); intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", 140); } private static void initCDMap() { cdMap = new ArrayMap<>(); - cdMap.put("^" + Config.HOST + "index/slides" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/chajian" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/tuijian" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/.+/detail" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/.+/digest" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/remenkapai" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/.+/news_digest" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/column/.+\\?page=.+" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "support/package/.+/game/digest" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", Constants.GAME_CD); - cdMap.put("^" + Config.HOST + "news/.+/digest" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "news/.+/detail" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "news/.+/suggestion" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=3" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "zixun/yuanchuang\\?limit=10\\&offset=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", Constants.NEWS_CD); - cdMap.put("^" + Config.HOST + "search/game\\?keyword=.+" + "$", Constants.SEARCH_CD); - cdMap.put("^" + Config.HOST + "support/setting/platform" + "$", Constants.PLATFORM_CD); - cdMap.put("^" + Config.HOST + "update/package/.+" + "$", Constants.UPDATE_CD); - cdMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", Constants.UPDATE_CD); + cdMap.put("^" + Config.API_HOST + "index/slides" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/chajian" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/tuijian" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/detail" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/digest" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/remenkapai" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/news_digest" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/column/.+\\?page=.+" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "support/package/.+/game/digest" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", Constants.GAME_CD); + cdMap.put("^" + Config.API_HOST + "news/.+/digest" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "news/.+/detail" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "news/.+/suggestion" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=3" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "zixun/yuanchuang\\?limit=10\\&offset=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", Constants.NEWS_CD); + cdMap.put("^" + Config.API_HOST + "search/game\\?keyword=.+" + "$", Constants.SEARCH_CD); + cdMap.put("^" + Config.API_HOST + "support/setting/platform" + "$", Constants.PLATFORM_CD); + cdMap.put("^" + Config.API_HOST + "update/package/.+" + "$", Constants.UPDATE_CD); + cdMap.put("^" + Config.API_HOST + "update/game/.+/package/.+" + "$", Constants.UPDATE_CD); cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", Constants.COMMENT_CD); cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", Constants.COMMENT_CD); - cdMap.put("^" + Config.HOST + "device/.+/concern" + "$", 0); - cdMap.put("^" + Config.HOST + "device/.+/concern/.+" + "$", 0); - cdMap.put("^" + Config.HOST + "stat/download" + "$", 0); - cdMap.put("^" + Config.HOST + "disclaimer" + "$", 0); - cdMap.put("^" + Config.HOST + "search/game/default" + "$", 0); - cdMap.put("^" + Config.HOST + "support/upgrade\\?version=.+\\&channel=.+" + "$", 0); - cdMap.put("^" + Config.HOST + "support/time/current" + "$", 0); - cdMap.put("^" + Config.HOST + "support/setting/ui" + "$", 0); - cdMap.put("^" + Config.HOST + "support/download_status\\?version=.+\\&channel=.+" + "$", 0); - cdMap.put("^" + Config.HOST + "support/suggestion" + "$", 0); - cdMap.put("^" + Config.HOST + "game/.+/serverInfo" + "$", 0); - cdMap.put("^" + Config.HOST + "support/package/unused\\?skip=.+" + "$", 0); + cdMap.put("^" + Config.API_HOST + "device/.+/concern" + "$", 0); + cdMap.put("^" + Config.API_HOST + "device/.+/concern/.+" + "$", 0); + cdMap.put("^" + Config.API_HOST + "stat/download" + "$", 0); + cdMap.put("^" + Config.API_HOST + "disclaimer" + "$", 0); + cdMap.put("^" + Config.API_HOST + "search/game/default" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/upgrade\\?version=.+\\&channel=.+" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/time/current" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/setting/ui" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/download_status\\?version=.+\\&channel=.+" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/suggestion" + "$", 0); + cdMap.put("^" + Config.API_HOST + "game/.+/serverInfo" + "$", 0); + cdMap.put("^" + Config.API_HOST + "support/package/unused\\?skip=.+" + "$", 0); } /* diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 6817c2aeab..33e8f96996 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -436,10 +436,10 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt for (String s : mAdapter.getFileList()) { path = getCacheDir() + File.separator + System.currentTimeMillis() + index + ".jpg"; if (BitmapUtils.savePicture(path, s)) { - subscriber.onNext(FileUtils.uploadFile(Config.HOST + "support/user/suggestion/img", path, null)); + subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/user/suggestion/img", path, null)); index++; } else { - subscriber.onNext(FileUtils.uploadFile(Config.HOST + "support/user/suggestion/img", s, null)); + subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/user/suggestion/img", s, null)); } } subscriber.onCompleted(); diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 11f0847189..3e5c5f2644 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -57,7 +57,7 @@ public class RetrofitManager { .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) - .baseUrl(Config.HOST) + .baseUrl(Config.API_HOST) .build() .create(ApiService.class); diff --git a/gradle.properties b/gradle.properties index 1ed910c6f1..951ebc6262 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,37 +13,45 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Wed Jul 19 10:16:09 CST 2017 -MESSAGE_HOST=http\://message.ghzs666.com/v1d0/ -TENCENT_APPID=1104659243 -systemProp.http.proxyHost=127.0.0.1 -DEV_LIBAO_HOST=http\://dev.libao.ghzs666.com/v1d2/ -DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3 -DEV_MESSAGE_HOST=http\://dev.message.ghzs666.com/v1d1/ -DEBUG_MIPUSH_APPKEY=5761756481447 -WEIBO_APPKEY=1723629218 -USERSEA_HOST=http\://usersea.ghzs666.com/ -UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9 -channel_file=channel.txt -USER_HOST=http\://user.ghzs666.com/v1d2/ -org.gradle.parallel=true -DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6 -MIPUSH_APPID=2882303761517352993 -WECHAT_SECRET=368b49e8471857575a033b206218f9fb -DEV_USERSEA_HOST=http\://dev.usersea.ghzs666.com/v1d0/ org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8 +org.gradle.parallel=true +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=8888 android.useDeprecatedNdk=true + +# channel packages +channel_file=channel.txt + +# Third-party keys +DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6 +DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3 +DEBUG_MIPUSH_APPID=2882303761517564447 +DEBUG_MIPUSH_APPKEY=5761756481447 + +MIPUSH_APPID=2882303761517352993 +MIPUSH_APPKEY=5451735292993 WECHAT_APPID=wx3ffd0785fad18396 +WECHAT_SECRET=368b49e8471857575a033b206218f9fb +TD_APPID=81DB144D555386A38A70B833537EC256 +TENCENT_APPID=1104659243 +MTA_APPKEY=APV567FTBS7J +WEIBO_APPKEY=1723629218 +UMENG_APPKEY=585a29fa8f4a9d327600023e +UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9 + +# hosts +DEV_API_HOST=http\://dev.api.ghzs666.com/v2d6/ +DEV_DATA_HOST=http\://data.ghzs666.com/ +DEV_LIBAO_HOST=http\://dev.libao.ghzs666.com/v1d2/ +DEV_MESSAGE_HOST=http\://dev.message.ghzs666.com/v1d1/ DEV_USER_HOST=http\://dev.user.ghzs666.com/v1d2/ +DEV_COMMENT_HOST=http\://dev.comment.ghzs666.com/v1d2/ +DEV_USERSEA_HOST=http\://dev.usersea.ghzs666.com/v1d0/ + +API_HOST=http\://api.ghzs666.com/v2d6/ DATA_HOST=http\://data.ghzs666.com/ LIBAO_HOST=http\://libao.ghzs666.com/v1d2/ -MIPUSH_APPKEY=5451735292993 -DEV_DATA_HOST=http\://data.ghzs666.com/ -DEBUG_MIPUSH_APPID=2882303761517564447 +MESSAGE_HOST=http\://message.ghzs666.com/v1d0/ +USER_HOST=http\://user.ghzs666.com/v1d2/ COMMENT_HOST=http\://comment.ghzs666.com/v1d2/ -TD_APPID=81DB144D555386A38A70B833537EC256 -MTA_APPKEY=APV567FTBS7J -HOST=http\://api.ghzs666.com/v2d6/ -DEV_COMMENT_HOST=http\://dev.comment.ghzs666.com/v1d2/ -systemProp.http.proxyPort=8888 -DEV_HOST=http\://dev.api.ghzs666.com/v2d6/ -UMENG_APPKEY=585a29fa8f4a9d327600023e +USERSEA_HOST=http\://usersea.ghzs666.com/