diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 57ab40d618..572576f652 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,8 @@
+
+
@@ -163,8 +165,7 @@
android:screenOrientation="portrait" />
+ android:name="com.gh.gamecenter.WebActivity" />
@@ -629,7 +628,6 @@
()
runOnIoThread(true) {
for (i in positionOffset until subjectAdapter.itemCount + positionOffset) {
+ if (i >= it.size) break
+
it[i].sequence = i
val exposureKey = if (subjectEntity.remark != null) "开测表" else "专题"
@@ -520,8 +522,6 @@ class GameFragmentAdapter(
gameEntity = it[i],
basicSource = mBasicExposureSource,
source = listOf(ExposureSource(exposureKey, exposureValue)),
- eTrace = null,
- event = ExposureType.EXPOSURE
)
exposureEventList.add(event)
}
diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt
index 0b04a129c3..e9471b7e56 100644
--- a/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt
@@ -25,7 +25,7 @@ class HelpContentFragment : ListFragment
toast("操作太快,慢一点嘛")
}
}
- mCachedView.findViewById(R.id.comment_close_iv).setOnClickListener {
+ mCachedView.findViewById(R.id.comment_close_iv)?.setOnClickListener {
val fragment = parentFragment
if (fragment is BaseDialogWrapperFragment) {
fragment.dismiss()
diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt
index 0b6b62c833..ceab2aae64 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt
@@ -3,6 +3,8 @@ package com.gh.gamecenter.qa.dialog
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.os.Build
import android.os.Bundle
import android.view.MotionEvent
import android.view.View
@@ -26,6 +28,9 @@ class ChooseForumActivity : BaseActivity() {
@SuppressLint("ClickableViewAccessibility")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+ requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+ }
DisplayUtils.transparentStatusBar(this)
binding = DialogChooseForumBinding.bind(mContentView)
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
index e6d21d7284..be6996de33 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
@@ -2,6 +2,8 @@ package com.gh.gamecenter.qa.editor
import android.content.Context
import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.os.Build
import android.os.Bundle
import com.gh.base.BaseActivity
import com.gh.common.util.DisplayUtils
@@ -22,6 +24,9 @@ class FullScreenVideoActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+ requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+ }
DisplayUtils.transparentStatusBar(this)
DisplayUtils.hideNavigationBar(this)
mBinding = ActivityFullScreenVideoBinding.bind(mContentView)