zhanghongrui 1 week ago
parent
commit
1f265b5b61

+ 0 - 20
app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/ExoPlayerActivity.java

@@ -74,7 +74,6 @@ public class ExoPlayerActivity extends BaseActivity {
 
     private void initializePlayer(String url) {
 
-        binding.loading.setVisibility(View.VISIBLE);
         player = new SimpleExoPlayer.Builder(this).build();
         binding.playerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FILL);
         binding.playerView.setUseController(false); // 设置为不使用控制器
@@ -87,24 +86,6 @@ public class ExoPlayerActivity extends BaseActivity {
         player.play();
        // toggleFullScreen();
 
-        player.addListener(new Player.Listener() {
-            @Override
-            public void onPositionDiscontinuity(int reason) {
-            }
-
-            @Override
-            public void onPlaybackStateChanged(int playbackState) {
-                if (playbackState == Player.STATE_READY) {
-                    // 播放器准备好可以播放
-                    binding.loading.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
-                // 播放状态变化时
-            }
-        });
     }
 
     @Override
@@ -117,7 +98,6 @@ public class ExoPlayerActivity extends BaseActivity {
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
-                binding.loading.setVisibility(View.GONE);
                 ToastUtils.show("获取视频源失败");
 //                if (!TextUtils.isEmpty(e.getMessage())) {
 //                    ToastUtils.show(e.getMessage());

+ 1 - 1
app/src/main/java/com/sjkj/appthreefloor_tsgz/login/LoginActivity.java

@@ -152,6 +152,7 @@ public class LoginActivity extends BaseLoginActivity {
 //            ToastUtils.show("密码不能为空");
 //            return;
 //        }
+        showLoadingDialog();
         Params params = new Params();
         // params.put("loginType", "mobile");
         params.put("username", viewModel.username.get());
@@ -172,7 +173,6 @@ public class LoginActivity extends BaseLoginActivity {
                 if (!TextUtils.isEmpty(e.getMessage()) && e.getMessage().contains("connect")) {
                     ToastUtils.show("连接服务器失败,检查网络连接。");
                 } else {
-                    Log.d("zhr1111", e.getMessage());
                     ToastUtils.show(e.getMessage() + "");
                 }
             }

+ 3 - 12
app/src/main/res/layout/player_activity.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -20,19 +21,9 @@
 
             <com.google.android.exoplayer2.ui.PlayerView
                 android:id="@+id/player_view"
+                app:show_buffering="when_playing"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
-            <!-- 加载中的圆环 -->
-            <ProgressBar
-                android:id="@+id/loading"
-                style="?android:attr/progressBarStyleLarge"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:visibility="visible">
-
-            </ProgressBar>
 
             <Button
                 android:id="@+id/fullscreen_button"

+ 2 - 2
base-lib/src/main/java/com/sjkj/base_lib/utils/AppTools.java

@@ -475,8 +475,8 @@ public class AppTools {
     }
 
     public static String getBaseUrl() {
-        return mmkv.decodeString("baseUrl", "http://192.168.4.82:8080/api/");
-        //return mmkv.decodeString("baseUrl", "http://36.137.48.33:5520/api/");
+        //return mmkv.decodeString("baseUrl", "http://192.168.4.82:8080/api/");
+        return mmkv.decodeString("baseUrl", "http://36.137.48.33:5520/api/");
     }
 
     public static String getImageBaseUrl() {