diff --git a/app/src/debug/java/com/gh/gamecenter/Injection.java b/app/src/debug/java/com/gh/gamecenter/Injection.java index 50ca6f901b..03e9563de1 100644 --- a/app/src/debug/java/com/gh/gamecenter/Injection.java +++ b/app/src/debug/java/com/gh/gamecenter/Injection.java @@ -36,7 +36,7 @@ public class Injection { public static OkHttpClient.Builder provideRetrofitBuilder() { OkHttpClient.Builder builder = new OkHttpClient.Builder(); HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); - interceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS); + interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); builder.addNetworkInterceptor(interceptor); builder.addNetworkInterceptor(new StethoInterceptor()); return builder; diff --git a/app/src/main/assets/rich_editor.js b/app/src/main/assets/rich_editor.js index e6105217c8..9bd1bcacca 100644 --- a/app/src/main/assets/rich_editor.js +++ b/app/src/main/assets/rich_editor.js @@ -178,7 +178,7 @@ RE.setBlockquote = function() { } RE.insertImage = function(url, alt) { - var html = "
" + var html = "
" RE.insertHTML(html); } @@ -186,6 +186,7 @@ RE.replaceTbImage = function() { var imgs = document.getElementsByTagName("img"); for (var i = 0; i < imgs.length; i++) { var img = imgs[i]; + if(img.src.indexOf("/tb/") > 0) continue; var imgArr = img.src.split("/"); var tbImg = "" for (var j = 0; j < imgArr.length; j++) { @@ -195,14 +196,16 @@ RE.replaceTbImage = function() { tbImg += imgArr[j] + "/"; } } - img.style.cssText = "max-width: 30%; display:block; margin:0 auto; height: auto;" + img.style.cssText = "max-width: 30%; display:block; margin:8px auto; height: auto;" img.src = tbImg; -// if (i == 0) { -// var bigImg = document.createElement('img'); -// bigImg.src = "http://image.ghzhushou.com/pic/578ee3d38ab49e45028b456c.jpg"; -// img.parentNode.insertBefore(bigImg, img.parentNode.childNodes[0]); -// } + if (i == 0) { + var bigImg = document.createElement('img'); + bigImg.src = "file:///android_asset/web_load_dfimg_icon.png"; + bigImg.style.cssText = "max-width: 20%; margin:8px 0 0 0; height: auto;" + img.parentNode.insertBefore(bigImg, img.parentNode.childNodes[0]); + i++; + } } } @@ -210,8 +213,13 @@ RE.replaceAllDfImage = function() { var imgs = document.getElementsByTagName("img"); for (var i = 0; i < imgs.length; i++) { var img = imgs[i]; - img.style.cssText = "max-width: 100%; display:block; margin:0 auto; height: auto;" - img.src = img.src.replace("/tb/", "/"); + if(img.src.indexOf("web_load_dfimg_icon") > 0) { + img.parentNode.removeChild(img.parentNode.childNodes[0]); + i--; + } else { + img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;" + img.src = img.src.replace("/tb/", "/"); + } } } @@ -221,7 +229,7 @@ RE.replaceDfImageByUrl = function(imgUrl) { for (var i = 0; i < imgs.length; i++) { var img = imgs[i]; if (img.src == imgUrl) { - img.style.cssText = "max-width: 100%; display:block; margin:0 auto; height: auto;" + img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;" img.src = img.src.replace("/tb/", "/"); } } diff --git a/app/src/main/assets/web_load_dfimg_icon.png b/app/src/main/assets/web_load_dfimg_icon.png new file mode 100644 index 0000000000..cb5a2259b9 Binary files /dev/null and b/app/src/main/assets/web_load_dfimg_icon.png differ diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java index 0b4df6dc9a..37ffb7ff99 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -199,6 +199,10 @@ public class RichEditor extends WebView { mContents = contents; } +// public void replaceTbImage() { +// exec("javascript:RE.replaceTbImage()"); +// } + public String getHtml() { return mContents; } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java index be1d5cdecd..9010fc25df 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskAnswerDetailFragment.java @@ -122,7 +122,9 @@ public class AskAnswerDetailFragment extends NormalFragment { @JavascriptInterface public void imageClick(String url) { - if (url.contains("/tb/")) { + if (url.contains("web_load_dfimg_icon.png")) { + mBaseHandler.post(() -> mRichEditor.replaceAllDfImage()); + } else if (url.contains("/tb/")) { mBaseHandler.post(() -> mRichEditor.replaceDfImageByUrl(url)); } else { int current = 0; @@ -140,7 +142,7 @@ public class AskAnswerDetailFragment extends NormalFragment { @JavascriptInterface public void imageArr(String url) { String defUrl = url.replace("/tb/", "/"); - if (!mAnswersImgs.contains(defUrl)) { + if (!mAnswersImgs.contains(defUrl) && !url.contains("web_load_dfimg_icon.png")) { mAnswersImgs.add(defUrl); } } diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt index 64cb1486aa..06ff93e414 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt @@ -22,7 +22,7 @@ class CommentEntity() : Parcelable { var time: Long = 0 - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null constructor(parcel: Parcel) : this() { diff --git a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.kt index c70fe8a22b..9a5d6b4558 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.kt @@ -43,7 +43,7 @@ class ConcernEntity() :Parcelable { var name: String? = null - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null constructor(parcel: Parcel) : this() { diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.kt index 06eaf528fb..0f414544e5 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.kt @@ -49,7 +49,7 @@ class GameDetailEntity : Parcelable { var fulishuoming: String? = null - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null override fun describeContents(): Int { diff --git a/app/src/main/java/com/gh/gamecenter/entity/LibaoDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/LibaoDetailEntity.kt index c58efeb4fe..c573b1a6cd 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LibaoDetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/LibaoDetailEntity.kt @@ -17,7 +17,7 @@ class LibaoDetailEntity { var time: LibaoDetailTimeEntity? = null - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null } diff --git a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt index 3e36cef311..85482c387f 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt @@ -43,7 +43,7 @@ class LibaoEntity : Parcelable { var repeat: Int = 0 // 剩余可领取数量 - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null constructor() diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.kt index 90f0e871f9..71c093628c 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.kt @@ -23,7 +23,7 @@ class NewsDetailEntity { //相关推荐 var more: List? = null - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null } diff --git a/app/src/main/java/com/gh/gamecenter/entity/ToolBoxEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/ToolBoxEntity.kt index a794699604..1a65705e09 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ToolBoxEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/ToolBoxEntity.kt @@ -23,7 +23,7 @@ class ToolBoxEntity : Parcelable { var time: Long = 0 - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null diff --git a/app/src/main/java/com/gh/gamecenter/entity/VersionVoteEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/VersionVoteEntity.kt index 4c299f2c3a..3c04a1704c 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/VersionVoteEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/VersionVoteEntity.kt @@ -15,7 +15,7 @@ class VersionVoteEntity { var num: Int = 0 - @SerializedName("user_data") + @SerializedName("me") var userData: UserDataEntity? = null var reply: String? = null