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 57d76d9c30..0ee0ca7d16 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -8,12 +8,20 @@ import com.gh.gamecenter.BuildConfig;
public class Config {
- public static final String HOST = "http://api2.ghzhushou.com/v2d6/";
- public static final String USER_HOST = "http://user2.ghzhushou.com/v1d2/";
- public static final String COMMENT_HOST = "http://comment2.ghzhushou.com/v1d2/";
- public static final String DATA_HOST = "http://data.ghzhushou.com/";
- public static final String LIBAO_HOST = "http://libao2.ghzhushou.com/v1d2/";
- public static final String MESSAGE_HOST = "http://message.ghzhushou.com/v1d0/"; // TODO TEST v1d1
+// public static final String HOST = "http://api2.ghzhushou.com/v2d6/";
+// public static final String USER_HOST = "http://user2.ghzhushou.com/v1d2/";
+// public static final String COMMENT_HOST = "http://comment2.ghzhushou.com/v1d2/";
+// public static final String DATA_HOST = "http://data.ghzhushou.com/";
+// public static final String LIBAO_HOST = "http://libao2.ghzhushou.com/v1d2/";
+// public static final String MESSAGE_HOST = "http://message.ghzhushou.com/v1d0/"; // TODO TEST v1d1
+
+ public static final String HOST = "http://api.ghzs666.com/v2d6/";
+ public static final String USER_HOST = "http://user.ghzs666.com/v1d2/";
+ public static final String COMMENT_HOST = "http://comment.ghzs666.com/v1d2/";
+ public static final String DATA_HOST = "http://data.ghzs666.com/";
+ public static final String LIBAO_HOST = "http://libao.ghzs666.com/v1d2/";
+ public static final String MESSAGE_HOST = "http://message.ghzs666.com/v1d0/"; // TODO TEST v1d1
+
public static final String PREFERENCE = "ghzhushou";
// Third-Party confs
diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
index 01d0b876d3..66c49465e5 100644
--- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java
@@ -19,7 +19,7 @@ import java.util.Map;
/**
* Created by LGT on 2016/12/9.
- * 数据收集 工具类（data.ghzhushou.com）
+ * 数据收集 工具类（data.ghzs666.com）
*/
public class DataCollectionUtils {
diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.java b/app/src/main/java/com/gh/common/util/ImageUtils.java
index 58e318b713..93c89bc81f 100644
--- a/app/src/main/java/com/gh/common/util/ImageUtils.java
+++ b/app/src/main/java/com/gh/common/util/ImageUtils.java
@@ -73,7 +73,7 @@ public class ImageUtils {
}
public static void display(SimpleDraweeView simpleDraweeView, String url) {
-// if (url.startsWith("http://image.ghzhushou.com") && url.endsWith(".jpg")) {
+// if (url.startsWith("http://image.ghzs666.com") && url.endsWith(".jpg")) {
// url = url + "?x-oss-process=image/format,webp";
// }
simpleDraweeView.setImageURI(url);
diff --git a/app/src/main/java/com/gh/common/util/IntentUtils.java b/app/src/main/java/com/gh/common/util/IntentUtils.java
index e315cbf0d2..fab9e494e9 100644
--- a/app/src/main/java/com/gh/common/util/IntentUtils.java
+++ b/app/src/main/java/com/gh/common/util/IntentUtils.java
@@ -50,7 +50,7 @@ public class IntentUtils {
"\n" +
"光环助手官网地址：\n" +
"\n" +
- "http://www.ghzhushou.com/link?source=appshare333");
+ "http://www.ghzs666.com/link?source=appshare333");
return data;
}
}
diff --git a/app/src/main/java/com/gh/common/util/UserIconUtils.java b/app/src/main/java/com/gh/common/util/UserIconUtils.java
index 34c1839b76..02d46b77ad 100644
--- a/app/src/main/java/com/gh/common/util/UserIconUtils.java
+++ b/app/src/main/java/com/gh/common/util/UserIconUtils.java
@@ -38,23 +38,23 @@ public class UserIconUtils {
public static String getUserIconUrl(int i) {
switch (i) {
case 1:
- return "http://image.ghzhushou.com/pic/default_icon_1.png";
+ return "http://image.ghzs666.com/pic/default_icon_1.png";
case 2:
- return "http://image.ghzhushou.com/pic/default_icon_2.png";
+ return "http://image.ghzs666.com/pic/default_icon_2.png";
case 3:
- return "http://image.ghzhushou.com/pic/default_icon_3.png";
+ return "http://image.ghzs666.com/pic/default_icon_3.png";
case 4:
- return "http://image.ghzhushou.com/pic/default_icon_4.png";
+ return "http://image.ghzs666.com/pic/default_icon_4.png";
case 5:
- return "http://image.ghzhushou.com/pic/default_icon_5.png";
+ return "http://image.ghzs666.com/pic/default_icon_5.png";
case 6:
- return "http://image.ghzhushou.com/pic/default_icon_6.png";
+ return "http://image.ghzs666.com/pic/default_icon_6.png";
case 7:
- return "http://image.ghzhushou.com/pic/default_icon_7.png";
+ return "http://image.ghzs666.com/pic/default_icon_7.png";
case 8:
- return "http://image.ghzhushou.com/pic/default_icon_8.png";
+ return "http://image.ghzs666.com/pic/default_icon_8.png";
default:
- return "http://image.ghzhushou.com/pic/default_icon_1.png";
+ return "http://image.ghzs666.com/pic/default_icon_1.png";
}
}
}
diff --git a/app/src/main/java/com/gh/download/DownloadThread.java b/app/src/main/java/com/gh/download/DownloadThread.java
index aa134c2540..c9fed5ce50 100644
--- a/app/src/main/java/com/gh/download/DownloadThread.java
+++ b/app/src/main/java/com/gh/download/DownloadThread.java
@@ -102,6 +102,21 @@ public class DownloadThread extends Thread {
return;
}
}
+
+ // 妈的太长了，不测了。。直接copy一份简单点
+ if (!entry.isChange()
+ && "download.ghzs666.com".equals(new URL(entry.getUrl()).getHost())
+ && ("apk2.ghzs666.com".equals(connection.getURL().getHost())
+ || "apk.ghzs666.com".equals(connection.getURL().getHost()))) {
+ String newETag = getETag(entry.getUrl());
+ if (!TextUtils.isEmpty(newETag)) {
+ entry.setETag(newETag);
+ entry.setChange(true);
+ download();
+ return;
+ }
+ }
+
Utils.log("eTag = " + eTag);
Utils.log("eTag2 = " + eTag2);
listener.onStatusChanged(DownloadStatus.hijack, connection.getURL().toString());
@@ -206,7 +221,7 @@ public class DownloadThread extends Thread {
private String getETag(String url) {
try {
- String newUrl = "http://download.ghzhushou.com/etag"
+ String newUrl = "http://download.ghzs666.com/etag"
+ "?url=" + URLEncoder.encode(url, "utf-8")
+ "&" + System.currentTimeMillis();
HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection();
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
index b1aba40f95..ac7bf14908 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
@@ -546,7 +546,7 @@ public class GameDetailActivity extends BaseActivity {
DataCollectionUtils.uploadClick(GameDetailActivity.this, "分享", "游戏详情", mGameEntity.getName());
- String url = "http://www.ghzhushou.com/game/" + shareCode;
+ String url = "http://www.ghzs666.com/game/" + shareCode;
showShare(url, mGameEntity.getName(), mGameEntity.getIcon(), null, mGameEntity.getTag(), false);
}
});
diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
index d05b1c4b06..b85463722c 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
@@ -300,11 +300,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
DataCollectionUtils.uploadClick(NewsDetailActivity.this, "分享", "新闻详情"
, adapter.getNewsDetailEntity().getTitle());
- String url = "http://www.ghzhushou.com/article/" +
+ String url = "http://www.ghzs666.com/article/" +
adapter.getNewsDetailEntity().getId() + ".html";
if (gameEntity == null) {
showShare(url, adapter.getNewsDetailEntity().getTitle(),
- "http://image.ghzhushou.com/pic/57d604808ab49e467d8b4568.png",
+ "http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png",
adapter.getNewsDetailEntity().getTitle(), null, false);
} else {
showShare(url, gameEntity.getName(), gameEntity.getIcon(),
diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
index 74965fd743..9a135bc18f 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
@@ -106,7 +106,7 @@ public class ShareCardActivity extends BaseActivity {
}, 200);
if (!TextUtils.isEmpty(newsId)) {
- String qrBody = "http://www.ghzhushou.com/article/" + newsId + ".html?source=appshare200";
+ String qrBody = "http://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
QRCodeUtils.setQRCode(this, qrBody, mShareQrCodeDv);
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
index af6df1b05c..e1f91890ec 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
@@ -153,7 +153,7 @@ public class ShareCardPicActivity extends BaseActivity {
}
if (!TextUtils.isEmpty(newsId)) {
- String qrBody = "http://www.ghzhushou.com/article/" + newsId + ".html?source=appshare200";
+ String qrBody = "http://www.ghzs666.com/article/" + newsId + ".html?source=appshare200";
QRCodeUtils.setQRCode(this, qrBody, mShareQrCodeDv);
}
}
@@ -195,7 +195,7 @@ public class ShareCardPicActivity extends BaseActivity {
// @Override
// public void call(Subscriber subscriber) {
// String filePath = getExternalCacheDir().getPath() + "/ShareImg/ShareQRCode.jpg";
-// boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId + ".html?source=appshare200"
+// boolean success = QRCodeUtils.createQRImage("http://www.ghzs666.com/article/" + newsId + ".html?source=appshare200"
// , 200, 200, filePath, ShareCardPicActivity.this);
// if (success) {
// subscriber.onNext(filePath);
@@ -219,7 +219,7 @@ public class ShareCardPicActivity extends BaseActivity {
@Override
public void run() {
try {
- String newUrl = "http://image.ghzhushou.com/pic/hq" + url.substring(url.lastIndexOf("/"));
+ String newUrl = "http://image.ghzs666.com/pic/hq" + url.substring(url.lastIndexOf("/"));
HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection();
connection.setRequestMethod("GET");
connection.setConnectTimeout(5 * 1000);
diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java
index fb88647426..b3f50864d3 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java
@@ -59,10 +59,10 @@ public class ShareGhActivity extends BaseActivity {
init(getString(R.string.title_share_gh));
ButterKnife.bind(this);
- mGhAddress.setText(Html.fromHtml("" + "www.ghzhushou.com" + ""));
- QRCodeUtils.setQRCode(this, "http://www.ghzhushou.com/link?source=appshare100", mGhQrcode);
- ShareUtils.getInstance(this).showShareWindows(mShareRl, "http://www.ghzhushou.com/link?source=appshare300", "光环助手"
- , "http://image.ghzhushou.com/pic/57d604808ab49e467d8b4568.png", null, false, false, false);
+ mGhAddress.setText(Html.fromHtml("" + "www.ghzs666.com" + ""));
+ QRCodeUtils.setQRCode(this, "http://www.ghzs666.com/link?source=appshare100", mGhQrcode);
+ ShareUtils.getInstance(this).showShareWindows(mShareRl, "http://www.ghzs666.com/link?source=appshare300", "光环助手"
+ , "http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png", null, false, false, false);
}
@OnClick(R.id.wifi_share_btn)
@@ -74,7 +74,7 @@ public class ShareGhActivity extends BaseActivity {
@OnClick(R.id.gh_address_tv)
public void copyAddress() {
ClipboardManager cmb = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
- cmb.setText("http://www.ghzhushou.com/link?source=appshare100");
+ cmb.setText("http://www.ghzs666.com/link?source=appshare100");
Utils.toast(this, "网址复制成功，请到微信/QQ粘贴分享");
}
diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
index 769aedd4b7..580776ee81 100644
--- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
@@ -230,7 +230,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
@Override
public void run() {
try {
- String newUrl = "http://image.ghzhushou.com/pic/hq" + url.substring(url.lastIndexOf("/"));
+ String newUrl = "http://image.ghzs666.com/pic/hq" + url.substring(url.lastIndexOf("/"));
HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection();
connection.setRequestMethod("GET");
connection.setConnectTimeout(5 * 1000);
@@ -314,8 +314,8 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
if (scaleType != null || isOrientation) {
imageView.getHierarchy().setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER);
}
- if (!url.startsWith("http://image.ghzhushou.com/pic/hq/") && url.startsWith("http://image.ghzhushou.com/pic/")) {
- String hqUrl = "http://image.ghzhushou.com/pic/hq" + url.substring(url.lastIndexOf("/"));
+ if (!url.startsWith("http://image.ghzs666.com/pic/hq/") && url.startsWith("http://image.ghzs666.com/pic/")) {
+ String hqUrl = "http://image.ghzs666.com/pic/hq" + url.substring(url.lastIndexOf("/"));
if (imagePipeline.isInBitmapMemoryCache(Uri.parse(hqUrl))) { // 检查高清图是否被缓存
loadImage(hqUrl, imageView);
} else {
@@ -376,7 +376,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
private void findImageBM() {
String key = urls.get(viewimage_vp_show.getCurrentItem());
- String hdKey = "http://image.ghzhushou.com/pic/hq" + key.substring(key.lastIndexOf("/"));
+ String hdKey = "http://image.ghzs666.com/pic/hq" + key.substring(key.lastIndexOf("/"));
ImagePipeline imagePipeline = Fresco.getImagePipeline();
String curUrl;
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index 63c0a7a8a7..669a6b5528 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -65,7 +65,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
public static Intent getWebIntent(Context context) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("gameName", "使用条款与免责声明");
- intent.putExtra("url", "http://api.ghzhushou.com/disclaimer");
+ intent.putExtra("url", "http://api.ghzs666.com/disclaimer");
return intent;
}
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
index 5be94b32a7..134ddf09ce 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
@@ -345,8 +345,8 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
@Override
public void onClick(View v) {
String url = toolBoxEntity.getUrl();
-// http://www.ghzhushou.com/article/59291e7ce9a64a496cfd6897.html
- if (url.contains("http://www.ghzhushou.com/article/")) {
+// http://www.ghzs666.com/article/59291e7ce9a64a496cfd6897.html
+ if (url.contains("http://www.ghzs666.com/article/")) {
String newsId = url.substring(url.lastIndexOf("/") + 1, url.length() - 5);
Intent intent = new Intent(mContext, NewsDetailActivity.class);
intent.putExtra("newsId", newsId);
diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
index 84f69bf07a..a69984b8e3 100644
--- a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
+++ b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
@@ -22,10 +22,10 @@ public class SkinConfig {
* perPage : 请求数量
*/
public static int perPage = 300;
- // http://api.ghzhushou.com/v2d2/game/57ce84f88ab49e83728b4572/skin/data?per_page=1000&page=1
- public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/skin/game/"
+ // http://api.ghzs666.com/v2d2/game/57ce84f88ab49e83728b4572/skin/data?per_page=1000&page=1
+ public static final String JSON_PATCHURL = "http://api.ghzs666.com/v2d2/skin/game/"
+ GAME_ID + "/data?per_page=" + perPage + "&page=";
-// public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/skin/game/"
+// public static final String JSON_PATCHURL = "http://api.ghzs666.com/v2d2/skin/game/"
// + GAME_ID + "/data?per_page=" + perPage + "&page="; // 原链接
// ewan.anfeng 安峰
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java
index c3a9ba3bb2..54cf3eb8c9 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java
@@ -77,7 +77,7 @@ public class GameDetailToolsAdapter extends BaseRecyclerAdapter {
@Override
public void onClick(View v) {
String url = toolBoxEntity.getUrl();
- if (url.contains("http://www.ghzhushou.com/article/")) {
+ if (url.contains("http://www.ghzs666.com/article/")) {
String newsId = url.substring(url.lastIndexOf("/") + 1, url.length() - 5);
Intent intent = new Intent(mContext, NewsDetailActivity.class);
intent.putExtra("newsId", newsId);
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
index 678fa70dda..dbdac497df 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
@@ -34,7 +34,7 @@ import rx.Observable;
/**
* Created by khy on 2016/11/1.
- * api.ghzhushou.com
+ * api.ghzs666.com
*/
public interface ApiService {
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java b/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java
index 84295dfde3..02db9f1e5f 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java
@@ -18,7 +18,7 @@ import rx.Observable;
/**
* Created by LGT on 2016/11/9.
- * comment.ghzhushou.com
+ * comment.ghzs666.com
*/
public interface CommentService {
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java b/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java
index 17dd00dc13..762f3a1411 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java
@@ -16,7 +16,7 @@ import rx.Observable;
/**
* Created by LGT on 2016/11/9.
- * data.ghzhushou.com
+ * data.ghzs666.com
*/
public interface DataService {
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java b/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
index e3b3fd54f3..1dd05908b4 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
@@ -16,7 +16,7 @@ import retrofit2.http.Query;
import rx.Observable;
/**
- * libao.ghzhushou.com
+ * libao.ghzs666.com
*/
public interface LibaoService {
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java b/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java
index 73db539fcc..3877190b37 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java
@@ -16,7 +16,7 @@ import rx.Observable;
/**
* Created by LGT on 2016/12/5.
- * user.ghzhushou.com
+ * user.ghzs666.com
*/
public interface UserService {