From 9788b632d69fe18158882cc2cfdf38867df047b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Mon, 8 May 2023 17:14:19 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=8D=95=E5=BC=82=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?view=E6=97=B6=E5=8F=91=E7=94=9F=E7=9A=84=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=B6=8A=E7=95=8C=E9=97=AA=E9=80=80...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/gamecollection/HomeGameCollectionAdapter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt index 646236c9ad..ecd25f6cbc 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt @@ -32,9 +32,10 @@ class HomeGameCollectionAdapter( override fun onBindViewHolder(holder: HomeGameCollectionCardViewHolder, position: Int) { if (gameCollectionItemDataList.isNotEmpty()) { + val gameCollectionItemData = gameCollectionItemDataList.safelyGetInRelease(position) (holder.itemView as HomeGameCollectionItemCell).bindWhenInflated { (holder.itemView as HomeGameCollectionItemCell).binding?.run { - holder.bindGameCollectionCard(this, gameCollectionItemDataList[position], entrance) + gameCollectionItemData?.let { holder.bindGameCollectionCard(this, it, entrance) } } } } From 5047ae5f9c487691ad62f39a505beccda6e274fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Tue, 9 May 2023 11:31:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=85=89=E7=8E=AF=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E5=90=8E=E6=95=B0=E9=87=8F=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E6=97=B6=E5=8F=91=E7=94=9F=E7=9A=84=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=B6=8A=E7=95=8C=E9=97=AA=E9=80=80...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt | 2 +- .../com/gh/gamecenter/personal/HaloPersonalRecommendAdapter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt index 1c4fc8d66e..6ea7a2e24c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt @@ -43,7 +43,7 @@ class HaloPersonalFunctionAdapter(context: Context) : BaseRecyclerAdapter Date: Wed, 10 May 2023 17:35:19 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=8E=A8=E9=80=81=E5=BC=B9=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E5=81=B6=E5=8F=91=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt | 1 + app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt index bacf28c16a..e565411e6d 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt @@ -534,6 +534,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { fun popUpHomePushIfNeeded() { mBinding?.run { + if (mFragmentList.safelyGetInRelease(viewPager.currentItem) !is HomeFragment) return mHomePush?.run { val homePushSet = HashSet(SPUtils.getStringSet(Constants.SP_HOME_PUSH_POP_UP_SET)) if (popSwitch == "on" && !homePushSet.contains(id)) { diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt index c507baed9a..af01cde190 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -195,7 +195,9 @@ class HomeFragment : LazyFragment() { } fun setScrollEnabled(isScrollEnabled: Boolean) { - mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled + if (::mAutomaticLayoutManager.isInitialized) { + mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled + } } fun onRefresh() { From 3ff4a9b6cf88ae4c83d17fc4b7d2516252c6f498 Mon Sep 17 00:00:00 2001 From: juntao Date: Wed, 10 May 2023 17:35:51 +0800 Subject: [PATCH 4/9] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.24.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 140a0450c9..f94fb0fd9d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 833 - versionName = "5.24.3" + versionCode = 834 + versionName = "5.24.4" applicationId = "com.gh.gamecenter" // AndroidX From d1698f0c2dfb874f31c471d6f0eb0bb742590856 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 12 May 2023 10:54:16 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E6=8E=A8=E5=B9=BF=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E6=8E=A5=E5=85=A5=E7=A5=9E=E7=AD=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=20https://jira.shanqu.cc/browse/GHZS-2364?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/SplashScreenActivity.kt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt index 54937654bb..0a4de6b497 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt @@ -301,8 +301,19 @@ class SplashScreenActivity : BaseActivity() { private fun doFlavorInit() { HaloApp.getInstance().flavorProvider.init(HaloApp.getInstance(), this) - // 仅官网渠道和测试包启用神策 - if ("GH_206" == HaloApp.getInstance().channel || PackageFlavorHelper.IS_TEST_FLAVOR) { + val whiteListChannel = arrayListOf( + "GH_206", + "KS-GHZS-KY1", + "KS-GHZS-MC1", + "GDT_GHZS_MC1", + "T11-GH-APPDY-ZC01", + "T7-GH-APPDY-KY03", + "T8-GH-APPUX-KY04", + "T1-GHZS-MC01", + "T4-GHZS-MC03" + ) + + if (whiteListChannel.contains(HaloApp.getInstance().channel) || PackageFlavorHelper.IS_TEST_FLAVOR) { SensorsBridge.init(HaloApp.getInstance(), HaloApp.getInstance().channel) } } From 8d70716f15063e8a811d3cee05007056773fc879 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 12 May 2023 11:53:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BA=205.24.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f94fb0fd9d..d51213a2d1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 834 - versionName = "5.24.4" + versionCode = 835 + versionName = "5.24.5" applicationId = "com.gh.gamecenter" // AndroidX From d826c3dcce6e1654e0dc78291fddc1775a1a950b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Tue, 16 May 2023 11:54:35 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=8E=A8=E5=B9=BF=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=A5=9E=E7=AD=96=E6=95=B0=E6=8D=AE=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E2=80=9405/15=E6=B5=8B=E8=AF=95=20https://jira.shanqu?= =?UTF-8?q?.cc/browse/GHZS-2372?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build_with_simple_backup.sh | 4 ++++ scripts/meta_build.sh | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index 5a9e392d49..1eab3bb6b1 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -11,6 +11,8 @@ build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle +# 重置 module_sensors_data build.gradle +git checkout module_common/build.gradle # 开启 mapping 上传 if [[ "$OSTYPE" == "darwin"* ]]; then @@ -59,4 +61,6 @@ cp -R app/build/outputs/apk/publish/release/app-publish-release.apk release-app/ # 重置 app build.gradle git checkout app/build.gradle # 重置 module_common build.gradle +git checkout module_common/build.gradle +# 重置 module_sensors_data build.gradle git checkout module_common/build.gradle \ No newline at end of file diff --git a/scripts/meta_build.sh b/scripts/meta_build.sh index 3b6821b43a..cb301ff291 100755 --- a/scripts/meta_build.sh +++ b/scripts/meta_build.sh @@ -14,12 +14,16 @@ apk_release_path="" git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle +# 重置 module_sensors_data build.gradle +git checkout module_common/build.gradle # 开启 mapping 上传 if [[ "$OSTYPE" == "darwin"* ]]; then sed -i '' '1 a plugins { id "io.sentry.android.gradle" version "2.1.5" }' app/build.gradle + sed -i '' 's/var isTestBuild = true/var isTestBuild = false/g' module_sensors_data/build.gradle else sed -i '1 a plugins { id "io.sentry.android.gradle" version "2.1.5" }' app/build.gradle + sed -i 's/var isTestBuild = true/var isTestBuild = false/g' module_sensors_data/build.gradle fi ./gradlew --stop @@ -116,4 +120,6 @@ fi # 重置 app build.gradle git checkout app/build.gradle # 重置 module_common build.gradle +git checkout module_common/build.gradle +# 重置 module_sensors_data build.gradle git checkout module_common/build.gradle \ No newline at end of file From 47560daec668ed33e79b94fbfd6f9a4506818eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Tue, 16 May 2023 15:59:38 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E6=8E=A8=E5=B9=BF=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=A5=9E=E7=AD=96=E6=95=B0=E6=8D=AE=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E2=80=9405/15=E6=B5=8B=E8=AF=95=20https://jira.shanqu?= =?UTF-8?q?.cc/browse/GHZS-2372?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build_with_simple_backup.sh | 4 ++-- scripts/meta_build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index 1eab3bb6b1..03d3d0ff42 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -12,7 +12,7 @@ git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle # 重置 module_sensors_data build.gradle -git checkout module_common/build.gradle +git checkout module_sensors_data/build.gradle # 开启 mapping 上传 if [[ "$OSTYPE" == "darwin"* ]]; then @@ -63,4 +63,4 @@ git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle # 重置 module_sensors_data build.gradle -git checkout module_common/build.gradle \ No newline at end of file +git checkout module_sensors_data/build.gradle \ No newline at end of file diff --git a/scripts/meta_build.sh b/scripts/meta_build.sh index cb301ff291..c8008075b9 100755 --- a/scripts/meta_build.sh +++ b/scripts/meta_build.sh @@ -15,7 +15,7 @@ git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle # 重置 module_sensors_data build.gradle -git checkout module_common/build.gradle +git checkout module_sensors_data/build.gradle # 开启 mapping 上传 if [[ "$OSTYPE" == "darwin"* ]]; then @@ -122,4 +122,4 @@ git checkout app/build.gradle # 重置 module_common build.gradle git checkout module_common/build.gradle # 重置 module_sensors_data build.gradle -git checkout module_common/build.gradle \ No newline at end of file +git checkout module_sensors_data/build.gradle \ No newline at end of file From f05b20ed98ec7d5752bd9b5e8f37157ce6f37f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Thu, 18 May 2023 14:16:33 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E5=AD=90=E7=89=88=E5=9D=97=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E4=BD=8D=20https://jira.shanqu.cc/browse/GHZS-1867?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 5d599e910f..f1da059f30 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -394,7 +394,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { mViewModel?.sectionListLiveData?.observe(this) { if (!it.isNullOrEmpty() && it.size >= 2) { mShowSections = true - mBinding.sectionContainer.visibility = View.VISIBLE + mBinding.sectionContainer.goneIf(mViewPager.currentItem != INDEX_ALL) if (mSectionId.isNotEmpty()) { it.forEachIndexed { index, section -> if (section.id == mSectionId) {