Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt

@@ -217,7 +217,12 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, val m
                 context.startActivity(CleanApkActivity.getIntent(context))
             }
             "个人中心" -> {
-                context.startActivity(UserInfoActivity.getIntent(context))
+                if (UserManager.getInstance().isLoggedIn) {
+                    context.startActivity(UserInfoActivity.getIntent(context))
+                } else {
+                    MtaHelper.onEvent("我的光环_新", "功能入口-跳转登录", "个人中心")
+                    CheckLoginUtils.checkLogin(context, "我的光环-个人中心") {}
+                }
             }
             else -> {
                 DirectUtils.directToLinkPage(context, linkEntity, "", "我的光环")

app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt

@@ -65,17 +65,24 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
     private var mMuteCallback: MuteCallback
     private var mVolumeObserver: VolumeObserver
     private var mScheduledHideDisposable: Disposable? = null //延迟隐藏mBottomContainer计时器
+    private var mLastClickTime = 0L
 
     init {
         gestureDetector = GestureDetector(getContext().applicationContext, object : GestureDetector.SimpleOnGestureListener() {
             override fun onDoubleTap(e: MotionEvent): Boolean {
                 touchDoubleUp(e)
+                mLastClickTime = System.currentTimeMillis()
                 return super.onDoubleTap(e)
             }
 
             override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                if (!mChangePosition && !mChangeVolume && !mBrightness) {
-                    onClickUiToggle()
+                val dTime = System.currentTimeMillis() - mLastClickTime
+                if (dTime > 1000) {
+                    if (!mChangePosition && !mChangeVolume && !mBrightness) {
+                        onClickUiToggle()
+                    }
+                } else {
+                    onDoubleTap(e)
                 }
                 return super.onSingleTapConfirmed(e)
             }