Merge branch 'feat/GHZS-3502' into 'dev'

feat: APP备案的相关调整 https://jira.shanqu.cc/browse/GHZS-3502

See merge request halo/android/assistant-android!1401

app/src/main/java/com/gh/ad/AdDelegateHelper.kt

@@ -87,7 +87,8 @@ object AdDelegateHelper {
         if (mCsjAdImpl == null) {
             mCsjAdImpl =
                 ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
-            mCsjAdImpl?.initSDK(context, BuildConfig.CSJ_APPID, HaloApp.getInstance().oaid)
+            val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
+            mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
             // 监听亮色/暗色模式切换
             DarkModeUtils.registerModeChangeListener {
                 val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
@@ -347,7 +348,9 @@ object AdDelegateHelper {
         val jumpBtn: View = startAdContainer.findViewById(R.id.jumpBtn)
         val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
         val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
+        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
         startAdContainer.visibility = View.VISIBLE
+        icpContainer?.visibility = View.VISIBLE
         jumpDetailBtn.text = ad.desc
         jumpDetailBtn.setDrawableEnd(
             AppCompatResources.getDrawable(

app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt

@@ -120,6 +120,10 @@ class DirectProviderImpl : IDirectProvider {
         return DirectUtils.directToQGameHome(context)
     }
 
+    override fun directToExternalBrowser(context: Context, url: String) {
+        DirectUtils.directToExternalBrowser(context, url)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/WebProviderImpl.kt

@@ -21,10 +21,6 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getBindWechatIntent(context)
     }
 
-    override fun getSecurityCertificationIntent(context: Context): Intent {
-        return WebActivity.getSecurityCertificationIntent(context)
-    }
-
     override fun getQAIntent(
         context: Context?,
         url: String?,

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -516,7 +516,9 @@ public class MainActivity extends BaseActivity {
             FrameLayout adsFl = findViewById(R.id.adsFl);
 
             int screenWidthInPx = DisplayUtils.getScreenWidth(this);
-            int screenHeightInPx = DisplayUtils.getScreenHeight(this) + DisplayUtils.getStatusBarHeight(this.getResources());
+            int screenHeightInPx = DisplayUtils.getScreenHeight(this)
+                    + DisplayUtils.getStatusBarHeight(this.getResources())
+                    - ExtensionsKt.dip2px(112F);
             float screenWidthInDp = DisplayUtils.px2dip(this, screenWidthInPx);
             float screenHeightInDp = DisplayUtils.px2dip(this, screenHeightInPx);
 
@@ -584,6 +586,12 @@ public class MainActivity extends BaseActivity {
             AdDelegateHelper.INSTANCE.cancelSplashAd(this);
         }
 
+        View startSdkAdIcpContainer = findViewById(R.id.sdkStartAdIcpContainer);
+        if (startSdkAdIcpContainer != null) {
+            startSdkAdIcpContainer.setVisibility(View.GONE);
+            ExtensionsKt.removeFromParent(startSdkAdIcpContainer);
+        }
+
         // 通知优先级高的弹窗可以显示了
         AppExecutor.getUiExecutor().execute(() -> {
             mMainWrapperFragment.showDialog();

app/src/main/java/com/gh/gamecenter/WebActivity.kt

@@ -132,26 +132,6 @@ open class WebActivity : ToolBarActivity() {
             )
         }
 
-        // 获取安全认证页
-        @JvmStatic
-        fun getSecurityCertificationIntent(context: Context): Intent {
-            val bundle = Bundle()
-            bundle.putString(
-                EntranceConsts.KEY_GAMENAME,
-                context.getString(R.string.comment_security_certification)
-            )
-            bundle.putString(
-                EntranceConsts.KEY_URL,
-                context.getString(R.string.comment_security_certification_url)
-            )
-            bundle.putBoolean(WebFragment.KEY_IS_SECURITY_CERTIFICATION, true)
-            return getTargetIntent(
-                context,
-                WebActivity::class.java,
-                WebFragment::class.java, bundle
-            )
-        }
-
         // 获取工具箱页面
         @JvmStatic
         fun getWebByCollectionTools(

app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt

@@ -90,6 +90,9 @@ class GameDetailInfoItemAdapter(
         if (gameInfo.recommendAge.isNotEmpty()) {
             datas.add(GameInfoItemData(title = "适龄等级", info = gameInfo.recommendAge))
         }
+        if (gameInfo.icp != null) {
+            datas.add(GameInfoItemData(title = "ICP备案号", info = gameInfo.icp?.number ?: ""))
+        }
         if (!gameInfo.permissions.isNullOrEmpty()) {
             datas.add(GameInfoItemData(title = "权限及用途", info = "查看"))
         }