From a59dcba04015abeb8f42fe5187cca8537babe586 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Tue, 6 Jan 2026 19:31:45 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20bug:=20=E8=A7=86=E9=A2=91=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=A1=B6=E9=83=A8=E6=9C=89=E9=BB=91=E8=BE=B9=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=8F=B3=E4=BE=A7=E7=9A=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5=E5=BE=80=E4=B8=8B=E6=8C=AA?= =?UTF-8?q?=E6=8C=AA=EF=BC=8C=E6=9C=89=E7=82=B9=E9=AB=98=E4=BA=86=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=AA=E5=88=B0=E6=88=91=E7=BA=A2=E5=9C=88?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gamedog/vididin/main/fragments/HomeFragment.kt | 6 +++--- .../main/fragments/home/fragment/HomeItemFragment.kt | 6 +++++- .../res/layout/vididinapp_feature_home_fragment_home.xml | 2 +- .../main/res/layout/vididinapp_feature_home_item_layout.xml | 4 ++-- .../architecture/util/permission/PermissionActivity.java | 6 +++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt index d013196..b9f8cb1 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt @@ -59,7 +59,7 @@ class HomeFragment : AppViewsFragment(), OnSwit private var mHasShowGuide: Boolean = false private var mTotalMs: Long = 0L override val mViewModel: ViewModel by viewModels() - override var isBackgroundBright: Boolean = true + override var isBackgroundBright: Boolean = false private val mViewPagerAdapter by lazy { HomeFragmentStateAdapter(this) } @@ -69,12 +69,12 @@ class HomeFragment : AppViewsFragment(), OnSwit ) = ViewBinding.inflate(inflater, container, false) override fun ViewBinding.initWindowInsets() { - ViewCompat.setOnApplyWindowInsetsListener(viewPager2) { v, insets -> + /*ViewCompat.setOnApplyWindowInsetsListener(viewPager2) { v, insets -> val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) v.updatePadding(top = systemBars.top) insets - } + }*/ } override fun ViewBinding.initViews() { diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt index 8b4d687..b1b958d 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt @@ -13,10 +13,14 @@ import android.view.animation.AnimationSet import android.view.animation.ScaleAnimation import android.widget.FrameLayout import androidx.annotation.NonNull +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.core.view.isVisible +import androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsEmptyViewModelFragment import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.setOnClickBatch +import com.ama.core.common.util.dp import com.gamedog.statisticreporter.StatisticUtil import com.viddin.videos.free.R import com.gamedog.vididin.beans.YoutubeVideo @@ -117,7 +121,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { if (null == mPlayerView) { mPlayerView = YouTubePlayerView(requireContext()) val layoutParam = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) - layoutParam.gravity = Gravity.CENTER + layoutParam.gravity = Gravity.TOP binding!!.playerContainer.addView(mPlayerView, layoutParam) lifecycle.addObserver(mPlayerView!!) mPlayerView?.enableAutomaticInitialization = true diff --git a/app/src/main/res/layout/vididinapp_feature_home_fragment_home.xml b/app/src/main/res/layout/vididinapp_feature_home_fragment_home.xml index f5efdbc..729bc13 100644 --- a/app/src/main/res/layout/vididinapp_feature_home_fragment_home.xml +++ b/app/src/main/res/layout/vididinapp_feature_home_fragment_home.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="top|right" android:layout_marginRight="20dp" - android:layout_marginTop="60dp" + android:layout_marginTop="40dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml b/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml index b515783..8860072 100644 --- a/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml +++ b/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml @@ -1,7 +1,7 @@ + android:layout_height="match_parent"> diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/permission/PermissionActivity.java b/core/architecture/src/main/java/com/ama/core/architecture/util/permission/PermissionActivity.java index 86144a8..47310e0 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/util/permission/PermissionActivity.java +++ b/core/architecture/src/main/java/com/ama/core/architecture/util/permission/PermissionActivity.java @@ -153,9 +153,9 @@ public class PermissionActivity extends AppCompatActivity { // new new AlertDialog.Builder(this) - .setTitle("权限已被拒绝") + .setTitle("Permission Denied") .setMessage(mPermissionList + PERMISSION_TOTAL_REJECTED_HINT) - .setPositiveButton("系统设置", new DialogInterface.OnClickListener() { + .setPositiveButton("System Setting", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { Uri packageURI = Uri.parse("package:" + getPackageName()); @@ -163,7 +163,7 @@ public class PermissionActivity extends AppCompatActivity { startActivity(intent); } }) - .setNegativeButton("取消", new DialogInterface.OnClickListener() { + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { }