From ccd4a479a97eefd31035c07faee8ca9a77f80094 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Tue, 14 Sep 2021 15:49:50 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=88=86?= =?UTF-8?q?=E7=B1=BB-=E7=B2=BE=E9=80=89-=E4=B8=93=E9=A2=98=E5=90=88?= =?UTF-8?q?=E9=9B=86=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 92941bcc38c39a10fe63930d9c6d514358074a36) --- .../catalog/SpecialCatalogSubjectCollectionAdapter.kt | 9 +++++++++ .../res/layout/catalog_subject_collection_list_item.xml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectCollectionAdapter.kt index 02cbdeff8a..131a03e71f 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectCollectionAdapter.kt @@ -7,6 +7,7 @@ import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.DirectUtils import com.gh.common.util.ImageUtils import com.gh.common.util.dip2px +import com.gh.common.view.WrapContentDraweeView import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CatalogSubjectCollectionListItemBinding import com.gh.gamecenter.entity.GameEntity @@ -42,6 +43,14 @@ class SpecialCatalogSubjectCollectionAdapter(context: Context, } val entity = mList[position] ImageUtils.display(subjectCollectionImage, entity.image) + subjectCollectionImage.loadingCallback = object : WrapContentDraweeView.LoadingCallback { + override fun loaded() { + subjectCollectionImage.layoutParams = subjectCollectionImage.layoutParams.apply { + height = 96F.dip2px() + width = (subjectCollectionImage.aspectRatio * 96F.dip2px()).toInt() + } + } + } root.setOnClickListener { DirectUtils.directToLinkPage(mContext, LinkEntity(link = entity.link, type = entity.type), "精选分类", "专题合集") mCatalogViewModel.logSpecialCatalogSpecificContentClick( diff --git a/app/src/main/res/layout/catalog_subject_collection_list_item.xml b/app/src/main/res/layout/catalog_subject_collection_list_item.xml index dfb8d99913..b18098af9c 100644 --- a/app/src/main/res/layout/catalog_subject_collection_list_item.xml +++ b/app/src/main/res/layout/catalog_subject_collection_list_item.xml @@ -12,5 +12,6 @@ app:fadeDuration="500" app:placeholderImage="@drawable/preload" app:pressedStateOverlayImage="@color/pressed_bg" - app:roundedCornerRadius="8dp" /> + app:roundedCornerRadius="8dp" + app:viewAspectRatio="2" /> \ No newline at end of file From 2fe9d6c3e141d969e4eae4b3d7810fe38aca2718 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Thu, 16 Sep 2021 11:05:51 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=8A=A8=E6=80=81-=E5=88=86=E4=BA=AB=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=8E=E5=88=86=E4=BA=AB=E8=B7=AF=E5=BE=84=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/MessageShareUtils.java | 23 ++++++++++++------- .../com/gh/gamecenter/ShareCardActivity.java | 3 +-- .../gh/gamecenter/ShareCardPicActivity.java | 4 +--- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index 26e52e1ea8..5374425ee9 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -148,15 +148,10 @@ public class MessageShareUtils { private int shareType; private MessageShareUtils(Context context) { - mTencent = Tencent.createInstance(Config.TENCENT_APPID, context); //初始化QQ分享 - mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID); //初始化微信分享 mContext = context.getApplicationContext(); - // 安卓11无法访问Android/data目录 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - mWriteBitmapPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/ShareImg/"; - } else { - mWriteBitmapPath = context.getExternalCacheDir().getPath() + "/ShareImg/"; - } + mTencent = Tencent.createInstance(Config.TENCENT_APPID, mContext); //初始化QQ分享 + mIWXAPI = WXAPIFactory.createWXAPI(mContext, Config.WECHAT_APPID); //初始化微信分享 + mWriteBitmapPath = getSaveBitmapBasePath(context); } public static MessageShareUtils getInstance(Context context) { @@ -505,6 +500,18 @@ public class MessageShareUtils { Utils.log("保存分享图片路径：" + imageFile.getAbsolutePath()); } + // 获取保存图片通用路径 + public static String getSaveBitmapBasePath(Context context) { + String path; + // 安卓11无法访问Android/data目录 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/ShareImg/"; + } else { + path = context.getExternalCacheDir().getPath() + "/ShareImg/"; + } + return path; + } + class ShareRecyclerViewAdapter extends RecyclerView.Adapter { @Override diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index 74ffdab6fe..70476e98c9 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -131,7 +131,7 @@ public class ShareCardActivity extends ToolBarActivity { } public void saveBitmap(Bitmap bm) { - File file = new File(getExternalCacheDir().getPath() + "/ShareImg"); + File file = new File(MessageShareUtils.getSaveBitmapBasePath(this)); if (!file.isDirectory()) { file.delete(); file.mkdirs(); @@ -140,7 +140,6 @@ public class ShareCardActivity extends ToolBarActivity { file.mkdirs(); } MessageShareUtils.getInstance(ShareCardActivity.this).writeBitmap(file.getPath(), picName, bm, false); - } } diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index aecc162dc9..3a8aafb2c9 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -304,7 +304,7 @@ public class ShareCardPicActivity extends ToolBarActivity { } public void saveBitmap(Bitmap bm) { - File file = new File(getExternalCacheDir().getPath() + "/ShareImg"); + File file = new File(MessageShareUtils.getSaveBitmapBasePath(this)); if (!file.isDirectory()) { file.delete(); file.mkdirs(); @@ -312,9 +312,7 @@ public class ShareCardPicActivity extends ToolBarActivity { if (!file.exists()) { file.mkdirs(); } - MessageShareUtils.getInstance(ShareCardPicActivity.this).writeBitmap(file.getPath(), picName, bm, false); - } @OnClick(R.id.sharecard_chang_img) From 5351ffd6b657e986939778c5249d5e245ee8b78c Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Sat, 9 Oct 2021 11:56:53 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.3.0=E3=80=91Q&A=E7=AE=A1=E7=90=86-=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=9F=8B=E7=82=B9(=E6=9B=BF=E6=8D=A2=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E5=AD=97=E6=AE=B5qa=5Ftitle=E4=B8=BAhelp=5Fid)=20http?= =?UTF-8?q?s://git.ghzs.com/pm/halo-app-issues/-/issues/1393?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/util/NewLogUtils.kt | 8 ++++---- .../java/com/gh/gamecenter/entity/HelpEntity.kt | 16 ++++++++++------ .../com/gh/gamecenter/help/HelpContentAdapter.kt | 8 ++++---- .../java/com/gh/gamecenter/help/HelpQaAdapter.kt | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/NewLogUtils.kt b/app/src/main/java/com/gh/common/util/NewLogUtils.kt index d15a6114ed..76b52ed82c 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -1223,13 +1223,13 @@ object NewLogUtils { } //点击QA搜索结果 - fun logClickQaSearchItem(searchKey: String, contentId: String, contentTitle: String, qaTitle: String) { + fun logClickQaSearchItem(searchKey: String, contentId: String, contentTitle: String, helpId: String) { val json = json { "event" to "qa_click_search_result" "search_key" to searchKey "content_id" to contentId "content_title" to contentTitle - "qa_title" to qaTitle + "help_id" to helpId "meta" to LogUtils.getMetaObject() "launch_id" to Tracker.launchId "session_id" to Tracker.sessionId @@ -1252,13 +1252,13 @@ object NewLogUtils { } //进入QA内容详情 - fun logEnterQaContent(clickLocation: String, contentId: String, contentTitle: String, qaTitle: String) { + fun logEnterQaContent(clickLocation: String, contentId: String, contentTitle: String, helpId: String) { val json = json { "event" to "qa_enter_content_detail" "click_location" to clickLocation "content_id" to contentId "content_title" to contentTitle - "qa_title" to qaTitle + "help_id" to helpId "meta" to LogUtils.getMetaObject() "launch_id" to Tracker.launchId "session_id" to Tracker.sessionId diff --git a/app/src/main/java/com/gh/gamecenter/entity/HelpEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/HelpEntity.kt index 7adf74f309..7d0fef46a1 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/HelpEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/HelpEntity.kt @@ -5,9 +5,13 @@ import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize @Parcelize -data class HelpEntity(@SerializedName("_id") - val id: String = "", - @SerializedName(value = "title", alternate = ["index_title"]) - val title: String = "", - val type: String = "", - val content: String = ""): Parcelable \ No newline at end of file +data class HelpEntity( + @SerializedName("_id") + val id: String = "", + @SerializedName(value = "title", alternate = ["index_title"]) + val title: String = "", + val type: String = "", + val content: String = "", + @SerializedName("help_id") + val helpId: String = "" +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt index fc031a5c43..75a24ee869 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt @@ -105,7 +105,7 @@ class HelpContentAdapter( mContext.startActivity( WebActivity.getQAIntent( mContext, - "${url}${entity.id}&qa_title=${mNavigationTitle}", + "${url}${entity.id}&help_id=${entity.helpId}", mNavigationTitle, true, if (!mQaCollectionId.isNullOrEmpty()) 0 else 1 @@ -131,11 +131,11 @@ class HelpContentAdapter( "${searchKey}+${HtmlUtils.stripHtml(entity.title)}" ) } - NewLogUtils.logClickQaSearchItem(searchKey, entity.id, HtmlUtils.filterHtmlLabel(entity.title), mNavigationTitle) - NewLogUtils.logEnterQaContent("搜索结果", entity.id, HtmlUtils.filterHtmlLabel(entity.title), mNavigationTitle) + NewLogUtils.logClickQaSearchItem(searchKey, entity.id, HtmlUtils.filterHtmlLabel(entity.title), entity.helpId) + NewLogUtils.logEnterQaContent("搜索结果", entity.id, HtmlUtils.filterHtmlLabel(entity.title), entity.helpId) } else if (!mQaId.isNullOrEmpty()) { MtaHelper.onEvent("QA", "QA内容", navigationTitle + "+" + entity.title) - NewLogUtils.logEnterQaContent("QA", entity.id, HtmlUtils.filterHtmlLabel(entity.title), mNavigationTitle) + NewLogUtils.logEnterQaContent("QA", entity.id, HtmlUtils.filterHtmlLabel(entity.title), entity.helpId) } else if (!mQaCollectionId.isNullOrEmpty()) { if (category != null) { MtaHelper.onEvent( diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt index 09ec1b9664..5d847daef7 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt @@ -52,7 +52,7 @@ class HelpQaAdapter(val context: Context, val helpCategoryEntity: HelpCategoryEn context.startActivity( WebActivity.getQAIntent( context, - "${url}${helpEntity.id}&qa_title=${helpCategoryEntity.name}", + "${url}${helpEntity.id}&help_id=${helpCategoryEntity.id}", helpCategoryEntity.name, true, if (!mQaCollectionId.isNullOrEmpty()) 0 else 1 @@ -64,7 +64,7 @@ class HelpQaAdapter(val context: Context, val helpCategoryEntity: HelpCategoryEn } else { MtaHelper.onEvent("意见反馈", "使用帮助点击", "点击首页+${HtmlUtils.stripHtml(helpEntity.title)}") } - NewLogUtils.logEnterQaContent("QA首页", helpEntity.id, HtmlUtils.filterHtmlLabel(helpEntity.title), helpCategoryEntity.name) + NewLogUtils.logEnterQaContent("QA首页", helpEntity.id, HtmlUtils.filterHtmlLabel(helpEntity.title), helpCategoryEntity.id) } } From ed2b41bc55a9c401d888e61b35db90d410ae8eb8 Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Mon, 11 Oct 2021 09:10:29 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.3.0=E3=80=91Q&A=E7=AE=A1=E7=90=86-=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=9F=8B=E7=82=B9(1009=E6=B5=8B=E8=AF=951)=20https://?= =?UTF-8?q?git.ghzs.com/pm/halo-app-issues/-/issues/1393?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/NewLogUtils.kt | 4 ++-- .../main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/NewLogUtils.kt b/app/src/main/java/com/gh/common/util/NewLogUtils.kt index 76b52ed82c..b605bfe80a 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -1239,10 +1239,10 @@ object NewLogUtils { } //点击QA更多 - fun logClickQaMoreBtn(qaTitle: String) { + fun logClickQaMoreBtn(helpId: String) { val json = json { "event" to "qa_click_title_more" - "qa_title" to qaTitle + "help_id" to helpId "meta" to LogUtils.getMetaObject() "launch_id" to Tracker.launchId "session_id" to Tracker.sessionId diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt index 09aa1de2a0..d7614a6b8e 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt @@ -52,7 +52,7 @@ class HelpQaCategoryAdapter(val context: Context, val mQaCollectionId: String?) } else { MtaHelper.onEvent("意见反馈", "使用帮助点击", "点击更多+${helpCategoryEntity.name}") } - NewLogUtils.logClickQaMoreBtn(helpCategoryEntity.name) + NewLogUtils.logClickQaMoreBtn(helpCategoryEntity.id) } } } From 516d8d804401ec70d22f597be4af0ea8cb6722a3 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 11 Oct 2021 10:35:08 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=205.3.0=20=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 120a031842..0ceac75edf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,8 +50,8 @@ QUICK_LOGIN_APPKEY=002BAABA2C078342DA33BEAB0A4C6A25 # hosts DEV_API_HOST=https\://dev-and-api.ghzs.com/v5d3d0/ -API_HOST=https\://and-api.ghzs.com/v5d0d0/ -SENSITIVE_API_HOST=https\://and-api.ghzs.com/v5d0d0/ +API_HOST=https\://and-api.ghzs.com/v5d3d0/ +SENSITIVE_API_HOST=https\://and-api.ghzs.com/v5d3d0/ # 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准 TINKER_ENABLE= From 23c62f1092597841d712346f154235e53729db69 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 11 Oct 2021 17:25:07 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E7=BC=BA=E7=9C=81=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20GH=5FTEST3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/constant/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 11791eb252..8956226aaa 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -64,7 +64,7 @@ public class Config { public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一 public static final String PATCHES = "patches"; - public static final String DEFAULT_CHANNEL = "GH_TEST2"; + public static final String DEFAULT_CHANNEL = "GH_TEST3"; public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道 private static String SETTINGS_KEY = "settingsKey"; From 793adb9a0380f7b919e84b19e858b83283448da2 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Mon, 11 Oct 2021 18:10:21 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E5=88=B0=E4=B8=93=E9=A2=98=E5=90=88=E9=9B=86?= =?UTF-8?q?-=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=A0=B7=E5=BC=8F=E5=8D=A1?= =?UTF-8?q?=E9=A1=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/game/GameFragmentAdapter.kt | 5 +- .../gh/gamecenter/game/rank/RankAdapter.kt | 71 ++++---------- .../game/rank/RankCollectionAdapter.kt | 4 +- .../main/res/layout/rank_collection_item.xml | 41 ++++---- .../main/res/layout/rank_collection_list.xml | 21 ++--- app/src/main/res/layout/rank_game_item.xml | 94 +++++++++++++++++++ 6 files changed, 139 insertions(+), 97 deletions(-) create mode 100644 app/src/main/res/layout/rank_game_item.xml diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 02792c7217..754b9989bc 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -331,7 +331,10 @@ class GameFragmentAdapter( } private fun bindRankCollection(holder: RankCollectionViewHolder, position: Int) { - holder.itemView.setPadding(0, 0, 0, 16F.dip2px()) + holder.itemView.layoutParams = + (holder.itemView.layoutParams as ViewGroup.MarginLayoutParams).apply { + topMargin = 0 + } val rankCollection = mItemDataList[position].rankCollection val rankCollectionAdapter = holder.bindRankCollection(rankCollection!!) diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankAdapter.kt index 497771b43e..f58da9dfda 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankAdapter.kt @@ -8,17 +8,16 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.core.view.setPadding +import androidx.recyclerview.widget.RecyclerView import com.gh.common.AppExecutor import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R -import com.gh.gamecenter.adapter.viewholder.GameViewHolder -import com.gh.gamecenter.databinding.GameItemBinding +import com.gh.gamecenter.databinding.RankGameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.TagStyleEntity import com.gh.gamecenter.eventbus.EBDownloadStatus -import com.gh.gamecenter.game.GameItemViewHolder import com.lightgame.adapter.BaseRecyclerAdapter import com.lightgame.download.DownloadEntity import java.util.HashMap @@ -29,7 +28,7 @@ class RankAdapter( private var columnName: String, private var exposureOffset: Int, private var exposureEventList: ArrayList?, -) : BaseRecyclerAdapter(context) { +) : BaseRecyclerAdapter(context) { val positionAndPackageMap = HashMap() private var countAndKey: Pair? = null @@ -55,39 +54,16 @@ class RankAdapter( override fun getItemCount() = mList.size - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameItemViewHolder { - return GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false))) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RankGameItemViewHolder { + return RankGameItemViewHolder(RankGameItemBinding.bind(mLayoutInflater.inflate(R.layout.rank_game_item, parent, false))) } - override fun onBindViewHolder(holder: GameItemViewHolder, position: Int) { + override fun onBindViewHolder(holder: RankGameItemViewHolder, position: Int) { val gameEntity = mList[position] holder.binding.run { - root.setPadding(0, 8F.dip2px(), 8F.dip2px(), 8F.dip2px()) - root.background = null - labelList.visibility = View.GONE - game = gameEntity - holder.initServerType(gameEntity) - executePendingBindings() - - val isNeedAddView: Boolean - val tagContainer: LinearLayout - contentContainer.run { - if (childCount > 0 && getChildAt(childCount - 1).tag == "tagContainer") { - isNeedAddView = false - tagContainer = getChildAt(childCount - 1) as LinearLayout - } else { - isNeedAddView = true - tagContainer = LinearLayout(mContext).apply { - tag = "tagContainer" - orientation = LinearLayout.HORIZONTAL - layoutParams = LinearLayout.LayoutParams( - 92F.dip2px(), - LinearLayout.LayoutParams.WRAP_CONTENT - ).apply { topMargin = 8F.dip2px() } - } - } - } - + ImageUtils.display(gameIcon, gameEntity.icon) + ImageUtils.display(gameIconDecoratorIv, gameEntity.iconSubscript) + gameName.text = gameEntity.name tagContainer.run { for (i in 0 until childCount) { getChildAt(i).visibility = View.GONE @@ -108,23 +84,6 @@ class RankAdapter( } } - if (isNeedAddView) contentContainer.addView(tagContainer) - - gameIconView.layoutParams = gameIconView.layoutParams.apply { - width = 40F.dip2px() - height = 40F.dip2px() - } - - gameName.textSize = 13F - gameDescContainer.visibility = View.GONE - labelList.layoutParams = (labelList.layoutParams as ViewGroup.MarginLayoutParams).apply { - topMargin = 10F.dip2px() - } - downloadBtn.layoutParams = downloadBtn.layoutParams.apply { - width = 52F.dip2px() - height = 26F.dip2px() - } - gameOrder.run { visibility = View.VISIBLE text = (position + 1).toString() @@ -138,7 +97,7 @@ class RankAdapter( layoutParams?.let { it.height = 16F.dip2px() it.width = 16F.dip2px() - if (it is LinearLayout.LayoutParams) { + if (it is ViewGroup.MarginLayoutParams) { it.leftMargin = 8F.dip2px() it.rightMargin = 8F.dip2px() } @@ -152,7 +111,7 @@ class RankAdapter( layoutParams?.let { it.height = 16F.dip2px() it.width = 16F.dip2px() - if (it is LinearLayout.LayoutParams) { + if (it is ViewGroup.MarginLayoutParams) { it.leftMargin = 8F.dip2px() it.rightMargin = 8F.dip2px() } @@ -166,7 +125,7 @@ class RankAdapter( layoutParams?.let { it.height = 16F.dip2px() it.width = 16F.dip2px() - if (it is LinearLayout.LayoutParams) { + if (it is ViewGroup.MarginLayoutParams) { it.leftMargin = 8F.dip2px() it.rightMargin = 8F.dip2px() } @@ -179,7 +138,7 @@ class RankAdapter( layoutParams?.let { it.height = 24F.dip2px() it.width = 24F.dip2px() - if (it is LinearLayout.LayoutParams) { + if (it is ViewGroup.MarginLayoutParams) { it.leftMargin = 4F.dip2px() it.rightMargin = 4F.dip2px() } else throwExceptionInDebug() @@ -217,7 +176,7 @@ class RankAdapter( "专题合集-排行榜-$columnName:${gameEntity.name}", exposureEvent) - DownloadItemUtils.updateItem(mContext, gameEntity, GameViewHolder(holder.binding), true) + DownloadItemUtils.updateDownloadButton(mContext, downloadBtn, gameEntity, false) } } @@ -284,4 +243,6 @@ class RankAdapter( // 重新刷新数据标识 countAndKey = Pair(update.size, dataIds) } + + inner class RankGameItemViewHolder(val binding: RankGameItemBinding): RecyclerView.ViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt index 70eb01d488..e51468aa74 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt @@ -117,7 +117,9 @@ class RankCollectionAdapter( if (updateId != id) { notifyDataSetChanged() } else { - notifyItemRangeChanged(0, itemCount) + mSubAdapters.forEach { _, adapter -> + adapter.notifyItemRangeChanged(0, itemCount) + } } } diff --git a/app/src/main/res/layout/rank_collection_item.xml b/app/src/main/res/layout/rank_collection_item.xml index 837afa253e..3f1ef15f3f 100644 --- a/app/src/main/res/layout/rank_collection_item.xml +++ b/app/src/main/res/layout/rank_collection_item.xml @@ -7,34 +7,25 @@ - + android:layout_height="44dp" + android:paddingTop="4dp" + android:gravity="center" + android:textColor="@color/black" + android:textStyle="bold" + android:textSize="16sp" + tools:text="热度榜>" /> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/rank_collection_list.xml b/app/src/main/res/layout/rank_collection_list.xml index c5e68fa8a3..5650aad089 100644 --- a/app/src/main/res/layout/rank_collection_list.xml +++ b/app/src/main/res/layout/rank_collection_list.xml @@ -1,17 +1,8 @@ - - - - \ No newline at end of file + android:layout_height="328dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/rank_game_item.xml b/app/src/main/res/layout/rank_game_item.xml new file mode 100644 index 0000000000..bbe71cabb6 --- /dev/null +++ b/app/src/main/res/layout/rank_game_item.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + From 679c6da972046d7697061468598026953b47f183 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 11 Oct 2021 18:22:51 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E3=80=81=E5=B7=A5=E5=85=B7=E7=AE=B1=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=90=9C=E7=B4=A2=E6=96=87=E5=AD=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 23114cc5c2..e12a0f9a25 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -159,7 +159,7 @@ public class ToolBoxActivity extends ToolBarActivity implements SwipeRefreshLayo } private void initSearch() { - backTv.setOnClickListener(v -> search(false, searchEt.getText().toString())); + backTv.setOnClickListener(v -> search(false, "")); TextHelper.limitTheLengthOfEditText(searchEt, 20, () -> { Utils.toast(this, "最多输入20字"); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index 9f7264b318..b18ef83f5b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -127,6 +127,7 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O switch (view.getId()) { case R.id.tv_back: mIsSearch = false; + mLibaoEtSearch.setText(""); break; case R.id.tv_search: MtaHelper.onEvent("我的光环_新", "礼包中心", "点击搜索"); From 562b3e9d3b6eb8220ad796ed457c5e2174d1052a Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 12 Oct 2021 10:59:29 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.2.0&V5.3.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB=20(1)=20https://git.ghzs.com/pm/hal?= =?UTF-8?q?o-app-issues/-/issues/1565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/download/DownloadManager.java | 1 + .../DownloadedGameIdAndPackageNameDao.kt | 21 ++++++++++++++++++- .../download/UpdatableGameViewModel.kt | 9 +++----- .../packagehelper/PackageRepository.kt | 6 ++++++ 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index a947c0065b..8a9b50f6be 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -136,6 +136,7 @@ public class DownloadManager implements DownloadStatusListener { public void onTaskDone(DownloadEntity entity) { downloadingMap.remove(entity.getUrl()); + mDownloadedGameIdAndPackageNameDao.removeOldPackageItem(entity.getPackageName()); mDownloadedGameIdAndPackageNameDao.add(entity.getGameId() + entity.getPackageName()); if (downloadingMap.isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt index 1d5ccce3c8..969feaa1e3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt @@ -3,10 +3,29 @@ package com.gh.gamecenter.download import com.gh.base.BaseSimpleDao /** - * 用来记录光环下载过什么包名和游戏ID件的一个简单类 + * 用来记录光环下载过什么包名和游戏ID间合集的一个简单类 */ class DownloadedGameIdAndPackageNameDao : BaseSimpleDao() { + /** + * 删掉包名关联的条目 + */ + fun removeOldPackageItem(packageName: String) { + val oldItemSet = hashSetOf() + getAll()?.iterator()?.let { + while (it.hasNext()) { + val item = it.next() + if (item.endsWith(packageName)) { + oldItemSet.add(item) + } + } + } + + for (item in oldItemSet) { + delete(item) + } + } + override fun getSPKey() = "downloaded_game_id_and_packagename" override fun getMaxSize(): Int = 1000 diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt index 933ebdb2a7..cf0dc15cc1 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt @@ -267,8 +267,8 @@ class UpdatableGameViewModel( val isInstalledSignByGh = PackageUtils.isSignedByGh(getApplication(), matchedPackageName) - val installedGhId = - if (isInstalledSignByGh) PackageUtils.getGhId(matchedPackageName) else null + val installedGhId: String? = + if (isInstalledSignByGh) PackageUtils.getGhId(matchedPackageName) as String? else null // 根据状态分子列表 // 1. 按钮为更新的我的游戏 @@ -279,10 +279,7 @@ class UpdatableGameViewModel( ignoredPackageUpdateList.add(packageUpdate) } packageUpdate.matchedVersionUpdate.version == currentlyUpdatableVersion - && !PackagesManager.isCanUpdate( - installedGhId as? String, - matchedPackageName - ) + && !PackagesManager.isCanUpdate(installedGhId, matchedPackageName) && !isUpdatePluggableRelated(packageUpdate.matchedVersionUpdate) -> { invalidPackageUpdateList.add(packageUpdate) } diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index 1a3e64e588..89e0ff45af 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -345,6 +345,12 @@ object PackageRepository { fun uninstalledGame(pkgName: String) { // TODO 检查为什么会有两个相同的包名添加到 mInstalledPkgList 里 mInstalledPkgList.removeAll { it == pkgName } + val iterator = currentVersionList.iterator() + while (iterator.hasNext()) { + if (iterator.next().packageName == pkgName) { + iterator.remove() + } + } notifyInstallPkgData() // 删除更新列表 From a8c54de47d8f15a90279ddbaab1c469b422edefe Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Tue, 12 Oct 2021 15:22:28 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.2.0&V5.3.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB(6)=20https://git.ghzs.com/pm/halo-a?= =?UTF-8?q?pp-issues/-/issues/1565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/common_collection_detail_one_item.xml | 1 + app/src/main/res/layout/common_collection_detail_two_item.xml | 1 + app/src/main/res/layout/common_collection_item.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/common_collection_detail_one_item.xml b/app/src/main/res/layout/common_collection_detail_one_item.xml index f4a55b90b2..aeadd5aa60 100644 --- a/app/src/main/res/layout/common_collection_detail_one_item.xml +++ b/app/src/main/res/layout/common_collection_detail_one_item.xml @@ -37,6 +37,7 @@ Date: Tue, 12 Oct 2021 15:31:32 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85Footer=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/MessageDetailAdapter.java | 28 ------------------- 1 file changed, 28 deletions(-) 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 13bf72847b..494b3d9fb8 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -4,10 +4,8 @@ import android.app.Activity; import android.content.Intent; import android.text.Html; import android.text.TextUtils; -import android.view.Gravity; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; @@ -88,8 +86,6 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { private boolean isLoading; private boolean isNetworkError; private boolean isRefreshPosition; - private boolean isGetRvHeight = true; // 防止评论时弹出软键盘 影响RecyclerView高度 - private int rvHeight; private int mPage; public MessageDetailAdapter(Activity context, OnCommentCallBackListener listener, @@ -474,28 +470,6 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } private void initFooterViewHolder(final FooterViewHolder viewHolder) { - if (isGetRvHeight) { - rvHeight = mRecyclerView.getHeight(); - isGetRvHeight = false; - } - LinearLayout.LayoutParams params; - int height = 0; - if (mRecyclerView.getChildCount() != 1) { - for (int i = 0; i < mRecyclerView.getChildCount(); i++) { - if (i != 0 || mRecyclerView.getChildAt(0).getHeight() < 200) { - height = height + mRecyclerView.getChildAt(i).getHeight(); - } - } - } - if (rvHeight - height < 100 || (mNormalCommentList.size() + mHotCommentList.size()) * 220 > rvHeight) { - params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - ((LinearLayout) viewHolder.itemView).setGravity(Gravity.CENTER); - } else { - params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rvHeight - height); - ((LinearLayout) viewHolder.itemView).setGravity(Gravity.CENTER_HORIZONTAL); - } - viewHolder.itemView.setLayoutParams(params); - if (isNetworkError) { viewHolder.loading.setVisibility(View.GONE); viewHolder.hint.setText(R.string.loading_error_network); @@ -504,8 +478,6 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.loading.setVisibility(View.VISIBLE); } else if (mNormalCommentList.size() == 0 && mHotCommentList.size() == 0) { viewHolder.loading.setVisibility(View.GONE); - viewHolder.itemView.setLayoutParams(params); - viewHolder.itemView.setPadding(0, DisplayUtils.dip2px(mContext, 30), 0, 0); viewHolder.hint.setText(R.string.comment_empty); } else { viewHolder.hint.setText(R.string.comment_nomore); From bfa236f802b37508241167576d5655726aba512e Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Tue, 12 Oct 2021 16:24:28 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.4.0=E3=80=91=E6=96=B0=E7=A4=BE=E5=8C=BA5=E6=9C=9F-?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A1=B5=EF=BC=883=EF=BC=89https://?= =?UTF-8?q?git.ghzs.com/pm/halo-app-issues/-/issues/1535?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt index 7ac584ee5e..fb5a748c14 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt @@ -121,8 +121,8 @@ class ForumActivityAdapter(context: Context, root.setOnClickListener { val categoryId = if (mViewModel.categoryId.isEmpty()) "all" else mViewModel.categoryId NewLogUtils.logForumActivityClick(categoryId, activityEntity.id) - if (status == "未开始") ToastUtils.toast("别着急，活动快开始咯") - if (status == "正在评奖") ToastUtils.toast("活动正在评奖中") + if (status == "未开始") ToastUtils.toast("活动还未开始~") + if (status == "正在评奖") ToastUtils.toast("活动正在评奖中，请耐心等待评奖结果~") if (status == "奖励发放中") ToastUtils.toast("活动奖励发放中~") if (status == "已结束") ToastUtils.toast("活动已结束~") DirectUtils.directToActivityDetail(mContext, activityEntity.id, mViewModel.categoryId, mEntrance) From 1966e844bd06b1ffcea387eb948632a1b600c3dc Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 12 Oct 2021 17:46:12 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.2.0&V5.3.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB=20(8,9,10)=20https://git.ghzs.com/p?= =?UTF-8?q?m/halo-app-issues/-/issues/1565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/DownloadItemUtils.kt | 3 --- .../java/com/gh/gamecenter/download/DownloadFragment.kt | 5 +++++ .../java/com/gh/gamecenter/game/GameFragmentAdapter.kt | 8 +++----- .../gamecenter/game/horizontal/GameHorizontalAdapter.kt | 4 +--- .../game/horizontal/GameHorizontalListViewHolder.kt | 4 ++-- .../game/horizontal/GameHorizontalSlideAdapter.kt | 5 ++--- .../game/horizontal/GameHorizontalSlideListViewHolder.kt | 3 +-- .../game/imageslide/GameImageSlideViewHolder.kt | 3 +-- .../gh/gamecenter/game/imageslide/ImageSlideAdapter.kt | 4 +--- .../gh/gamecenter/game/vertical/GameVerticalAdapter.kt | 4 +--- .../game/vertical/GameVerticalSlideViewHolder.kt | 2 +- .../java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt | 2 +- .../gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt | 4 ++-- 13 files changed, 21 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt index 62f1b8fd1b..090c9d92d6 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -308,9 +308,6 @@ object DownloadItemUtils { context: Context, holder: GameViewHolder, downloadEntity: DownloadEntity, isShowPlatform: Boolean, isNormal: Boolean ) { - // 当 progressBar 被隐藏时不需要再执行相关的操作了 - if (holder.gameProgressbar.visibility == View.GONE) return - updateItemViewStatus(holder, true, null, null) holder.gameProgressbar.progressDrawable = R.drawable.progressbar_bg_style.toDrawable() val platform = PlatformUtils.getInstance(context).getPlatformName(downloadEntity.platform) diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt index c464e08401..5ddac8c7c2 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt @@ -97,6 +97,11 @@ class DownloadFragment : BaseFragment_TabLayout() { override fun onResume() { super.onResume() + if (mViewPager.currentItem == INDEX_DOWNLOAD) { + mDownloadManager.markDownloadingTaskAsRead() + mDownloadManager.markDownloadedTaskAsRead() + updateDownloadHint() + } DownloadManager.getInstance(requireContext()).checkAndRetryDownload() } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 754b9989bc..fdafb07946 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -125,12 +125,10 @@ class GameFragmentAdapter( } ItemViewType.GAME_NORMAL -> { val binding = GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false)) - if (mContext is MainActivity) binding.gameIconView.setTag(R.id.tag_show_gif, false) GameItemViewHolder(binding) } ItemViewType.GAME_IMAGE -> { val binding = GameImageItemBinding.bind(mLayoutInflater.inflate(R.layout.game_image_item, parent, false)) - if (mContext is MainActivity) binding.gameIcon.setTag(R.id.tag_show_gif, false) GameImageViewHolder(binding) } ItemViewType.COLUMN_HEADER -> { @@ -452,12 +450,12 @@ class GameFragmentAdapter( DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:" + entity?.name + "-大图)", "首页游戏", entity?.exposureEvent) } - holder.bindImageSlide(entity!!, imageClickListener, "游戏-专题", mContext !is MainActivity, mViewModel) + holder.bindImageSlide(entity!!, imageClickListener, "游戏-专题", mViewModel) } private fun bindGameHorizontalListView(holder: GameHorizontalListViewHolder, position: Int) { val subjectEntity = mItemDataList[position].horizontalColumn - val subjectAdapter = holder.bindHorizontalList(subjectEntity!!, mContext !is MainActivity) + val subjectAdapter = holder.bindHorizontalList(subjectEntity!!) if (subjectEntity.type != "game_horizontal") { holder.binding.horizontalRv.doOnScrolledSpecificDistance(distanceX = DisplayUtils.dip2px(24f), singleTimeEvent = true) { @@ -488,7 +486,7 @@ class GameFragmentAdapter( private fun bindGameHorizontalSlideListView(holder: GameHorizontalSlideListViewHolder, position: Int) { val subjectEntity = mItemDataList[position].horizontalSlide - val subjectAdapter = holder.bindHorizontalSlideList(subjectEntity!!, mContext !is MainActivity, mViewModel) + val subjectAdapter = holder.bindHorizontalSlideList(subjectEntity!!, mViewModel) subjectEntity.data?.let { val positionOffset = subjectAdapter.getIndex() diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt index 2829514a7c..dbff8aac55 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt @@ -14,8 +14,7 @@ import com.gh.gamecenter.entity.SubjectEntity import com.lightgame.adapter.BaseRecyclerAdapter class GameHorizontalAdapter(context: Context, - private var mSubjectEntity: SubjectEntity, - private val mShowGameIconGif: Boolean = true) : BaseRecyclerAdapter(context) { + private var mSubjectEntity: SubjectEntity) : BaseRecyclerAdapter(context) { var gameName = "" var entrance = "" @@ -40,7 +39,6 @@ class GameHorizontalAdapter(context: Context, override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameHorizontalItemViewHolder { val binding: GameHorizontalItemBinding = GameHorizontalItemBinding.bind(mLayoutInflater.inflate(R.layout.game_horizontal_item, parent, false)) - if (!mShowGameIconGif) binding.simpleGameContainer.gameIcon.setTag(R.id.tag_show_gif, false) return GameHorizontalItemViewHolder(binding) } diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt index 8134cd1e71..5a4c1ce092 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt @@ -10,13 +10,13 @@ import com.gh.gamecenter.entity.SubjectEntity class GameHorizontalListViewHolder(val binding: GameHorizontalListBinding) : BaseRecyclerViewHolder(binding.root) { - fun bindHorizontalList(subjectEntity: SubjectEntity, showGameIconGif :Boolean = true): GameHorizontalAdapter { + fun bindHorizontalList(subjectEntity: SubjectEntity): GameHorizontalAdapter { val context = binding.root.context var subjectAdapter = binding.horizontalRv.adapter if (subjectAdapter == null) { binding.horizontalRv.setPadding(5F.dip2px(), 8F.dip2px(), 5F.dip2px(), 8F.dip2px()) binding.horizontalRv.layoutManager = GridLayoutManager(context, 4) - subjectAdapter = GameHorizontalAdapter(context, subjectEntity, showGameIconGif) + subjectAdapter = GameHorizontalAdapter(context, subjectEntity) (binding.horizontalRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false binding.horizontalRv.adapter = subjectAdapter binding.horizontalRv.isNestedScrollingEnabled = false diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt index 334f883f09..d8c2644ba3 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt @@ -12,8 +12,8 @@ import com.gh.gamecenter.entity.SubjectEntity import com.lightgame.adapter.BaseRecyclerAdapter class GameHorizontalSlideAdapter(context: Context, - private var mSubjectEntity: SubjectEntity, - private val mShowGameIconGif: Boolean = true) : BaseRecyclerAdapter(context) { + private var mSubjectEntity: SubjectEntity) + : BaseRecyclerAdapter(context) { var gameName = "" var entrance = "" @@ -38,7 +38,6 @@ class GameHorizontalSlideAdapter(context: Context, override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameHorizontalItemViewHolder { val binding: GameHorizontalItemBinding = GameHorizontalItemBinding.bind(mLayoutInflater.inflate(R.layout.game_horizontal_item, parent, false)) - if (!mShowGameIconGif) binding.simpleGameContainer.gameIcon.setTag(R.id.tag_show_gif, false) return GameHorizontalItemViewHolder(binding) } diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt index 45f01afb78..7726ca6be9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt @@ -23,7 +23,6 @@ class GameHorizontalSlideListViewHolder(val binding: GameHorizontalListBinding) private var mLastScrolledPosition = 0 // 上次记录的最后滚动位置 fun bindHorizontalSlideList(subjectEntity: SubjectEntity, - showGameIconGif: Boolean = true, offsetable: IOffsetable): GameHorizontalSlideAdapter { val context = binding.root.context var subjectAdapter = binding.horizontalRv.adapter @@ -31,7 +30,7 @@ class GameHorizontalSlideListViewHolder(val binding: GameHorizontalListBinding) binding.horizontalRv.setPadding(10F.dip2px(), 8F.dip2px(), 10F.dip2px(), 8F.dip2px()) binding.horizontalRv.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) binding.horizontalRv.clipToPadding = false - subjectAdapter = GameHorizontalSlideAdapter(context, subjectEntity, showGameIconGif) + subjectAdapter = GameHorizontalSlideAdapter(context, subjectEntity) (binding.horizontalRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false binding.horizontalRv.adapter = subjectAdapter binding.horizontalRv.setScrollingTouchSlop(RecyclerView.TOUCH_SLOP_PAGING) diff --git a/app/src/main/java/com/gh/gamecenter/game/imageslide/GameImageSlideViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/imageslide/GameImageSlideViewHolder.kt index b8042ce556..d55b5bb905 100644 --- a/app/src/main/java/com/gh/gamecenter/game/imageslide/GameImageSlideViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/imageslide/GameImageSlideViewHolder.kt @@ -23,7 +23,6 @@ class GameImageSlideViewHolder(val binding: GameImageSlideItemBinding) : BaseRec fun bindImageSlide(entity: GameEntity, imageClickListener: View.OnClickListener, entrance: String, - showGameIconGif: Boolean = true, offsetable: IOffsetable) { val context = binding.root.context @@ -43,7 +42,7 @@ class GameImageSlideViewHolder(val binding: GameImageSlideItemBinding) : BaseRec binding.columnList.visibility = View.VISIBLE var slideAdapter = binding.columnList.adapter if (slideAdapter == null) { - slideAdapter = ImageSlideAdapter(context, entity, imageClickListener, entrance, showGameIconGif) + slideAdapter = ImageSlideAdapter(context, entity, imageClickListener, entrance) (binding.columnList.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false binding.columnList.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) binding.columnList.adapter = slideAdapter diff --git a/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt index 8f71890233..4db269d77c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt @@ -17,15 +17,13 @@ import com.lightgame.adapter.BaseRecyclerAdapter class ImageSlideAdapter(context: Context, var subject: GameEntity, val skipListener: View.OnClickListener, - val entrance: String, - private val mShowGameIconGif: Boolean = true) : BaseRecyclerAdapter(context) { + val entrance: String) : BaseRecyclerAdapter(context) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameHorizontalSimpleItemViewHolder { val binding: GameHorizontalSimpleItemBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.game_horizontal_simple_item, parent, false) val layoutParam = ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) binding.root.layoutParams = layoutParam binding.gameName.setTextColor(Color.WHITE) - if (!mShowGameIconGif) binding.gameIcon.setTag(R.id.tag_show_gif, false) return GameHorizontalSimpleItemViewHolder(binding) } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt index fec8b7870f..f869619799 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt @@ -17,8 +17,7 @@ import com.lightgame.download.DownloadEntity class GameVerticalAdapter(context: Context, private var mSubjectEntity: SubjectEntity, private var mItemClick: (Int, GameEntity) -> Unit, - private var mTransparentBackground: Boolean = false, - private val mShowGameIconGif: Boolean = true) + private var mTransparentBackground: Boolean = false) : BaseRecyclerAdapter(context) { private val mMaxWidth = mContext.resources.displayMetrics.widthPixels @@ -32,7 +31,6 @@ class GameVerticalAdapter(context: Context, override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameItemViewHolder { val binding = GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false)) - if (!mShowGameIconGif) binding.gameIconView.setTag(R.id.tag_show_gif, false) return GameItemViewHolder(binding) } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt index 7f5980fbea..b3230d10e9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt @@ -30,7 +30,7 @@ class GameVerticalSlideViewHolder(val binding: GameVerticalSlideItemBinding) : B val verticalAdapter = adapter as GameVerticalAdapter verticalAdapter.checkResetData(verticalSlide) } else { - adapter = GameVerticalAdapter(context, verticalSlide, itemClick, transparentBackground,showGameIconGif) + adapter = GameVerticalAdapter(context, verticalSlide, itemClick, transparentBackground) } snapHelper.attachToRecyclerView(this) isNestedScrollingEnabled = false diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 4eb9643e64..2b2fbc715a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -273,7 +273,7 @@ class DescAdapter(context: Context, } viewHolder.binding.galleryRv.layoutManager = GridLayoutManager(mContext, 4) - subjectAdapter = GameHorizontalAdapter(mContext, subjectEntity, true) + subjectAdapter = GameHorizontalAdapter(mContext, subjectEntity) subjectAdapter.gameName = gameName ?: "" subjectAdapter.entrance = mEntrance subjectAdapter.exposureEventList = exposureEventList diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index b866a3b863..0f5921e79a 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -352,7 +352,7 @@ class LegacyHomeFragmentAdapterAssistant( DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:" + entity?.name + "-大图)", "首页游戏", exposureEventList.firstOrNull()) } - holder.bindImageSlide(entity!!, imageClickListener, "游戏-专题", true, this) + holder.bindImageSlide(entity!!, imageClickListener, "游戏-专题", this) } private fun bindGameHorizontalListView(holder: GameHorizontalListViewHolder, item: LegacyHomeItemData) { @@ -391,7 +391,7 @@ class LegacyHomeFragmentAdapterAssistant( if (mMakeItemBackgroundTransparent) holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.transparent)) val subjectEntity = item.horizontalSlide - val subjectAdapter = holder.bindHorizontalSlideList(subjectEntity!!, true, this) + val subjectAdapter = holder.bindHorizontalSlideList(subjectEntity!!, this) if (mOuterType == OuterType.AMWAY) { holder.binding.horizontalRv.isNestedScrollingEnabled = false From b9554d11a884bb802516a30f041356dcf15cd837 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Wed, 13 Oct 2021 11:36:52 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.2.0&V5.3.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB=EF=BC=8812=EF=BC=89https://git.ghzs?= =?UTF-8?q?.com/pm/halo-app-issues/-/issues/1565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/search/SearchGameIndexFragment.kt | 1 + .../java/com/gh/gamecenter/search/SearchGameResultFragment.kt | 1 + .../java/com/gh/gamecenter/search/SearchGameResultViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt index bad5491ab2..ea81faed3c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt @@ -160,6 +160,7 @@ class SearchGameIndexFragment : ListFragment() + var mSearchSubjects = arrayListOf() var key = "" @SuppressLint("CheckResult") From f4a5dd47fcbe8d3fd7546ee311b649d817b245a5 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Fri, 15 Oct 2021 18:15:16 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.2.0&V5.3.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB=EF=BC=8813=EF=BC=89https://git.ghzs?= =?UTF-8?q?.com/pm/halo-app-issues/-/issues/1565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt | 2 -- .../java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt index f04f58f077..ab5b2fdce2 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt @@ -90,8 +90,6 @@ class NewCatalogListAdapter(context: Context, holder.initServerType(gameEntity) holder.binding.executePendingBindings() - GameViewUtils.setLabelList(mContext, holder.binding.labelList, gameEntity.tagStyle) - val sortType = mViewModel.sortType.value val sortSize = mViewModel.sortSize.text val toolbarTitle = mViewModel.title diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt index 30595fbfd7..293a9e712a 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt @@ -113,8 +113,6 @@ class CategoryV2ListAdapter(context: Context, holder.initServerType(gameEntity) holder.binding.executePendingBindings() - GameViewUtils.setLabelList(mContext, holder.binding.labelList, gameEntity.tagStyle) - val categoryTitle = mCategoryViewModel.categoryTitle val selectedCategoryName = mCategoryViewModel.selectedCategoryName val builder = StringBuilder() From a1be42a135074f3b53e354a26116c587b0b7ab08 Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Sat, 16 Oct 2021 09:40:35 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.4.0=E3=80=91=E5=90=8E=E5=8F=B0=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=AC=AC=E4=B8=89=E5=91=A8(10(2))=20https://?= =?UTF-8?q?git.ghzs.com/pm/halo-app-issues/-/issues/1564?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5bdd655715085ba7f140e90baf02d2ef74ad55e4) --- .../com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index 86bc7bdf14..e0cd7e334d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -137,7 +137,7 @@ class ArticleEditViewModel(application: Application) : BaseRichEditorViewModel(a fun postArticle(isOriginal: Boolean = false) { processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", true)) val articleBody = getArticleBody() - articleBody.put("original", if (isOriginal) "yes" else "no") + articleBody.put("original", if (isOriginal) "yes" else "") if (draftEntity?.id != null) { articleBody.put("draft_id", draftEntity?.id) } From 5e01ecf0a2dc7d7a843f405b85ac427a504029c0 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Mon, 18 Oct 2021 11:37:06 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A1=B5-=E5=86=85=E5=AE=B9=E6=9D=A5?= =?UTF-8?q?=E6=BA=90-=E8=BD=AC=E8=BD=BD=E7=BD=91=E5=9D=80=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/qa/dialog/InputUrlDialogFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/InputUrlDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/InputUrlDialogFragment.kt index 7981593a0c..633d8cb566 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/InputUrlDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/InputUrlDialogFragment.kt @@ -52,7 +52,7 @@ class InputUrlDialogFragment : BaseDialogFragment() { putExtra(EntranceUtils.KEY_DATA, reprintUrl) } activity?.supportFragmentManager?.findFragmentByTag(parentTag) - ?.onActivityResult(MoreFunctionPanelDialog.REQUEST_CODE, Activity.RESULT_OK, intent) + ?.onActivityResult(REQUEST_CODE, Activity.RESULT_OK, intent) dismissAllowingStateLoss() } } From 37460ceac2f6c2dc27d04bd05b45094428968264 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Mon, 18 Oct 2021 18:09:21 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E5=88=B0=E4=B8=93=E9=A2=98=E5=90=88=E9=9B=86?= =?UTF-8?q?-=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=A0=B7=E5=BC=8F=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt index e51468aa74..51bd26308a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt @@ -117,8 +117,8 @@ class RankCollectionAdapter( if (updateId != id) { notifyDataSetChanged() } else { - mSubAdapters.forEach { _, adapter -> - adapter.notifyItemRangeChanged(0, itemCount) + mSubAdapters.forEach { position, adapter -> + adapter.checkResetData(updateDate.columns[position].data?.take(5) ?: listOf()) } } } From 88098a825558a3138898a4bc3b3bd1fd25cfb951 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 21 Oct 2021 18:07:02 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20DSA=20=E5=BD=A2=E5=BC=8F=E7=9A=84=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/PackageUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index b3167fade7..2c0f63f5d3 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -18,6 +18,7 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import com.android.apksig.ApkVerifier; +import com.android.apksig.internal.apk.ApkSigningBlockUtilsLite; import com.g00fy2.versioncompare.Version; import com.gh.common.xapk.XapkInstaller; import com.gh.gamecenter.BuildConfig; @@ -319,6 +320,9 @@ public class PackageUtils { X509Certificate cert = (X509Certificate) certFactory.generateCertificate( new ByteArrayInputStream(signature)); ret = new String[]{cert.getPublicKey().toString(), cert.getSerialNumber().toString()}; + if (ret[0].startsWith("DSA")) { + ret[0] = "DSAPublicKey{" + ApkSigningBlockUtilsLite.toHex(cert.getPublicKey().getEncoded()) + "}"; + } } catch (CertificateException e) { e.printStackTrace(); } From 1f43b8b220ee9c714c1e428febaa8db50a8d6921 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 22 Oct 2021 10:35:41 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B8=B8=E6=88=8F=E5=A4=A7=E5=B0=8F=E4=B8=8D?= =?UTF-8?q?=E5=8F=97=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/entity/GameEntity.kt | 6 +++--- .../java/com/gh/gamecenter/entity/SubjectData.kt | 12 ++++++++++++ .../gh/gamecenter/subject/SubjectListViewModel.kt | 5 +++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt index 3524c86f1e..d9ef421c6f 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -394,9 +394,9 @@ data class GameEntity( get() = if ( (apk != null && apk!!.size > 0) && !hideSizeInsideDes - && ((TextUtils.isEmpty(briefStyle) - || briefStyle?.contains("size") == true) - || briefStyle?.contains("recommend") == true) + && ((TextUtils.isEmpty(subjectData?.briefStyle) + || subjectData?.briefStyle?.contains("size") == true) + || subjectData?.briefStyle?.contains("recommend") == true) ) { apk?.firstOrNull()?.size + " " + brief } else { diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectData.kt b/app/src/main/java/com/gh/gamecenter/entity/SubjectData.kt index 263f14d396..a2acf36716 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectData.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectData.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import com.gh.gamecenter.game.data.GameSubjectData import kotlinx.android.parcel.Parcelize @Parcelize @@ -22,4 +23,15 @@ data class SubjectData( fun deepCopy(): SubjectData { return super.clone() as SubjectData } + + fun toGameSubjectData(): GameSubjectData { + return GameSubjectData( + id = subjectId, + name = subjectName, + isOrder = isOrder?: false, + briefStyle = briefStyle, + isShowSuffix = showSuffix, + tag = tagType + ) + } } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt index 6ec9665488..56d7a6697f 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt @@ -42,6 +42,11 @@ class SubjectListViewModel(application: Application, override fun mergeResultLiveData() { mResultLiveData.addSource(mListLiveData) { ExposureUtils.updateExposureInfo(it, subjectId = subjectData.subjectId) + + val gameSubjectData = subjectData.toGameSubjectData() + it.forEach { game -> + game.subjectData = gameSubjectData + } mResultLiveData.postValue(it) } }