修复'SDKDemo使用沉侵风格引入的core demo布局不可点击'的问题

Change-Id: Iac3ff485e6bf48349a4c9287d6011c43efaf5e4f

Author: archurtan

sdkdemo/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".VideoBaseActivity" />
         <activity android:name=".core.activity.BindMobilePhoneActivity" />
         <activity android:name=".core.activity.ForgotPasswordActivity" />
         <activity android:name=".core.activity.SetPasswordActivity" />
@@ -54,12 +55,15 @@
         <activity android:name=".video.VideoInputAuthorizeActivity" />
         <activity android:name=".video.VideoMainActivity" />
         <activity android:name=".video.nvr.VideoNvrActivity" />
-        <activity android:name=".video.playback.VideoPlaybackActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-        <activity android:name=".video.preview.VideoMultiPreviewActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-        <activity android:name=".video.preview.VideoPreviewActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+        <activity
+            android:name=".video.playback.VideoPlaybackActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".video.preview.VideoMultiPreviewActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".video.preview.VideoPreviewActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity android:name="com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity" />
         <activity android:name="com.tencent.iot.explorer.link.rtc.ui.videocall.TRTCVideoCallActivity" />
         <activity android:name=".core.activity.LoginActivity" />

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/BaseActivity.kt

@@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import com.tencent.iot.explorer.link.demo.common.log.L
 import com.tencent.iot.explorer.link.demo.common.util.Watermark
-import com.tencent.iot.explorer.link.demo.common.util.StatusBarUtil
 import com.tencent.iot.explorer.link.demo.core.activity.MainActivity
 
 /**
@@ -58,18 +57,9 @@ abstract class BaseActivity : AppCompatActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         //在setContentView()后调用
         startHere()
-        checkStyle()
         Watermark.getInstance().show(this, BuildConfig.SDKDemoCommitID)
     }
 
-    private fun checkStyle() {
-        StatusBarUtil.setRootViewFitsSystemWindows(this, false)
-        StatusBarUtil.setTranslucentStatus(this)
-        if (!StatusBarUtil.setStatusBarDarkTheme(this, true)) {
-            StatusBarUtil.setStatusBarColor(this, 0x55000000)
-        }
-    }
-
     override fun onResume() {
         super.onResume()
         App.activity = this

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/VideoBaseActivity.kt

@@ -0,0 +1,19 @@
+package com.tencent.iot.explorer.link.demo
+
+import android.os.Bundle
+import com.tencent.iot.explorer.link.demo.common.util.StatusBarUtil
+
+abstract class VideoBaseActivity : BaseActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        checkStyle()
+    }
+
+    private fun checkStyle() {
+        StatusBarUtil.setRootViewFitsSystemWindows(this, false)
+        StatusBarUtil.setTranslucentStatus(this)
+        if (!StatusBarUtil.setStatusBarDarkTheme(this, true)) {
+            StatusBarUtil.setStatusBarColor(this, 0x55000000)
+        }
+    }
+}

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoInputAuthorizeActivity.kt

@@ -12,13 +12,14 @@ import com.tencent.iot.explorer.link.demo.BuildConfig
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.core.utils.SharePreferenceUtil
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.video.link.consts.VideoConst
 import kotlinx.android.synthetic.main.activity_video_input_authorize.*
 import kotlinx.android.synthetic.main.blue_title_layout.*
 import kotlinx.android.synthetic.main.input_item_layout.view.*
 import kotlinx.coroutines.*
 
-class VideoInputAuthorizeActivity : BaseActivity() , CoroutineScope by MainScope() {
+class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by MainScope() {
 
     override fun getContentView(): Int {
         return R.layout.activity_video_input_authorize

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoMainActivity.kt

@@ -7,11 +7,12 @@ import com.google.android.material.tabs.TabLayout
 import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.BaseActivity
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.video.link.consts.VideoConst
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.title_layout.*
 
-class VideoMainActivity : BaseActivity() {
+class VideoMainActivity : VideoBaseActivity() {
     private val fragments = arrayListOf<Fragment>()
 
     override fun getContentView(): Int {

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoOptionsActivity.kt

@@ -2,9 +2,10 @@ package com.tencent.iot.explorer.link.demo.video
 
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.BaseActivity
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import kotlinx.android.synthetic.main.activity_video_options.*
 
-class VideoOptionsActivity : BaseActivity() {
+class VideoOptionsActivity : VideoBaseActivity() {
     override fun getContentView(): Int {
         return R.layout.activity_video_options
     }

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/nvr/VideoNvrActivity.kt

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray
 import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.BaseActivity
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.explorer.link.demo.video.Command
 import com.tencent.iot.explorer.link.demo.video.DevsAdapter
 import com.tencent.iot.explorer.link.demo.video.utils.ListOptionsDialog
@@ -30,7 +31,7 @@ import java.util.concurrent.TimeUnit
 
 private var countDownLatch = CountDownLatch(1)
 
-class VideoNvrActivity : BaseActivity(), DevsAdapter.OnItemClicked, XP2PCallback,
+class VideoNvrActivity : VideoBaseActivity(), DevsAdapter.OnItemClicked, XP2PCallback,
     CoroutineScope by MainScope() {
     private var devs : MutableList<DevInfo> = ArrayList()
     private var adapter : DevsAdapter? = null

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/VideoPlaybackActivity.kt

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON
 import com.google.android.material.tabs.TabLayout
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.BaseActivity
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.explorer.link.demo.core.fragment.BaseFragment
 import com.tencent.iot.explorer.link.demo.video.DevInfo
 import com.tencent.iot.explorer.link.demo.video.playback.cloudPlayback.VideoCloudPlaybackFragment
@@ -27,7 +28,7 @@ import kotlinx.android.synthetic.main.title_layout.*
 import java.util.*
 
 
-class VideoPlaybackActivity : BaseActivity() {
+class VideoPlaybackActivity : VideoBaseActivity() {
 
     private val page1 = VideoCloudPlaybackFragment()
     private val page2 = VideoLocalPlaybackFragment()

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoMultiPreviewActivity.kt

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONArray
 import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.demo.R
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.explorer.link.demo.core.activity.*
 import com.tencent.iot.explorer.link.demo.video.Command
 import com.tencent.iot.video.link.consts.VideoConst
@@ -37,7 +38,7 @@ import kotlin.collections.ArrayList
 private var countDownLatchs : MutableMap<String, CountDownLatch> = ConcurrentHashMap()
 private var allDevUrl: MutableList<DevUrl2Preview> = CopyOnWriteArrayList()
 
-class VideoMultiPreviewActivity : BaseActivity(), XP2PCallback, CoroutineScope by MainScope() {
+class VideoMultiPreviewActivity : VideoBaseActivity(), XP2PCallback, CoroutineScope by MainScope() {
     lateinit var gridLayoutManager : GridLayoutManager
     lateinit var linearLayoutManager : LinearLayoutManager
     private var adapter : DevPreviewAdapter? = null

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONArray
 import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.demo.R
+import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.explorer.link.demo.common.util.CommonUtils
 import com.tencent.iot.explorer.link.demo.common.util.ImageSelect
 import com.tencent.iot.explorer.link.demo.video.Command
@@ -54,7 +55,7 @@ private var keepPlayThreadLock = Object()
 @Volatile
 private var keepAliveThreadRuning = true
 
-class VideoPreviewActivity : BaseActivity(), EventView, TextureView.SurfaceTextureListener,
+class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.SurfaceTextureListener,
     XP2PCallback, CoroutineScope by MainScope(), VolumeChangeObserver.VolumeChangeListener {
 
     private var tag = VideoPreviewActivity::class.simpleName