build: 添加 3.7.0 版本的 sentry plugin 缓存

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-10-24 10:15:39 +08:00 · 2024-10-23 15:51:23 +08:00 · 2024-10-23 15:50:47 +08:00
58 changed files with 234 additions and 626 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -72,6 +72,7 @@ android_build:
  only:
    - dev
    - release
+    - pack/update_sentry_plugin_cache

 # 代码检查
 sonarqube_analysis:
@ -157,3 +158,4 @@ oss-upload&send-email:
    only:
        - dev
        - release
+        - pack/update_sentry_plugin_cache
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -663,8 +663,7 @@
            android:name=".authorization.AuthorizationActivity"
            android:exported="true"
            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:taskAffinity=".auth">
+            android:screenOrientation="portrait">
            <intent-filter>
                <data android:scheme="ghzhushou_authorization" />
                <category android:name="android.intent.category.DEFAULT" />
--- a/app/src/main/java/com/gh/common/exposure/ExposureListener.kt
+++ b/app/src/main/java/com/gh/common/exposure/ExposureListener.kt
@ -31,7 +31,6 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
                override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                    if (fragment == f) {
                        visibleState?.let { commitExposure(it) }
-                        visibleState?.let { commitWXCPMExposure(it) }
                        throttleBus.clear()
                    }
                }
--- a/app/src/main/java/com/gh/common/fragment/FragmentManagerExt.kt
+++ b/app/src/main/java/com/gh/common/fragment/FragmentManagerExt.kt
@ -1,74 +0,0 @@
-package com.gh.common.fragment
-
-import androidx.fragment.app.FragmentManager
-import java.lang.reflect.Field
-
-fun FragmentManager.popBackStackAllowStateLoss() {
-    popBackStackAllowStateLoss(-1, 0)
-}
-
-fun FragmentManager.popBackStackAllowStateLoss(id: Int, flags: Int) {
-    if (!isStateSaved) {
-        popBackStack(id, flags)
-    } else {
-        hook { popBackStack(id, flags) }
-    }
-}
-
-fun FragmentManager.popBackStackAllowStateLoss(name: String?, flags: Int) {
-    if (!isStateSaved) {
-        popBackStack(name, flags)
-    } else {
-        hook { popBackStack(name, flags) }
-    }
-}
-
-fun FragmentManager.popBackStackImmediateAllowStateLoss() = popBackStackAllowStateLoss(-1, 0)
-
-fun FragmentManager.popBackStackImmediateAllowStateLoss(id: Int, flags: Int) =
-    if (!isStateSaved) {
-        popBackStackImmediate(id, flags)
-    } else {
-        hook { popBackStackImmediate(id, flags) }
-    }
-
-fun FragmentManager.popBackStackImmediateAllowStateLoss(name: String?, flags: Int): Boolean =
-    if (!isStateSaved) {
-        popBackStackImmediate(name, flags)
-    } else {
-        hook { popBackStackImmediate(name, flags) }
-    }
-
-/**
- * 通过反射将FragmentManager的mStateSaved和mStopped设为false，否则Activity在回调onSavedInstance以后，
- * 调用Fragment的popBackStack和popBackStackImmediate方法会触发“java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState”的异常。
- * @see <a href="https://sentry.shanqu.cc/organizations/lightgame/issues/418688/?project=22">Sentry-418688</a>
- */
-private fun <T> FragmentManager.hook(callback: FragmentManager.() -> T): T {
-    val mStateSavedField = getField(this::class.java,"mStateSaved")
-    val stateSaved = mStateSavedField.get(this);
-    mStateSavedField.set(this, false)
-    val mStoppedField = getField(this::class.java,"mStopped")
-    val stopped = mStateSavedField.get(this);
-    mStoppedField.set(this, false)
-    val result = callback.invoke(this)
-    mStateSavedField.set(this, stateSaved)
-    mStoppedField.set(this, stopped)
-    return result
-}
-
-@Throws(NoSuchFieldException::class)
-private fun getField(clazz: Class<*>, name: String): Field {
-    var cls: Class<*>? = clazz
-    while (cls != null) {
-        try {
-            val declaredField = cls.getDeclaredField(name)
-            declaredField.isAccessible = true
-            return declaredField
-        } catch (e: NoSuchFieldException) {
-            e.printStackTrace()
-        }
-        cls = cls.superclass
-    }
-    throw NoSuchFieldException()
-}
--- a/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
+++ b/app/src/main/java/com/gh/common/iinterface/ISmartRefreshContent.kt
@ -1,9 +1,12 @@
 package com.gh.common.iinterface

-import com.scwang.smartrefresh.layout.api.RefreshLayout
-import com.scwang.smartrefresh.layout.constant.RefreshState
-
 interface ISmartRefreshContent {
+    /**
+     * 启用/关闭 页面滑动
+     * @param isScrollEnabled 是否启用
+     */
+    fun setScrollEnabled(isScrollEnabled: Boolean)
+
    fun onRefresh()

    /**
@ -11,6 +14,4 @@ interface ISmartRefreshContent {
     * @param isSwipeRefreshEnabled 是否启用
     */
    fun setSwipeRefreshEnabled(isSwipeRefreshEnabled: Boolean)
-
-    fun onStateChanged(refreshLayout: RefreshLayout, oldState: RefreshState, newState: RefreshState)
 }
--- a/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt
@ -115,12 +115,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    "本地下载"
                }

-                // 小游戏的启动不需要上报下载点击事件
-                // @see https://jira.shanqu.cc/browse/GHZSCY-7013
-                if (boundedObject is GameEntity && boundedObject.isMiniGame()) {
-                    return
-                }
-
                // 上报神策点击事件
                val customPageKV = customPageTrackData?.toKV() ?: arrayOf()
                SensorsBridge.trackEventWithExposureSource(
@ -130,7 +124,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                    "game_name", gameName,
                    "game_type", gameTypeInChinese,
                    "download_status", downloadStatusInChinese,
-                    "button_name", text,
+                    "button_name", downloadButton.text,
                    "game_schema_type", gameSchemaType,
                    "download_type", downloadType,
                    "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@ -16,7 +16,6 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.provider.ISentryProvider;
 import com.gh.gamecenter.core.utils.GsonUtils;
@ -40,11 +39,6 @@ import io.reactivex.schedulers.Schedulers;
 */
 public class DataUtils {

-    // 神策 OAID 是否已绑定
-    private static boolean isSensorOAIDBounded = false;
-    // 原始的 OAID 是否已成功获取
-    private static boolean originalOAIDIsReceived = false;
-
    private DataUtils() {
        throw new IllegalStateException("Utility class");
    }
@ -71,6 +65,7 @@ public class DataUtils {
        // 默认用 APP 级已存储的 GID 来使用，不使用外部 GID
        String savedGid = SPUtils.getString(Constants.GID);
        if (!TextUtils.isEmpty(savedGid)) {
+            HaloApp.getInstance().setGid(savedGid);
            onGidReceived(savedGid);
        } else {
            GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
@ -94,8 +89,6 @@ public class DataUtils {
    }

    private static void onGidReceived(String gid) {
-        bindValidOaidToSensor(false);
-
        HaloApp.getInstance().setGid(gid);
        // 更新广告配置
        AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
@ -118,35 +111,6 @@ public class DataUtils {
        });
    }

-    /**
-     * 为神策绑定有效的 OAID
-     */
-    public static void bindValidOaidToSensor(boolean fromOaidResult) {
-        if (isSensorOAIDBounded) return;
-
-        String oaid = HaloApp.getInstance().getOAID();
-
-        // 来自于 oaid 获取回调，或者说原始 oaid 已经获取成功
-        if (fromOaidResult || originalOAIDIsReceived) {
-            originalOAIDIsReceived = true;
-            // 遇到异常的 OAID
-            if (Constants.INVALID_OAID_1.equals(oaid)
-                    || Constants.INVALID_OAID_2.equals(oaid)
-                    || Constants.INVALID_OAID_3.equals(oaid)
-                    || TextUtils.isEmpty(oaid)) {
-                // 若 gid 不为空，那么整合 gid 作为 oaid https://jira.shanqu.cc/browse/GHZSCY-7004
-                if (HaloApp.getInstance().getGid() != null) {
-                    oaid = "GID" + HaloApp.getInstance().getGid();
-                    SensorsBridge.INSTANCE.setOAID(oaid);
-                    isSensorOAIDBounded = true;
-                }
-            } else {
-                SensorsBridge.INSTANCE.setOAID(oaid);
-                isSensorOAIDBounded = true;
-            }
-        }
-    }
-
    /**
     * 获取应用 gid 绑定的实名信息
     */
--- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
+++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
@ -139,7 +139,6 @@ public class DetailDownloadUtils {
            // 游戏包含多 APK 的情况
            viewHolder.getMultiVersionDownloadTv().setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord));
            viewHolder.getMultiVersionDownloadTv().setVisibility(View.VISIBLE);
-            viewHolder.getDownloadPb().setTag(com.gh.gamecenter.feature.R.string.download, viewHolder.getMultiVersionDownloadTv().getText());
            viewHolder.getDownloadPb().setText("");
            viewHolder.getDownloadPb().setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
--- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt
+++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt
@ -284,12 +284,7 @@ object PackageInstaller {
            installIntent.setDataAndType(uri, "application/vnd.android.package-archive")
        }

-        // 优选系统的安装器（遇到 Exception 就回落到正常的安装器）
-        try {
-            updateSystemInstallerIfAvailable(context, installIntent)
-        } catch (ignored: Exception) {
-            // ignored
-        }
+        updateSystemInstallerIfAvailable(context, installIntent)

        InstallUtils.getInstance()
            .addInstall(PackageUtils.getPackageNameByPath(context, path))
--- a/app/src/main/java/com/gh/common/util/PackageLauncher.kt
+++ b/app/src/main/java/com/gh/common/util/PackageLauncher.kt
@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.isVGameDownloadInDualDownloadMode
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.GameInstall
-import com.gh.gamecenter.manager.PackagesManager
+import com.gh.gamecenter.packagehelper.PackageRepository
 import com.gh.vspace.VHelper

 object PackageLauncher {
@ -91,7 +91,7 @@ object PackageLauncher {
        val gameInstall = if (gameEntity != null) {
            GameInstall.transformGameInstall(gameEntity, packageName)
        } else {
-            PackagesManager.getInstalledList().find { it.packageName == packageName }
+            PackageRepository.gameInstalled.find { it.packageName == packageName }
        }

        if (gameInstall != null) {
--- a/app/src/main/java/com/gh/common/util/PackageUtils.java
+++ b/app/src/main/java/com/gh/common/util/PackageUtils.java
@ -542,8 +542,10 @@ public class PackageUtils {
        try {
            Intent intent = context.getApplicationContext().getPackageManager().getLaunchIntentForPackage(packageName);
            return intent != null;
-        } catch (Exception exception) {
-            return PackageHelper.INSTANCE.getLocalPackageNameSet().contains(packageName);
+        } catch (IllegalArgumentException exception) {
+            // 一些设备调用获取 intent 的时候会触发 Parcel.readException !
+            exception.printStackTrace();
+            return false;
        }
    }

--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@ -1045,7 +1045,6 @@ public class MainActivity extends BaseActivity {
        blackList.add(R.id.historyTv);
        blackList.add(R.id.myCollectionTv);
        blackList.add(R.id.searchTv);
-        blackList.add(R.id.subject_tab);
        updateStaticView(view, blackList);

        View communityHomeWrapper = view.findViewById(R.id.communityHomeContainer);
--- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
@ -15,7 +15,6 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
-import com.gh.common.fragment.popBackStackAllowStateLoss
 import com.gh.common.util.DataCollectionUtils
 import com.gh.common.util.LogUtils
 import com.gh.gamecenter.DisplayType.*
@ -382,7 +381,7 @@ open class SearchActivity : BaseActivity() {
    }

    protected fun popBackToFragment(tag: String) {
-        supportFragmentManager.popBackStackAllowStateLoss(tag, 0)
+        supportFragmentManager.popBackStack(tag, 0)
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
@ -285,7 +285,7 @@ class SplashScreenActivity : BaseActivity() {
        val pushProvider = ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider
        val registrationId = pushProvider?.getRegistrationId(this)
        if (!registrationId.isNullOrEmpty()) {
-            SensorsBridge.profileSet(KEY_REGISTRATION_ID, registrationId)
+            SensorsBridge.profileAppend(KEY_REGISTRATION_ID, registrationId)
        }
    }

--- a/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt
@ -242,10 +242,10 @@ class AuthorizationActivity : ToolBarActivity() {
            VHelper.launch(this, gamePkg, ignoreGApps = true, showLoading = showLoading)
            return
        }
-//        val remotePkgName = this.mRemotePkgName
-//        if (remotePkgName != null) {// 跳转回其他授权app
-//            startActivity(packageManager.getLaunchIntentForPackage(remotePkgName))
-//        }
+        val remotePkgName = this.mRemotePkgName
+        if (remotePkgName != null) {// 跳转回其他授权app
+            startActivity(packageManager.getLaunchIntentForPackage(remotePkgName))
+        }
    }

    override fun onBackPressed() {
--- a/app/src/main/java/com/gh/gamecenter/entity/SearchSubjectEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/SearchSubjectEntity.kt
@ -18,13 +18,7 @@ data class SearchSubjectEntity(
    @SerializedName("ad_icon_active")
    val adIconActive: Boolean = false,
    // 本地字段，标记是否为微信小游戏CPM专题
-    var isWGameSubjectCPM: Boolean = false,
-    val type: String = ""
+    var isWGameSubjectCPM: Boolean = false
 ) : Parcelable {
-
-    companion object {
-        const val TYPE_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column"
-    }
-
    fun getFilterGame() = RegionSettingHelper.filterGame(games)
 }
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
@ -983,17 +983,14 @@ class DescAdapter(
                setExpandMaxLines(maxDesLines)
                setIsExpanded(Int.MAX_VALUE == maxDesLines)
                if (customColumn.isHtmlDes == true) {
-                    val decoratedDesBrief = (customColumn.desBrief ?: "").dropFontColorInDarkMode(contentTv.context)
-                    val decoratedDes = (customColumn.des ?: "").dropFontColorInDarkMode(contentTv.context)
-
                    shrankSpanned = HtmlCompat.fromHtml(
-                        decoratedDesBrief,
+                        customColumn.desBrief ?: "",
                        HtmlCompat.FROM_HTML_MODE_COMPACT,
                        PicassoImageGetter(contentTv),
                        ExtraTagHandler()
                    )
                    expandedSpanned = HtmlCompat.fromHtml(
-                        decoratedDes,
+                        customColumn.des ?: "",
                        HtmlCompat.FROM_HTML_MODE_COMPACT,
                        PicassoImageGetter(contentTv),
                        ExtraTagHandler()
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt
@ -25,10 +25,10 @@ import com.gh.gamecenter.common.utils.toPx
 import com.gh.gamecenter.core.iinterface.IScrollable
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SpanBuilder
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.RatingComment
 import com.gh.gamecenter.eventbus.EBStar
 import com.gh.gamecenter.eventbus.EBTypeChange
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.halo.assistant.HaloApp
 import org.greenrobot.eventbus.EventBus
@ -60,7 +60,7 @@ class RatingFragment : LazyListFragment<RatingComment, RatingViewModel>(), IScro
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
        if (requestCode == RATING_EDIT_REQUEST && resultCode == Activity.RESULT_OK) {
-            mListViewModel?.initData()
+            mListViewModel.initData()
        } else if (
            (requestCode == RATING_REPLAY_REQUEST || requestCode == RATING_PATCH_REQUEST)
            && resultCode == Activity.RESULT_OK
--- a/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt
@ -69,9 +69,6 @@ import com.gh.gamecenter.wrapper.SearchToolbarTabWrapperViewModel
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
-import com.scwang.smartrefresh.layout.api.RefreshLayout
-import com.scwang.smartrefresh.layout.constant.RefreshState
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

@ -748,7 +745,7 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable {
        }
    }

-    private fun setScrollEnabled(isScrollEnabled: Boolean) {
+    override fun setScrollEnabled(isScrollEnabled: Boolean) {
        if (::layoutManager.isInitialized) {
            layoutManager.isScrollVerticallyEnabled = isScrollEnabled
        }
@ -764,32 +761,6 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable {
        }
    }

-    override fun onStateChanged(refreshLayout: RefreshLayout, oldState: RefreshState, newState: RefreshState) {
-        if (oldState == RefreshState.None && newState == RefreshState.PullDownToRefresh) {
-            pauseVideo()
-        } else if ((oldState == RefreshState.TwoLevelFinish || oldState == RefreshState.RefreshFinish) && newState == RefreshState.None) {
-            val currentPlayer = scrollCalculatorHelper.currentPlayer
-            if (currentPlayer == null) {
-                scrollCalculatorHelper.playIfValid()
-            } else if (currentPlayer.currentState == GSYVideoView.CURRENT_STATE_PAUSE) {
-                resumeVideo()
-            }
-        }
-
-        when (newState) {
-            RefreshState.TwoLevel -> {
-                setScrollEnabled(false)
-            }
-            RefreshState.None -> {
-                setScrollEnabled(true)
-            }
-
-            else -> {
-                // do nothing
-            }
-        }
-    }
-
    override fun scrollToTop() {
        if (::binding.isInitialized) {
            binding.gameList.stopScroll()
--- a/app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/model/CustomPageRepository.kt
@ -806,7 +806,7 @@ class CustomPageRepository private constructor(

    fun loadChangeSubjectGame(subjectEntity: SubjectEntity): Observable<List<GameEntity>> =
        if (subjectEntity.isWechatColumnCPM) {// 微信小游戏CPM专题的“换一批”接口
-            wGameSubjectCPMRemoteDataSource.getEditorRecommendCPMList(2, 10).toObservable()
+            wGameSubjectCPMRemoteDataSource.getRecommendCPMList(2, 10).toObservable()
        } else {
            remoteDataSource.loadChangeSubjectGame(subjectEntity)
        }
--- a/app/src/main/java/com/gh/gamecenter/home/custom/tracker/SubjectTracker.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/tracker/SubjectTracker.kt
@ -65,7 +65,7 @@ class SubjectTracker(private val pageLocation: PageLocation) {
            pageLocation.pageName,
            subject?.id ?: "",
            subject?.name ?: "",
-            "自定义页面",
+            "最近在玩",
            item.componentStyle,
            "",
        )
--- a/app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomGameGallerySlideViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/custom/viewholder/CustomGameGallerySlideViewHolder.kt
@ -40,7 +40,7 @@ class CustomGameGallerySlideViewHolder(
    override fun bindView(item: CustomPageItem) {
        super.bindView(item)
        if (item is CustomSubjectItem) {
-            binding.cardView.setCardBackgroundColor(com.gh.gamecenter.common.R.color.ui_container_1.toColor(binding.root.context))
+
            if (item.data == cachedSubject) return

            cachedSubject = item.data
@ -77,6 +77,7 @@ class CustomGameGallerySlideViewHolder(
                val gameList = item.data.data ?: emptyList()
                (recyclerView.adapter as? GameGallerySlideAdapter)?.submitList(gameList)
            }
+            binding.cardView.setCardBackgroundColor(com.gh.gamecenter.common.R.color.text_FAFAFA.toColor(binding.root.context))
        }


--- a/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt
@ -29,10 +29,7 @@ class ScrollCalculatorHelper(

    fun enableAndPlayIfValid() {
        isEnabled = true
-        playIfValid()
-    }

-    fun playIfValid() {
        if (mListRv.isAttachedToWindow
            && mListRv.scrollState == RecyclerView.SCROLL_STATE_IDLE) {
            playVideo(mListRv)
--- a/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchDefaultRankAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchDefaultRankAdapter.kt
@ -59,7 +59,7 @@ class MiniGameSearchDefaultRankAdapter(
                _id = rank.id,
                mName = rank.name,
                miniGameAppId = rank.link.link ?: "",
-                miniGameCategory = Constants.WECHAT_MINI_GAME,
+                miniGameType = Constants.WECHAT_MINI_GAME,
                usage = rank.usage ?: 0
            )
            holder.binding.playCount.visibility = View.VISIBLE
--- a/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/MiniGameSearchResultRepository.kt
@ -21,15 +21,11 @@ class MiniGameSearchResultRepository(
        return api.getSearchMiniGameList(key, page, 20)
    }

-    override fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>> {
-        return Observable.just(emptyList())
-    }
-
    override fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>> {
        return Observable.just(emptyList())
    }

    override fun getWGameCPMGameList(): Single<MutableList<GameEntity>> {
-        return mWGameSubjectCPMDataSource.getUserRecommendCPMList()
+        return mWGameSubjectCPMDataSource.getRecommendCPMList(1)
    }
 }
--- a/app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMListRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMListRepository.kt
@ -11,7 +11,7 @@ class WGameSubjectCPMListRepository(
 ) : ISubjectListRepository {

    override fun getColumn(column_id: String?, page: Int, sort: String?, order: String?): Single<MutableList<GameEntity>> {
-        return dataSource.getEditorRecommendCPMList(page)
+        return dataSource.getRecommendCPMList(page)
    }

    override fun getColumnSettings(column_id: String?): Observable<SubjectSettingEntity> {
--- a/app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMRemoteDataSource.kt
+++ b/app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMRemoteDataSource.kt
@ -14,51 +14,7 @@ class WGameSubjectCPMRemoteDataSource(
    private val api: WGameCPMApiService = RetrofitManager.getInstance().wGameCPMApi
 ) {

-    fun getEditorRecommendCPMList(page: Int, pageSize: Int = 10): Single<MutableList<GameEntity>> {
-        val meta = MetaUtil.getMeta()
-        val request = mapOf(
-            "head" to mapOf(
-                "busiAppid" to Config.WGAME_CPM_BUSIAPPID,
-                "oaid" to (meta.oaid ?: ""),
-                "manufacturer" to (meta.manufacturer ?: ""),
-                "mode" to (meta.model ?: ""),
-                "androidId" to (MetaUtil.getAndroidId()),
-                "imei" to (MetaUtil.getIMEI())
-            ),
-            "body" to mapOf(
-                "page" to page - 1,
-                "pageSize" to pageSize,
-            )
-        )
-        return api.getEditorRecommendList(request.toRequestBody())
-            .map {
-                if (it.ret == 0) {
-                    it.appInfoList.map { info ->
-                        GameEntity(
-                            mName = info.appName,
-                            mIcon = info.logo,
-                            mBrief = info.briefIntro,
-                            miniGameUid = info.appID,
-                            miniGameAppId = info.userName,
-                            miniGameCategory = Constants.WECHAT_MINI_GAME,
-                            profit = Constants.WECHAT_MINI_GAME_PROFIT_CPM,
-                            miniGameAppStatus = 2,
-                            miniGameAppPath = info.wechatAppPath,
-                            miniGameExtData = info.extData,
-                            miniGameRecommendId = info.recommendID,
-                            mTagStyle = arrayListOf(
-                                TagStyleEntity(name = info.categoryName),
-                                TagStyleEntity(name = info.subcategoryName)
-                            )
-                        )
-                    }.toMutableList()
-                } else {
-                    mutableListOf()
-                }
-            }
-    }
-
-    fun getUserRecommendCPMList(page: Int = 1, pageSize: Int = 10): Single<MutableList<GameEntity>> {
+    fun getRecommendCPMList(page: Int, pageSize: Int = 10): Single<MutableList<GameEntity>> {
        val meta = MetaUtil.getMeta()
        val request = mapOf(
            "head" to mapOf(
@ -84,8 +40,7 @@ class WGameSubjectCPMRemoteDataSource(
                            mBrief = info.briefIntro,
                            miniGameUid = info.appID,
                            miniGameAppId = info.userName,
-                            miniGameCategory = Constants.WECHAT_MINI_GAME,
-                            profit = Constants.WECHAT_MINI_GAME_PROFIT_CPM,
+                            miniGameType = Constants.WECHAT_MINI_GAME_CPM,
                            miniGameAppStatus = 2,
                            miniGameAppPath = info.wechatAppPath,
                            miniGameExtData = info.extData,
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@ -318,12 +318,6 @@ public interface ApiService {
    @GET
    Observable<List<GameEntity>> getSearchGame(@Url String url);

-    /**
-     * 搜索CPM微信小游戏
-     */
-    @GET("mini_game/search/configs")
-    Observable<List<GameEntity>> getSearchWechatMiniCPMGame(@Query("keyword") String key);
-
    /**
     * 游戏搜索的专题数据
     */
--- a/app/src/main/java/com/gh/gamecenter/search/ISearchGameResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/ISearchGameResultRepository.kt
@ -8,8 +8,6 @@ import io.reactivex.Single
 interface ISearchGameResultRepository {
    fun getSearchGame(key: String?, page: Int): Observable<List<GameEntity>>

-    fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>>
-
    fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>>

    fun getWGameCPMGameList(): Single<MutableList<GameEntity>>
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexItemViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexItemViewHolder.kt
@ -86,7 +86,7 @@ class SearchSubjectItemViewHolder(var binding: SearchSubjectItemBinding) : Recyc

        binding.run {
            subjectRv.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-            subjectRv.adapter = SearchSubjectAdapter(context, entity.getFilterGame(), entity.columnId, entity.name, "($type-专题)", key) {
+            subjectRv.adapter = SearchSubjectAdapter(context, entity.getFilterGame(), "($type-专题)", key) {
                dao?.add(key)
                if (itemData.adConfig != null) {
                    NewFlatLogUtils.logClickGameAd(
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt
@ -107,7 +107,6 @@ class SearchGameResultAdapter(
        return when {
            oldItem?.subject != null && newItem?.subject != null -> {
                oldItem.subject.columnId == newItem.subject.columnId
-                        && oldItem.subject.games == newItem.subject.games
            }

            oldItem?.game != null && newItem?.game != null -> {
@ -122,7 +121,6 @@ class SearchGameResultAdapter(
        return when {
            oldItem?.subject != null && newItem?.subject != null -> {
                oldItem.subject.columnId == newItem.subject.columnId
-                        && oldItem.subject.games == newItem.subject.games
            }

            oldItem?.game != null && newItem?.game != null -> {
@ -171,50 +169,39 @@ class SearchGameResultAdapter(
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        when (holder) {
            is SearchSubjectItemViewHolder -> {
-                val itemData = mEntityList[position]
-                if (itemData.subject == null || itemData.subject.games.isEmpty()) {
-                    holder.binding.topDivider.visibility = View.GONE
-                    holder.binding.bottomDivider.visibility = View.GONE
-                    holder.binding.headContainer.root.visibility = View.GONE
-                    holder.binding.subjectRv.visibility = View.GONE
-                } else {
-                    holder.binding.headContainer.root.visibility = View.VISIBLE
-                    holder.binding.subjectRv.visibility = View.VISIBLE
-
-                    holder.binding.run {
-                        when {
-                            position == 0 -> topDivider.visibility = View.GONE
-                            position > 0 -> {
-                                val gameEntity = mEntityList[position - 1].game
-                                if (gameEntity != null) {
-                                    val isShowTag = gameEntity.contentTag != null
-                                            && (gameEntity.contentTag!!.custom.isNotEmpty()
-                                            || gameEntity.contentTag!!.zone.link.isNotEmpty()
-                                            || gameEntity.contentTag!!.isLibaoExists
-                                            || gameEntity.contentTag!!.server)
-                                    val isShowTagByMirror =
-                                        if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.obtainMirrorData()?.contentTagStatus == "on" else isShowTag
-                                    if (isShowTagByMirror) {
-                                        topDivider.visibility = View.GONE
-                                    } else {
-                                        topDivider.visibility = View.VISIBLE
-                                    }
-                                } else {
+                holder.binding.run {
+                    when {
+                        position == 0 -> topDivider.visibility = View.GONE
+                        position > 0 -> {
+                            val gameEntity = mEntityList[position - 1].game
+                            if (gameEntity != null) {
+                                val isShowTag = gameEntity.contentTag != null
+                                        && (gameEntity.contentTag!!.custom.isNotEmpty()
+                                        || gameEntity.contentTag!!.zone.link.isNotEmpty()
+                                        || gameEntity.contentTag!!.isLibaoExists
+                                        || gameEntity.contentTag!!.server)
+                                val isShowTagByMirror =
+                                    if (gameEntity.shouldUseMirrorInfo()) isShowTag && gameEntity.obtainMirrorData()?.contentTagStatus == "on" else isShowTag
+                                if (isShowTagByMirror) {
                                    topDivider.visibility = View.GONE
+                                } else {
+                                    topDivider.visibility = View.VISIBLE
                                }
+                            } else {
+                                topDivider.visibility = View.GONE
                            }
                        }
-                        bottomDivider.visibility = View.VISIBLE
                    }
-                    holder.bindSubjectItem(
-                        mContext,
-                        itemData,
-                        SearchType.fromString(type).toChinese(),
-                        key,
-                        dao,
-                        sourceEntrance = sourceEntrance
-                    )
+                    bottomDivider.visibility = View.VISIBLE
                }
+                holder.bindSubjectItem(
+                    mContext,
+                    mEntityList[position],
+                    SearchType.fromString(type).toChinese(),
+                    key,
+                    dao,
+                    sourceEntrance = sourceEntrance
+                )
            }

            is SearchGameFirstItemViewHolder -> {
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultRepository.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultRepository.kt
@ -10,20 +10,13 @@ import com.gh.gamecenter.retrofit.service.ApiService
 import com.halo.assistant.HaloApp
 import io.reactivex.Observable
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
 import java.net.URLEncoder
-import java.util.concurrent.TimeUnit

 class SearchGameResultRepository(
    private val mApi: ApiService = RetrofitManager.getInstance().api,
-    private val mNewApi: ApiService = RetrofitManager.getInstance().newApi,
    private val mWGameSubjectCPMDataSource: WGameSubjectCPMRemoteDataSource = WGameSubjectCPMRemoteDataSource()
 ) : ISearchGameResultRepository {

-    private var currentSearchKey: String? = null
-
-    private var currentMiniGameCPMSearchList: MutableList<GameEntity>? = null
-
    override fun getSearchGame(
        key: String?,
        page: Int
@ -38,26 +31,11 @@ class SearchGameResultRepository(
        )
    }

-    override fun getSearchMiniGameCPM(key: String?): Observable<List<GameEntity>> {
-        val currentMiniGameCPMSearchList = currentMiniGameCPMSearchList
-        if (key == currentSearchKey && currentMiniGameCPMSearchList != null) {
-            return Observable.just(currentMiniGameCPMSearchList)
-        }
-        return mNewApi.getSearchWechatMiniCPMGame(key)
-            .timeout(5, TimeUnit.SECONDS)
-            .onErrorReturnItem(emptyList())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext {
-                this.currentSearchKey = key
-                this.currentMiniGameCPMSearchList = it
-            }
-    }
-
    override fun getSearchSubject(key: String?, page: Int): Observable<List<SearchSubjectEntity>> {
        return mApi.getSearchSubject(key, page)
    }

    override fun getWGameCPMGameList(): Single<MutableList<GameEntity>> {
-        return mWGameSubjectCPMDataSource.getUserRecommendCPMList()
+        return mWGameSubjectCPMDataSource.getRecommendCPMList(1)
    }
 }
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultViewModel.kt
@ -67,60 +67,49 @@ class SearchGameResultViewModel(

    @SuppressLint("CheckResult")
    private fun decorateListAndPost(list: MutableList<GameEntity>) {
-        val itemDataList = ArrayList<SearchItemData>()
-        val combineGameList = list.toMutableList()
+        val itemDataList = ArrayList(
+            list.mapIndexed { index, game ->
+                SearchItemData(game = game, gamePosition = index, isFirst = index == 0)
+            }
+        )

        refreshWrongInstallStatus()

-        repository.getSearchMiniGameCPM(mSearchKey)
-            .zipWith(repository.getSearchSubject(mSearchKey, mPage)) { cpmGameList, subjectList -> // CPM游戏搜索结果列表合并
-                for (cpmGame in cpmGameList) {
-                    if (cpmGame.location <= 0 || cpmGame.location > list.size) {
-                        combineGameList.add(cpmGame)
+        repository.getSearchSubject(mSearchKey, mPage)
+            .map { dataList ->
+                mSearchSubjects.addAll(dataList)
+                var cpmSearchSubject: SearchSubjectEntity? = null
+                mSearchSubjects.forEach {
+                    // 微信小游戏CPM专题需要等搜索广告位插入完成后再插入
+                    if (it.location == WGAME_CPM_SUBJECT_POSITION) {
+                        cpmSearchSubject = it.apply { isWGameSubjectCPM = true }
                    } else {
-                        combineGameList.add(cpmGame.location - 1, cpmGame)
+                        val item = SearchItemData(subject = it)
+                        if (it.location <= 0 || it.location > itemDataList.size) {
+                            itemDataList.add(item)
+                        } else {
+                            itemDataList.add(it.location - 1, item)
+                        }
                    }
                }
-                itemDataList.addAll(
-                    combineGameList.mapIndexed { index, game ->
-                        SearchItemData(game = game, gamePosition = index, isFirst = index == 0)
-                    }
-                )
-                subjectList
+                cpmSearchSubject to dataList
            }
            .subscribeOn(Schedulers.io())
            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ mutableList ->
-                val cpmSearchSubjects = mutableListOf<SearchSubjectEntity>()
-                mSearchSubjects.addAll(mutableList)
-                mSearchSubjects.forEach {
-                    if (it.type == SearchSubjectEntity.TYPE_WECHAT_GAME_CPM_COLUMN) {
-                        cpmSearchSubjects.add(it.apply { isWGameSubjectCPM = true })
-                    }
-                    val item = SearchItemData(subject = it)
-                    if (it.location <= 0 || it.location > itemDataList.size) {
-                        itemDataList.add(item)
-                    } else {
-                        itemDataList.add(it.location - 1, item)
-                    }
-                }
+            .subscribe({ result ->
                // 处理初始化列表且游戏列表size为0的情况
                handleLoadStatusWhenGameListIsEmpty(list, itemDataList)

                if (mIsManuallySearch) {
                    if (mSearchKey == AdDelegateHelper.gameSearchKeyword) {
-                        updateAdConfigAndDecorateList(itemDataList, list)
+                        updateAdConfigAndDecorateList(itemDataList, list, result.first)
                    } else {
                        AdDelegateHelper.requestAdConfig(false, mSearchKey ?: "") {
-                            updateAdConfigAndDecorateList(itemDataList, list)
+                            updateAdConfigAndDecorateList(itemDataList, list, result.first)
                        }
                    }
                } else {
-                    postResultList(itemDataList, list)
-                }
-
-                if (cpmSearchSubjects.isNotEmpty()) {
-                    decorateListWithWGameCPM(cpmSearchSubjects, itemDataList, list)
+                    decorateWithWGameSubjectCPM(itemDataList, list, result.first)
                }
            }, {
                it.printStackTrace()
@ -129,50 +118,12 @@ class SearchGameResultViewModel(
            })
    }

-    /**
-     * 请求微信小游戏CPM接口获取专题游戏数据，并插入对应的专题项中，相关需求如下：
-     * @see <a href="https://jira.shanqu.cc/browse/GHZSCY-6710">【光环助手】CPM微信小游戏API接入工作</a>
-     * @see <a href="https://jira.shanqu.cc/browse/GHZSCY-6827">【光环助手】CPM微信小游戏一期优化</a>
-     */
    @SuppressLint("CheckResult")
-    private fun decorateListWithWGameCPM(
-        subjects: List<SearchSubjectEntity>,
+    private fun updateAdConfigAndDecorateList(
        itemDataList: ArrayList<SearchItemData>,
-        list: MutableList<GameEntity>
+        list: MutableList<GameEntity>,
+        cpmSubjectEntity: SearchSubjectEntity?
    ) {
-        val subjectList = subjects.filterNot {
-            it.games.isNotEmpty()
-        }
-        if (subjectList.isEmpty()) return
-        val subjectSingleList = subjectList.map { subject ->
-            repository.getWGameCPMGameList()
-                .onErrorReturnItem(mutableListOf())
-                .map { subject.columnId to it }
-        }
-        Single.zip(subjectSingleList) { it.map { item -> item as Pair<String, MutableList<GameEntity>>  } }
-            .map { dataList ->
-                for (index in itemDataList.indices) {
-                    val itemData = itemDataList[index]
-                    val subject = itemData.subject ?: continue
-                    if (subject.games.isNotEmpty()) continue
-                    val pair = dataList.firstOrNull { data ->
-                        data.first == subject.columnId
-                    } ?: continue
-                    val newItemData = SearchItemData(
-                        subject = subject.copy(games = pair.second)
-                    )
-                    itemDataList[index] = newItemData
-                }
-                itemDataList
-            }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ dataList -> postResultList(dataList, list) }, {})
-
-    }
-
-    @SuppressLint("CheckResult")
-    private fun updateAdConfigAndDecorateList(itemDataList: ArrayList<SearchItemData>, list: MutableList<GameEntity>) {
        mGameSearchAdList =
            AdDelegateHelper.getGameSearchAdList().filter { AdDelegateHelper.shouldShowGameSearchAd(it) }.toArrayList()
                .apply { sortBy { it.position } }
@ -186,6 +137,7 @@ class SearchGameResultViewModel(
        mAdPositionSet = adPositionSet

        if (adPositionSet.isNotEmpty()) {
+            val decoratedItemDataList = ArrayList(itemDataList)
            val ownerAdList = arrayListOf<AdConfig>()
            val thirdPartyAdList = arrayListOf<AdConfig>()

@ -223,18 +175,18 @@ class SearchGameResultViewModel(
                    Single.zip(requestSingleList) {}
                        .compose(singleToMain())
                        .subscribe({
-                            decorateListWithAd(itemDataList, list)
+                            decorateListWithAd(itemDataList, decoratedItemDataList, list, cpmSubjectEntity)
                        }, {
-                            decorateListWithAd(itemDataList, list)
+                            decorateListWithAd(itemDataList, decoratedItemDataList, list, cpmSubjectEntity)
                        })
                } else {
-                    decorateListWithAd(itemDataList, list)
+                    decorateListWithAd(itemDataList, decoratedItemDataList, list, cpmSubjectEntity)
                }
            } else {
-                decorateListWithThirdPartyAdOnly(itemDataList, thirdPartyAdList, list)
+                decorateListWithThirdPartyAdOnly(decoratedItemDataList, thirdPartyAdList, list, cpmSubjectEntity)
            }
        } else {
-            postResultList(itemDataList, list)
+            decorateWithWGameSubjectCPM(itemDataList, list, cpmSubjectEntity)
        }
    }

@ -245,25 +197,27 @@ class SearchGameResultViewModel(
    }

    private fun decorateListWithThirdPartyAdOnly(
-        itemDataList: ArrayList<SearchItemData>,
+        decoratedItemDataList: ArrayList<SearchItemData>,
        thirdPartyAdList: List<AdConfig>,
-        list: List<GameEntity>
+        list: List<GameEntity>,
+        cpmSubjectEntity: SearchSubjectEntity?
    ) {
        thirdPartyAdList.forEach {
-            itemDataList.add(it.position - 1, SearchItemData(ad = it.thirdPartyAd, adConfig = it))
+            decoratedItemDataList.add(it.position - 1, SearchItemData(ad = it.thirdPartyAd, adConfig = it))
            SPUtils.setLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + it.position, System.currentTimeMillis())
        }
-        postResultList(itemDataList, list)
+        decorateWithWGameSubjectCPM(decoratedItemDataList, list, cpmSubjectEntity)
    }

    private fun decorateListWithAd(
        itemDataList: ArrayList<SearchItemData>,
-        list: List<GameEntity>
+        decoratedItemDataList: ArrayList<SearchItemData>,
+        list: List<GameEntity>,
+        cpmSubjectEntity: SearchSubjectEntity?
    ) {
        val adGameOneIdSet = HashSet<String>() // 展示样式为单个游戏时记录游戏ID，避免重复
-        val decoratedItemDataSize = itemDataList.size
        for ((index, position) in mAdPositionSet!!.withIndex()) {
-            if (position < decoratedItemDataSize + index + 1) {
+            if (position < itemDataList.size + index + 1) {
                val adConfig = mGameSearchAdList!!.safelyGetInRelease(index)
                val showThirdPartyAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
                val showOwnerAd = adConfig?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_OWNER
@ -271,7 +225,7 @@ class SearchGameResultViewModel(
                if ((showThirdPartyAd && adConfig?.thirdPartyAd != null)
                    || (showOwnerAd && adConfig?.ownerAd == null && adConfig?.thirdPartyAd != null && showOnFailed)
                ) {
-                    itemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
+                    decoratedItemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
                    SPUtils.setLong(
                        Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position,
                        System.currentTimeMillis()
@ -283,7 +237,7 @@ class SearchGameResultViewModel(
                    if (!gameList.isNullOrEmpty()) {
                        if (adConfig.ownerAd.adSource?.displayStyle == "game_zone") {
                            // 游戏专题
-                            itemDataList.add(
+                            decoratedItemDataList.add(
                                position - 1,
                                SearchItemData(
                                    subject = SearchSubjectEntity(
@ -305,7 +259,7 @@ class SearchGameResultViewModel(
                            }
                            randomGameEntity?.id?.let { adGameOneIdSet.add(it) }

-                            itemDataList.add(
+                            decoratedItemDataList.add(
                                position - 1,
                                SearchItemData(game = randomGameEntity, adConfig = adConfig)
                            )
@ -316,7 +270,7 @@ class SearchGameResultViewModel(
                        )
                    } else if (showOnFailed && adConfig.thirdPartyAd != null) {
                        // 自有广告为空时，显示第三方广告
-                        itemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
+                        decoratedItemDataList.add(position - 1, SearchItemData(ad = adConfig.thirdPartyAd, adConfig = adConfig))
                        SPUtils.setLong(
                            Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position,
                            System.currentTimeMillis()
@ -327,7 +281,41 @@ class SearchGameResultViewModel(
                break
            }
        }
-        postResultList(itemDataList, list)
+        decorateWithWGameSubjectCPM(decoratedItemDataList, list, cpmSubjectEntity)
+    }
+
+    @SuppressLint("CheckResult")
+    private fun decorateWithWGameSubjectCPM(
+        resultList: ArrayList<SearchItemData>,
+        list: List<GameEntity>,
+        cpmSubjectEntity: SearchSubjectEntity?
+    ) {
+        // 微信小游戏CPM专题搜索结果存在，则请求CPM接口获取微信小游戏列表数据，并将列表数据插入缓存的CPM专题中，
+        // 再根据location的值（固定为4）将CPM专题插入搜索结果列表中
+        // 相关需求：https://jira.shanqu.cc/browse/GHZSCY-6710
+        cpmSubjectEntity?.let { subject ->
+            if (subject.games.isNotEmpty()) {
+                Single.just(subject.games.toMutableList())
+            } else {
+                repository.getWGameCPMGameList()
+                    .onErrorReturnItem(mutableListOf())
+            }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        val cpmSearchItemData = SearchItemData(subject = subject.apply { games = it })
+                        if (subject.location <= 0 || subject.location > resultList.size) {
+                            resultList.add(cpmSearchItemData)
+                        } else {
+                            resultList.add(subject.location - 1, cpmSearchItemData)
+                        }
+                        postResultList(resultList, list)
+                    },
+                    {
+                        postResultList(resultList, list)
+                    })
+        } ?: postResultList(resultList, list)
    }

    @SuppressLint("CheckResult")
@ -355,7 +343,7 @@ class SearchGameResultViewModel(
    }

    private fun postResultList(resultList: ArrayList<SearchItemData>, list: List<GameEntity>) {
-        mResultLiveData.postValue(resultList.toMutableList())
+        mResultLiveData.postValue(resultList)
        if (mPage == 1) {
            if (repository is MiniGameSearchResultRepository) {
                SensorsBridge.trackMiniGameSearchResultReturn(
@ -374,6 +362,7 @@ class SearchGameResultViewModel(
                    mSearchKey ?: "",
                    SearchActivity.toTrackSearchType(mSearchType),
                    list.isNotEmpty()
+
                )
            }

@ -442,6 +431,7 @@ class SearchGameResultViewModel(

    companion object {
        const val AD_SUBJECT_GAME_MAX_COUNT = 8
+        const val WGAME_CPM_SUBJECT_POSITION = 4
    }

 }
--- a/app/src/main/java/com/gh/gamecenter/search/SearchSubjectAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchSubjectAdapter.kt
@ -13,8 +13,6 @@ import com.lightgame.adapter.BaseRecyclerAdapter
 class SearchSubjectAdapter(
    context: Context,
    private val mList: List<GameEntity>,
-    private val mColumnId: String,
-    private val mColumnName: String,
    private val mEntrance: String,
    private val mKey: String,
    private val clickCallback: ((GameEntity) -> Unit)
@ -42,10 +40,7 @@ class SearchSubjectAdapter(
                    MiniGameItemHelper.launchMiniGame(gameEntity)
                    MiniGameItemHelper.trackMiniGameClick(
                        gameEntity = gameEntity,
-                        gameColumnId = mColumnId,
-                        gameColumnName = mColumnName,
                        location = "小游戏搜索结果列表",
-                        position = position,
                        searchContent = mKey,
                    )
                } else {
--- a/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchGameListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/search/viewmodel/SearchGameListViewModel.kt
@ -9,7 +9,6 @@ import com.gh.gamecenter.common.baselist.LoadStatus
 import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely
 import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.home.custom.model.CustomPageData
 import com.gh.gamecenter.livedata.Event
@ -142,7 +141,7 @@ class SearchGameListViewModel : ViewModel() {
            SearchActivity.toTrackSearchType(type),
            location,
            collection.id,
-            collection.title.clearHtmlFormatCompletely()
+            collection.title
        )
    }
 }
--- a/app/src/main/java/com/gh/gamecenter/wrapper/BaseTabWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/BaseTabWrapperFragment.kt
@ -102,7 +102,6 @@ abstract class BaseTabWrapperFragment : BaseLazyFragment(), IMultiTab {
        noDataStub = mCachedView.findViewById(R.id.reuse_no_data_stub)
        noConnectionStub = mCachedView.findViewById(R.id.reuse_no_connection_stub)
        loadingStub = mCachedView.findViewById(R.id.reuse_loading_stub)
-        showLoading(true)

        backgroundColor = com.gh.gamecenter.common.R.color.ui_background.toColor(requireContext())
        backgroundWhiteColor = com.gh.gamecenter.common.R.color.ui_surface.toColor(requireContext())
--- a/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
@ -61,7 +61,6 @@ import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.exposure.time.TimeUtil
 import com.gh.gamecenter.feature.game.GameItemViewHolder
-import com.gh.gamecenter.feature.utils.SentryHelper
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareFragment
 import com.gh.gamecenter.home.custom.CustomPageFragment
 import com.gh.gamecenter.home.video.AutomaticVideoView
@ -215,16 +214,7 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar
    }

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        binding = try {
-            FragmentSearchToolbarTabWrapperBinding.inflate(layoutInflater)
-        } catch (e: Exception) {
-            SentryHelper.onEvent("VIEW_BINDING_BIND_ERROR",
-                "digest", e.localizedMessage,
-                "gid", HaloApp.getInstance().gid
-            )
-            // 玄学，重试一次，该闪退闪退
-            FragmentSearchToolbarTabWrapperBinding.inflate(layoutInflater)
-        }
+        binding = FragmentSearchToolbarTabWrapperBinding.inflate(layoutInflater)
        mCachedView = binding.root
        return mCachedView
    }
@ -567,8 +557,6 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar
                    oldState: RefreshState,
                    newState: RefreshState
                ) {
-                    getValidSmartRefreshContent()?.onStateChanged(refreshLayout, oldState, newState)
-
                    val isAutoScrollToTwoLevel = oldState == RefreshState.None && newState == RefreshState.TwoLevel
                    val isDragToTwoLevel =
                        oldState == RefreshState.ReleaseToRefresh && newState == RefreshState.ReleaseToTwoLevel
@ -666,17 +654,49 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar

                    if (isFinishTwoLevel) {
                        pausePullDownPushVideo()
-                        if (isDragging) {
-                            finishTwoLevel("主动收起")
-                        }
                        showTwoLevel = false
+
+                        if (isDragging) {
+                            autoFinishTwoLevelHandler?.removeMessages(KEY_AUTO_FINISH_TWO_LEVEL)
+                            elapsedHelper.pauseCounting()
+                            pullDownPush?.run {
+                                SensorsBridge.trackEvent(
+                                    "DropDownPushClick",
+                                    json {
+                                        "action" to pullDownPushAction
+                                        "button_name" to "关闭推送"
+                                        "drop_down_push_id" to id
+                                        "game_name" to game?.name
+                                        "game_id" to game?.id
+                                        "bottom_tab" to bottomTabName
+                                        "several_tab_page_name" to multiTabNavName
+                                        "several_tab_page_id" to multiTabNavId
+                                        "position" to lastSelectedPosition
+                                        "tab_content" to currentTabEntity?.name
+                                        "custom_page_name" to currentTabEntity?.link?.text
+                                        "custom_page_id" to currentTabEntity?.link?.link
+                                    }
+                                )
+                                com.gh.common.util.NewFlatLogUtils.logHomePushClose(
+                                    id,
+                                    "主动收起",
+                                    twoLevelOpenCount,
+                                    game?.id ?: "",
+                                    game?.name ?: "",
+                                    elapsedHelper.elapsedTime
+                                )
+                            }
+                        }
                    }

                    when (newState) {
                        RefreshState.TwoLevel -> {
+                            getValidSmartRefreshContent()?.setScrollEnabled(false)
                            binding.refreshLayout.isDisableContent = false
                        }
                        RefreshState.None -> {
+                            getValidSmartRefreshContent()?.setScrollEnabled(true)
+
                            showTwoLevel = false
                            isDragging = false
                            twoLevelHeader.setFloorDuration(1000)
@ -920,7 +940,6 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar
                    classicsHeader.visibility = View.INVISIBLE
                    pullDownPushSet.add(id)
                    SPUtils.setStringSet(Constants.SP_PULL_DOWN_PUSH_POP_UP_SET, pullDownPushSet)
-                    autoFinishTwoLevelCallback = finishCallback
                    autoFinishTwoLevelHandler = object : Handler(Looper.getMainLooper()) {
                        override fun handleMessage(msg: Message) {
                            super.handleMessage(msg)
@ -942,6 +961,9 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar
                            val autoFinishDelayTime = putAwaySwitch.toInt() * 1000L
                            autoFinishTwoLevelHandler?.sendEmptyMessageDelayed(KEY_AUTO_FINISH_TWO_LEVEL, autoFinishDelayTime)
                        }
+                        else -> {
+                            autoFinishTwoLevelCallback = finishCallback
+                        }
                    }
                }
            }
@ -949,8 +971,6 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISearchToolbar
    }

    override fun setPullDownPush(pullDownPush: PullDownPush?, pullDownPushHandler: PullDownPushHandler?) {
-        if (!isAdded) return
-
        if (autoVideoView == null) {
            binding.autoVideoViewStub.setOnInflateListener { _, inflated ->
                autoVideoView = LayoutAutoVideoViewBinding.bind(inflated).root
--- a/app/src/main/java/com/gh/gamecenter/wrapper/TabWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/TabWrapperFragment.kt
@ -21,8 +21,6 @@ import com.gh.gamecenter.entity.MultiTabNav
 import com.gh.gamecenter.entity.PullDownPush
 import com.gh.gamecenter.feature.utils.SentryHelper
 import com.google.android.material.tabs.TabLayout
-import com.scwang.smartrefresh.layout.api.RefreshLayout
-import com.scwang.smartrefresh.layout.constant.RefreshState
 import kotlin.math.roundToInt

 /**
@ -150,6 +148,10 @@ class TabWrapperFragment: BaseTabWrapperFragment(), ISmartRefresh, ISmartRefresh
        }
    }

+    override fun setScrollEnabled(isScrollEnabled: Boolean) {
+        getValidSmartRefreshContent()?.setScrollEnabled(isScrollEnabled)
+    }
+
    override fun onRefresh() {
        getValidSmartRefreshContent()?.onRefresh()
    }
@ -159,10 +161,6 @@ class TabWrapperFragment: BaseTabWrapperFragment(), ISmartRefresh, ISmartRefresh
        getCurrentTabEntity()?.showPullDownPush = !isSwipeRefreshEnabled
    }

-    override fun onStateChanged(refreshLayout: RefreshLayout, oldState: RefreshState, newState: RefreshState) {
-        getValidSmartRefreshContent()?.onStateChanged(refreshLayout, oldState, newState)
-    }
-
    override fun setSmartRefreshEnabled(isEnable: Boolean) {
        (parentFragment as? ISmartRefresh)?.setSmartRefreshEnabled(isEnable)
    }
--- a/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
@ -434,8 +434,6 @@ class ToolbarWrapperFragment : LazyFragment(), ToolbarController, ISmartRefresh,
                    oldState: RefreshState,
                    newState: RefreshState
                ) {
-                    (mContentFragment as? ISmartRefreshContent)?.onStateChanged(refreshLayout, oldState, newState)
-
                    val isAutoScrollToTwoLevel = oldState == RefreshState.None && newState == RefreshState.TwoLevel
                    val isDragToTwoLevel =
                        oldState == RefreshState.ReleaseToRefresh && newState == RefreshState.ReleaseToTwoLevel
@ -552,9 +550,12 @@ class ToolbarWrapperFragment : LazyFragment(), ToolbarController, ISmartRefresh,

                    when (newState) {
                        RefreshState.TwoLevel -> {
+                            (mContentFragment as? ISmartRefreshContent)?.setScrollEnabled(false)
                            mBinding.refreshLayout.isDisableContent = false
                        }
                        RefreshState.None -> {
+                            (mContentFragment as? ISmartRefreshContent)?.setScrollEnabled(true)
+
                            mShowTwoLevel = false
                            mIsDragging = false
                            twoLevelHeader.setFloorDuration(1000)
--- a/app/src/main/java/com/gh/vspace/VGameInstalledLaunchDialog.kt
+++ b/app/src/main/java/com/gh/vspace/VGameInstalledLaunchDialog.kt
@ -17,7 +17,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.layoutInflater
-import com.gh.gamecenter.common.utils.safelyGetInRelease
 import com.gh.gamecenter.common.view.PageControllerAdapter
 import com.gh.gamecenter.common.view.PageTransformerAdapter
 import com.gh.gamecenter.common.view.ScrollEventListener
@ -152,8 +151,7 @@ class VGameInstalledLaunchDialog : DialogFragment() {

                    launch.setOnClickListener { view ->
                        val currentItem = pageControllerAdapter.currentItem
-                        val installedGame =
-                            installAdapter.currentList.safelyGetInRelease(currentItem) ?: return@setOnClickListener
+                        val installedGame = installAdapter.currentList[currentItem]
                        val vDownloadEntity =
                            VHelper.getVDownloadEntitySnapshot(installedGame.gameId, installedGame.packageName)
                                ?: return@setOnClickListener
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@ -25,6 +25,7 @@ import com.facebook.imagepipeline.core.ImageTranscoderType;
 import com.facebook.imagepipeline.core.MemoryChunkType;
 import com.facebook.imagepipeline.decoder.ImageDecoderConfig;
 import com.gh.ad.AdDelegateHelper;
+import com.gh.ad.AdPluginDownloadHelper;
 import com.gh.base.GlobalActivityLifecycleObserver;
 import com.gh.common.FixedRateJobHelper;
 import com.gh.common.filter.RegionSettingHelper;
@ -56,6 +57,7 @@ import com.gh.gamecenter.common.utils.DeviceUtils;
 import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.iinterface.IApplication;
 import com.gh.gamecenter.core.provider.IFlavorProvider;
@ -329,8 +331,7 @@ public class HaloApp extends MultiDexApplication {
            OAIDHelper.INSTANCE.getOAID(HaloApp.this, (s, isSuccess) -> {
                setOAID(s);
                MetaUtil.INSTANCE.refreshMeta();
-
-                DataUtils.bindValidOaidToSensor(true);
+                SensorsBridge.INSTANCE.setOAID(s);

                if (getGid() != null) {
                    DataUtils.getDeviceCertification(getGid());
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,8 +7,8 @@ ext {
    targetSdkVersion = 30

    // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 1115
-    versionName = "5.38.5"
+    versionCode = 1112
+    versionName = "5.38.2"
    applicationId = "com.gh.gamecenter"
    applicationIdGat = "com.gh.gamecenter.intl"

@ -143,7 +143,7 @@ ext {

    acloudPush = "3.8.8.1"
    jpushVersion = "5.4.0"
-    jverifiationVersion = "3.2.5"
+    jverifiationVersion = "3.1.7"
    honorPushVersion = "7.0.61.303"

    volcTlsVersion = "1.1.4"
--- a/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/view/help/QaFeedbackDialogFragment.kt
+++ b/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/view/help/QaFeedbackDialogFragment.kt
@ -27,6 +27,7 @@ import com.gh.gamecenter.feedback.view.suggest.SuggestionActivity
 import com.gh.gamecenter.floatingwindow.R
 import com.gh.gamecenter.floatingwindow.databinding.DialogQaFeedbackBinding
 import com.lightgame.dialog.BaseDialogFragment
+import org.bouncycastle.asn1.x500.style.RFC4519Style.title
 import org.greenrobot.eventbus.EventBus

 class QaFeedbackDialogFragment : BaseDialogFragment() {
--- a/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt
+++ b/feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt
@ -39,7 +39,7 @@ object JPushHelper {
    // 绑定ID关系
    @SuppressLint("CheckResult")
    fun bindRegistrationId(registrationId: String?) {
-        SensorsBridge.profileSet(KEY_REGISTRATION_ID, registrationId ?: "")
+        SensorsBridge.profileAppend(KEY_REGISTRATION_ID, registrationId ?: "")

        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
        val data = mapOf(
--- a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java
@ -79,7 +79,6 @@ public class Constants {
    public static final String QQ_MINI_GAME = "qq";
    public static final String WECHAT_MINI_GAME = "wechat";
    public static final String WECHAT_MINI_GAME_CPM = "wechat_cpm";
-    public static final String WECHAT_MINI_GAME_PROFIT_CPM = "CPM";
    /**
     * <a href="https://developers.weixin.qq.com/community/minigame/doc/000c461a17c6486f0641e27176b401">微信小游戏PCS参数</a>
     */
@ -474,10 +473,6 @@ public class Constants {

    public static final String SP_BRAND_NEW_FIRST_LAUNCH_TIME = "brand_new_first_launch_time"; // 全新安装用户首次启动时间

-    public static final String INVALID_OAID_1 = "00000000-0000-0000-0000-000000000000";
-    public static final String INVALID_OAID_2 = "0000000000000000000000000000000000000000000000000000000000000000";
-    public static final String INVALID_OAID_3 = "00000000000000000000000000000000";
-
    public static final String IS_RESERVE_ONLINE_REMINDER = "is_reserve_online_reminder";

    public static final String TOOL_MAP_PACKAGE_NAME = "com.gh.toolmap";// 光环工具服务APP包名
--- a/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt
@ -37,7 +37,7 @@ data class ExposureEntity(
    @SerializedName("mini_game_type")
    val miniGameType: String? = "",// 小游戏类型：QQ小游戏：qq 微信小游戏：wechat
    @SerializedName("mini_game_recommend_id")
-    var miniGameRecommendId: String? = null,
+    val miniGameRecommendId: String? = "",
    var speed: Long = 0,
    var certification: Int? = null, // 0表示未实名，1表示未成年，2表示成年

--- a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
@ -455,17 +455,6 @@ fun String.containHtmlTag(): Boolean {
    return matcher.find()
 }

-fun String.dropFontColorInDarkMode(context: Context) : String {
-    return if (DarkModeUtils.isDarkModeOn(context)) {
-        val fontColorRegex = Pattern.compile("<font[^>]*color[^>]*>")
-        val matcher = fontColorRegex.matcher(this)
-
-        return matcher.replaceAll("")
-    } else {
-        this
-    }
-}
-
 /**
 * 用户行为相关
 */
--- a/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt
@ -328,7 +328,7 @@ object SensorsBridge {
    }

    fun setOAID(oaid: String) {
-        if (mIsSensorsEnabled || oaid.isNotEmpty()) mSensor?.setOAID(oaid)
+        if (mIsSensorsEnabled) mSensor?.setOAID(oaid)
    }

    @JvmStatic
--- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt
+++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt
@ -284,20 +284,17 @@ data class GameEntity(
    @SerializedName("message_private_id")
    var messageId: String = "",

-    // 小游戏用户ID，目前仅用于微信小游戏CPM，对应着小游戏的appid字段
-    @SerializedName("wxappid")
+    // 小游戏服务商ID，目前仅用于微信小游戏CPM
    var miniGameUid: String = "",
    // 小游戏ID，仅用于小游戏
-    // 如果是微信小游戏，则对应着小游戏的user_name字段
-    // 如果是QQ小游戏，则对应着小游戏的game_id字段
    @SerializedName("appid")
    var miniGameAppId: String = "",
    // 小游戏状态(1：下架 2：秒玩)，仅用于小游戏
    @SerializedName("app_status")
    var miniGameAppStatus: Int = 0,
-    // 小游戏类别（qq/wechat），仅用于小游戏
+    // 小游戏类型（qq/wechat/wechat_cpm），仅用于小游戏
    @SerializedName("game_type")
-    var miniGameCategory: String = "",
+    var miniGameType: String = "",
    // 小游戏链接URL，仅用于小游戏
    @SerializedName("appidLink")
    var miniGameAppLink: String = "",
@ -311,13 +308,10 @@ data class GameEntity(
    var usage: Int = 0,
    // 游戏封面图，仅用于微信小游戏
    var banner: String = "",
-    // 收益来源(CPM)，仅用于微信小游戏
-    var profit: String = "",
    // 宣传图，仅用于微信小游戏
    @SerializedName("publicity_img")
    var publicityImg: List<String>? = null,
-    // 小游戏在搜索结果的位置，仅用于微信小游戏CPM搜索结果列表
-    var location: Int = -1,
+
    @SerializedName("first_setting")
    var firstSetting: FirstSetting? = null,
    @SerializedName("bubble_text")
@ -803,11 +797,6 @@ data class GameEntity(
        return category.equals("gjonline")
    }

-    val miniGameType: String get() = when(profit) {
-        Constants.WECHAT_MINI_GAME_PROFIT_CPM -> Constants.WECHAT_MINI_GAME_CPM
-        else -> miniGameCategory
-    }
-
    /**
     * 当前游戏是否为小游戏
     */
--- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/exposure/ExposureEvent.kt
+++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/exposure/ExposureEvent.kt
@ -115,7 +115,7 @@ data class ExposureEvent(
            miniGameUid = gameEntity?.miniGameUid ?: "",
            miniGameId = gameEntity?.miniGameAppId ?: "",
            miniGameType = gameEntity?.miniGameType ?: "",
-            miniGameRecommendId = gameEntity?.miniGameRecommendId,
+            miniGameRecommendId = gameEntity?.miniGameRecommendId ?: "",
            additional = gameEntity?.customPageTrackData?.toKV()
        )
        this.id = UUID.randomUUID().toString()
--- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/minigame/MiniGameItemHelper.kt
+++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/minigame/MiniGameItemHelper.kt
@ -109,7 +109,12 @@ object MiniGameItemHelper {
                    gameName = gameEntity.name ?: ""
                )
                if (gameEntity.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
-                    WGameSubjectCPMListReportHelper.reportClick(gameEntity)
+                    WGameSubjectCPMListReportHelper.reportClick(
+                        miniAppUid = gameEntity.miniGameUid,
+                        gameName = gameEntity.name ?: "",
+                        operateTime = System.currentTimeMillis() / 1000,
+                        recommendId = gameEntity.miniGameRecommendId
+                    )
                }
            }
        }
--- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/minigame/wechat/WGameSubjectCPMListReportHelper.kt
+++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/minigame/wechat/WGameSubjectCPMListReportHelper.kt
@ -7,7 +7,6 @@ import com.gh.gamecenter.common.utils.EnvHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.WXMiniGameCPMResponse
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.retrofit.RetrofitManager
@ -23,38 +22,7 @@ object WGameSubjectCPMListReportHelper {
    private val exposureRequestSet by lazy { hashSetOf<String>() }
    private val exposureCacheSet by lazy { FixedSizeLinkedHashSet<String>(100) }

-    /**
-     * recommendId为空，正在调用CPM接口的点击事件集合
-     */
-    private val pendingRecommendIdClickSet by lazy { hashSetOf<WGSubjectPendingClick>() }
-
    fun reportClick(
-        gameEntity: GameEntity,
-        operateTime: Long = System.currentTimeMillis() / 1000
-    ) {
-        val recommendId = gameEntity.miniGameRecommendId.ifEmpty {
-            gameEntity.exposureEvent?.payload?.miniGameRecommendId // 如果游戏实体的recommendId为空，则取它绑定的曝光事件的recommendId
-        } ?: return
-        if (recommendId.isNotEmpty()) {
-            reportClickInner(
-                miniAppUid = gameEntity.miniGameUid,
-                gameName = gameEntity.name ?: "",
-                operateTime = System.currentTimeMillis() / 1000,
-                recommendId = recommendId
-            )
-            return
-        }
-        // 没有曝光事件的点击事件上报是不合理的
-        val exposureEvent = gameEntity.exposureEvent ?: return
-        // 正在调用接口请求获取recommendId，需要等待recommendId回调以后再执行上报
-        pendingRecommendIdClickSet.add(WGSubjectPendingClick(operateTime, exposureEvent))
-        Utils.log(
-            "WXGameCPMReport",
-            "当前微信CPM小游戏正在请求CPM接口获取RecommendId，将延迟到RecommendId获取后上报：${gameEntity.name}, ${gameEntity.miniGameAppId}"
-        )
-    }
-
-    private fun reportClickInner(
        miniAppUid: String,
        gameName: String,
        operateTime: Long,
@ -110,69 +78,6 @@ object WGameSubjectCPMListReportHelper {
    }

    fun reportExposure(exposure: ExposureEvent) {
-        val recommendId = exposure.payload.miniGameRecommendId ?: return
-        if (recommendId.isEmpty()) {// recommendId为空时，需要请求CPM接口获取recommendId的值
-            requestRecommendIdAndReportExposure(exposure)
-        } else {
-            reportExposureInner(exposure)
-        }
-    }
-
-    /**
-     * 先请求CPM接口获取RecommendId，再提交曝光事件
-     */
-    @SuppressLint("CheckResult")
-    private fun requestRecommendIdAndReportExposure(exposure: ExposureEvent) {
-        val wxappid = exposure.payload.miniGameUid!!
-        val meta = MetaUtil.getMeta()
-        val request = mapOf(
-            "head" to mapOf(
-                "busiAppid" to EnvHelper.getWGameCPMBusiAppId(),
-                "oaid" to (meta.oaid ?: ""),
-                "manufacturer" to (meta.manufacturer ?: ""),
-                "mode" to (meta.model ?: ""),
-                "androidId" to (MetaUtil.getAndroidId()),
-                "imei" to (MetaUtil.getIMEI())
-            ),
-            "body" to mapOf(
-                "appIDList" to listOf(wxappid)
-            )
-        )
-        Utils.log(
-            "WXGameCPMReport",
-            "请求CPM接口获取RecommendId，${exposure.payload.gameName}"
-        )
-        RetrofitManager.getInstance()
-            .wGameCPMApiService
-            .getGameInfoList(request.toRequestBody())
-            .subscribe({
-                if (it.ret == 0 && it.appInfoList.isNotEmpty()) {
-                    exposure.payload.miniGameRecommendId = it.appInfoList[0].recommendID
-                    Utils.log(
-                        "WXGameCPMReport",
-                        "请求CPM接口获取RecommendId成功！${exposure.payload.gameName}, ${exposure.payload.miniGameRecommendId}"
-                    )
-                    reportExposureInner(exposure)// 上报曝光事件
-                    pendingRecommendIdClickSet.forEach { click ->
-                        if (click.exposure === exposure) {// 上报延迟的点击事件
-                            reportClickInner(
-                                miniAppUid = exposure.payload.miniGameUid ?: "",
-                                gameName = exposure.payload.gameName ?: "",
-                                operateTime = click.operateTime,
-                                recommendId = exposure.payload.miniGameRecommendId!!
-                            )
-                        }
-                    }
-                }
-                pendingRecommendIdClickSet.removeAll {
-                    click -> click.exposure === exposure }
-            }, {
-                pendingRecommendIdClickSet.removeAll {
-                    click -> click.exposure === exposure }
-            })
-    }
-
-    private fun reportExposureInner(exposure: ExposureEvent) {
        val recommendId = exposure.payload.miniGameRecommendId ?: return
        val gameName = exposure.payload.gameName ?: ""
        if (exposureCacheSet.contains(recommendId)) {
@ -268,9 +173,4 @@ object WGameSubjectCPMListReportHelper {
        val posCard: Int = 0,
        val posInCard: Int = 0
    )
-
-    class WGSubjectPendingClick(
-        val operateTime: Long,
-        val exposure: ExposureEvent
-    )
 }
--- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/retrofit/WGameCPMApiService.kt
+++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/retrofit/WGameCPMApiService.kt
@ -9,9 +9,6 @@ import retrofit2.http.POST

 interface WGameCPMApiService {

-    @POST("geteditorrecommend")
-    fun getEditorRecommendList(@Body body: RequestBody): Single<WXMiniGameCPMEntity>
-
    @POST("getuserrecommend")
    fun getUserRecommendList(@Body body: RequestBody): Single<WXMiniGameCPMEntity>

@ -21,7 +18,4 @@ interface WGameCPMApiService {
    @POST("reportexposure")
    fun reportExposure(@Body body: RequestBody): Single<WXMiniGameCPMResponse>

-    @POST("getgameinfolist")
-    fun getGameInfoList(@Body body: RequestBody): Single<WXMiniGameCPMEntity>
-
 }
--- a/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
+++ b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
@ -97,8 +97,6 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC
                && !((SendAuth.Resp) baseResp).state.contains("qqminigame")
        ) {
            WXAPIProxyFactory.getLiveData().postValue(baseResp);
-        } else if (baseResp.getType() == ConstantsAPI.COMMAND_SUBSCRIBE_MESSAGE) {
-            WXAPIProxyFactory.getLiveData().postValue(baseResp);
        }

        String resultString = "";
--- a/module_va_impl/src/main/java/com/gh/gamecenter/va/HaloApp.kt
+++ b/module_va_impl/src/main/java/com/gh/gamecenter/va/HaloApp.kt
@ -3,50 +3,32 @@ package com.gh.gamecenter.va
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
-import android.os.Build
 import com.gh.gamecenter.core.iinterface.IApplication
 import com.google.auto.service.AutoService
-import com.lg.vspace.App64
+import com.lg.vspace.common.CommonApp

@AutoService(IApplication::class)
 class HaloApp : IApplication {

-    private val app = App64()
-    private val isDeviceSupportVa = Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1
+    private val commonApp = CommonApp()

    override fun attachBaseContext(base: Context) {
-        if (isDeviceSupportVa) {
-            app.attachBaseContext(base)
-        }
+        commonApp.attachBaseContext(base)
    }

    override fun onCreate(application: Application) {
-        if (isDeviceSupportVa) {
-            app.onCreate(application)
-        }
+        commonApp.onCreate(application)
    }

    override fun onLowMemory() {
-        if (isDeviceSupportVa) {
-            app.onLowMemory()
-        }
    }

    override fun onTerminate() {
-        if (isDeviceSupportVa) {
-            app.onTerminate()
-        }
    }

    override fun onTrimMemory(level: Int) {
-        if (isDeviceSupportVa) {
-            app.onTrimMemory(level)
-        }
    }

    override fun onConfigurationChanged(newConfig: Configuration) {
-        if (isDeviceSupportVa) {
-            app.onConfigurationChanged(newConfig)
-        }
    }
 }
--- a/2
+++ b/2
--- a/scripts/jenkins_build.sh
+++ b/scripts/jenkins_build.sh
@ -9,6 +9,13 @@ build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L

 post_init_script=init.internal.gradle

+# 开启 mapping 上传
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  sed -i '' '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" } ' app/build.gradle
+else
+  sed -i '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" }' app/build.gradle
+fi
+
 git checkout module_common/build.gradle
 git checkout gradle.properties

--- a/2
+++ b/2
Author	SHA1	Message	Date
chenjuntao	681e2cd4ee	build: 添加 3.7.0 版本的 sentry plugin 缓存 Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>	2024-10-24 10:15:39 +08:00
chenjuntao	883dad8f06	build: 添加 3.7.0 版本的 sentry plugin 缓存 Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>	2024-10-23 15:51:23 +08:00
chenjuntao	0d650d2d00	build: 添加 3.7.0 版本的 sentry plugin 缓存 Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>	2024-10-23 15:50:47 +08:00