pangweixin 4 سال پیش
والد
کامیت
e54ca42b83

+ 1 - 0
.idea/misc.xml

@@ -17,6 +17,7 @@
         <entry key="app/src/main/res/layout/activity_live.xml" value="0.18931159420289856" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.25" />
         <entry key="app/src/main/res/layout/activity_scanner.xml" value="0.18297101449275363" />
+        <entry key="app/src/main/res/layout/activity_simple_play.xml" value="0.16757246376811594" />
         <entry key="app/src/main/res/layout/activity_web.xml" value="0.2028985507246377" />
         <entry key="app/src/main/res/layout/layout_download_dialog.xml" value="0.1" />
         <entry key="app/src/main/res/layout/notification.xml" value="0.1" />

+ 6 - 5
VideoCall/src/main/res/layout/videocall_activity_calling.xml

@@ -7,12 +7,13 @@
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/trtc_view_2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent" >
 
-    <com.tencent.rtmp.ui.TXCloudVideoView
-        android:id="@+id/txcvv_main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <com.tencent.rtmp.ui.TXCloudVideoView
+            android:id="@+id/txcvv_main"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </com.tencent.rtmp.ui.TXCloudVideoView>
 
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/trtc_view_1"

+ 2 - 0
app/build.gradle

@@ -56,4 +56,6 @@ dependencies {
 //    implementation 'com.github.jenly1314:zxing-lite:2.1.1'
     implementation 'com.github.kongzue.DialogX:DialogX:0.0.40'
     implementation 'com.google.zxing:core:3.3.0'
+
+    implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.7-jitpack'
 }

+ 5 - 5
app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
@@ -38,11 +39,10 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-        <!--        <activity-->
-        <!--            android:name="com.king.zxing.CaptureActivity"-->
-        <!--            android:theme="@style/CaptureTheme"/>-->
-        <activity android:name=".activity.CamActivity"></activity>
+        </activity> <!-- <activity -->
+        <!-- android:name="com.king.zxing.CaptureActivity" -->
+        <!-- android:theme="@style/CaptureTheme"/> -->
+        <activity android:name=".activity.CamActivity" />
         <activity android:name=".zxing.activity.CaptureActivity" />
 
         <service

+ 11 - 11
app/src/main/java/com/qingdaofushan/home/activity/MainActivity.java

@@ -90,17 +90,17 @@ public class MainActivity extends AppCompatActivity {
 //                            mServerManager.register();
 //                            getVM();
 //                            initApp("https://cq-1253658654.cos.ap-shanghai.myqcloud.com/friday.zip", 1);
-//                            if (!TextUtils.isEmpty((String) SharedPreferenceUtil.get(MainActivity.this, "webUrl", ""))) {
-//                                Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
-//                                intent.putExtra("url", (String) SharedPreferenceUtil.get(MainActivity.this, "webUrl", ""));
-////                            intent.putExtra("url", "http://debug.qingdaofushan.com/friday/fsmobile/#/main");
-//                                startActivity(intent);
-//                            } else {
-//                                editText.setVisibility(View.VISIBLE);
-//                                start.setVisibility(View.VISIBLE);
-//                            }
-                            Intent intent=new Intent(MainActivity.this, VideoCallingEnterActivity.class);
-                            startActivity(intent);
+                            if (!TextUtils.isEmpty((String) SharedPreferenceUtil.get(MainActivity.this, "webUrl", ""))) {
+                                Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
+                                intent.putExtra("url", (String) SharedPreferenceUtil.get(MainActivity.this, "webUrl", ""));
+//                            intent.putExtra("url", "http://debug.qingdaofushan.com/friday/fsmobile/#/main");
+                                startActivity(intent);
+                            } else {
+                                editText.setVisibility(View.VISIBLE);
+                                start.setVisibility(View.VISIBLE);
+                            }
+//                            Intent intent=new Intent(MainActivity.this, VideoCallingEnterActivity.class);
+//                            startActivity(intent);
                         } else {
                             initPermission();
                             ToastUtil.showToast("获取部分权限成功,但部分权限未正常授予");

+ 99 - 0
app/src/main/java/com/qingdaofushan/home/activity/SimplePlayer.java

@@ -0,0 +1,99 @@
+package com.qingdaofushan.home.activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.qingdaofushan.home.R;
+import com.shuyu.gsyvideoplayer.GSYVideoManager;
+import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
+import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
+
+/**
+ * 横屏不旋转的 Demo
+ */
+public class SimplePlayer extends AppCompatActivity {
+
+    StandardGSYVideoPlayer videoPlayer;
+
+    OrientationUtils orientationUtils;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_simple_play);
+        init();
+    }
+
+    private void init() {
+        videoPlayer =  (StandardGSYVideoPlayer)findViewById(R.id.video_player);
+
+        String source1 = "http://9890.vod.myqcloud.com/9890_4e292f9a3dd011e6b4078980237cc3d3.f20.mp4";
+        videoPlayer.setUp(source1, true, "测试视频");
+
+        //增加封面
+//        ImageView imageView = new ImageView(this);
+//        imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+//        imageView.setImageResource(R.mipmap.xxx1);
+//        videoPlayer.setThumbImageView(imageView);
+        //增加title
+        videoPlayer.getTitleTextView().setVisibility(View.VISIBLE);
+        //设置返回键
+        videoPlayer.getBackButton().setVisibility(View.VISIBLE);
+        videoPlayer.getFullscreenButton().setVisibility(View.GONE);
+        //设置旋转
+        orientationUtils = new OrientationUtils(this, videoPlayer);
+        //设置全屏按键功能,这是使用的是选择屏幕,而不是全屏
+        videoPlayer.getFullscreenButton().setOnClickListener(v -> {
+            // ------- !!!如果不需要旋转屏幕,可以不调用!!!-------
+            // 不需要屏幕旋转,还需要设置 setNeedOrientationUtils(false)
+            //orientationUtils.resolveByClick();
+            finish();
+        });
+        //是否可以滑动调整
+        videoPlayer.setIsTouchWiget(true);
+        //设置返回按键功能
+        videoPlayer.getBackButton().setOnClickListener(v -> onBackPressed());
+
+
+        ///不需要屏幕旋转
+        videoPlayer.setNeedOrientationUtils(false);
+
+        videoPlayer.startPlayLogic();
+    }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        videoPlayer.onVideoPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        videoPlayer.onVideoResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        GSYVideoManager.releaseAllVideos();
+        if (orientationUtils != null)
+            orientationUtils.releaseListener();
+    }
+
+    @Override
+    public void onBackPressed() {
+///       不需要回归竖屏
+//        if (orientationUtils.getScreenType() == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+//            videoPlayer.getFullscreenButton().performClick();
+//            return;
+//        }
+        //释放所有
+        videoPlayer.setVideoAllCallBack(null);
+        super.onBackPressed();
+    }
+}

+ 14 - 0
app/src/main/res/layout/activity_simple_play.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_play"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#000000">
+
+    <com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
+        android:id="@+id/video_player"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true" />
+
+</RelativeLayout>

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Aug 05 10:35:56 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME