Parcourir la source

1.显示loading框时隐藏状态栏

王鹏鹏 il y a 2 ans
Parent
commit
47bd5a8b9b

+ 1 - 1
.idea/misc.xml

@@ -66,7 +66,7 @@
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/txt_live_color.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.2962239583333333" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml" value="0.21014492753623187" />
-        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.136" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/fragment_first.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login.xml" value="0.219" />

+ 1 - 1
baselib/build.gradle

@@ -38,7 +38,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"lxcKDBZ9xDYBzeevUeIGZzWSOmYqtwba\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"http://192.168.0.120:8110\""
+            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 

+ 3 - 3
baselib/src/main/java/com/yingyangfly/baselib/dialog/LoadingDialog.kt

@@ -61,7 +61,7 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
      *
      * @param window
      */
-    fun hideNavigationBar(window: Window) {
+    private fun hideNavigationBar(window: Window) {
         window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
         window.decorView.setOnSystemUiVisibilityChangeListener { visibility: Int ->
             var uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or  //布局位于状态栏下方
@@ -84,7 +84,7 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
      *
      * @param window
      */
-    fun focusNotAle(window: Window) {
+    private fun focusNotAle(window: Window) {
         window.setFlags(
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
@@ -97,7 +97,7 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
      *
      * @param window
      */
-    fun clearFocusNotAle(window: Window) {
+    private fun clearFocusNotAle(window: Window) {
         window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
     }
 

+ 6 - 6
livebroadcast/src/main/res/layout/activity_live_broadcast.xml

@@ -18,25 +18,25 @@
             android:id="@+id/backLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_50px"
-            android:layout_marginTop="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_50px"
-                android:layout_height="@dimen/divider_50px"
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
                 android:background="@mipmap/icon_back" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_18px"
+                android:layout_marginStart="@dimen/divider_14px"
                 android:text="@string/back_pager"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_38px"
+                android:textSize="@dimen/divider_28px"
                 android:textStyle="bold" />
 
         </LinearLayout>

+ 14 - 11
livebroadcast/src/main/res/layout/activity_video_player.xml

@@ -17,25 +17,25 @@
             android:id="@+id/backLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_50px"
-            android:layout_marginTop="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_50px"
-                android:layout_height="@dimen/divider_50px"
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
                 android:background="@mipmap/icon_back" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_18px"
+                android:layout_marginStart="@dimen/divider_14px"
                 android:text="@string/back_pager"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_38px"
+                android:textSize="@dimen/divider_28px"
                 android:textStyle="bold" />
 
         </LinearLayout>
@@ -53,20 +53,23 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.cardview.widget.CardView
-            android:layout_width="@dimen/divider_1078px"
-            android:layout_height="@dimen/divider_606px"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_58px"
+            android:layout_marginTop="@dimen/divider_25px"
+            android:layout_marginEnd="@dimen/divider_58px"
+            android:layout_marginBottom="@dimen/divider_25px"
             app:cardCornerRadius="@dimen/divider_40px"
-            android:layout_marginTop="@dimen/divider_45px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
             <com.tencent.liteav.demo.superplayer.SuperPlayerView
                 android:id="@+id/play_tx_cloud_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_gravity="center"/>
+                android:layout_gravity="center" />
 
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 6 - 0
livebroadcast/src/main/res/values/dimens.xml

@@ -2,7 +2,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <dimen name="divider_1078px" tools:ignore="ResourceName">1078px</dimen>
+    <dimen name="divider_1060px" tools:ignore="ResourceName">1060px</dimen>
     <dimen name="divider_1077px" tools:ignore="ResourceName">1077px</dimen>
+    <dimen name="divider_720px" tools:ignore="ResourceName">720px</dimen>
+    <dimen name="divider_710px" tools:ignore="ResourceName">710px</dimen>
+    <dimen name="divider_685px" tools:ignore="ResourceName">685px</dimen>
+    <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
+    <dimen name="divider_660px" tools:ignore="ResourceName">660px</dimen>
     <dimen name="divider_606px" tools:ignore="ResourceName">606px</dimen>
     <dimen name="divider_522px" tools:ignore="ResourceName">522px</dimen>
     <dimen name="divider_353px" tools:ignore="ResourceName">353px</dimen>