后续的一些优化修改

app/build.gradle

@@ -14,7 +14,7 @@ android {
             abiFilters 'armeabi', 'armeabi-v7a', 'x86'
         }
 
-        buildConfigField "int", "player_type", "2"; //播放器类型；1，原生；2，未来；3，GsyPlayer
+        buildConfigField "int", "player_type", "3"; //播放器类型；1，原生；2，未来；3，GsyPlayer
     }
 
 
@@ -60,8 +60,8 @@ dependencies {
     testImplementation lib.test.junit
     androidTestImplementation lib.test.runner
     androidTestImplementation lib.test.espresso
-    implementation project(':gsyvideo')
     implementation project(path: ':core')
-    implementation project(path: ':weilai_video')
     implementation project(path: ':systemvideo')
+    implementation project(path: ':weilai_video')
+    implementation project(path: ':gsyvideo')
 }

app/src/main/AndroidManifest.xml

@@ -37,15 +37,14 @@
         <activity android:name=".test.TestPlayerActivity">
         </activity>
         <activity android:name=".test.TestActivity">
+        </activity>
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".MainActivity">
-
-        </activity>
 
         <uses-library
             android:name="android.test.runner"

app/src/main/java/com/haochuan/hciptvbasic/BaseWebActivity.java

@@ -166,7 +166,7 @@ public abstract class BaseWebActivity extends AppCompatActivity {
         }
 
         //如果是除未来其他版本，请用这段代码
-        //utilToJS.onBackPressed();
+        utilToJS.onBackPressed();
     }
 
     /*--------------------------初始化函数---------------------------*/
@@ -322,6 +322,8 @@ public abstract class BaseWebActivity extends AppCompatActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             WebView.setWebContentsDebuggingEnabled(BuildConfig.isDebug);
         }
+
+        webView.requestFocus();
     }
 
     private void setPlayerToJS(){

app/src/main/java/com/haochuan/hciptvbasic/MainActivity.java

@@ -8,7 +8,7 @@ import java.util.TimerTask;
 
 
 public class MainActivity extends BaseWebActivity {
-    private String mBasicUrl = "http://10.255.25.176:8091/sxrj/loading.html";    //入口地址
+    private String mBasicUrl = "http://120.78.169.79:8090/h5/game_apk/html/video_play.html";    //入口地址
 
     private int testCount = 0;
     private String TAG = "status";
@@ -18,39 +18,39 @@ public class MainActivity extends BaseWebActivity {
         super.onCreate(savedInstanceState);
 
         //test
-        /*String playParamJson = "{\n" +
+       /* String playParamJson = "{\n" +
                 "    \"type\": 1,\n" +
                 "    \"url\": \"https://gzhc-sxrj.oss-cn-shenzhen.aliyuncs.com/gzhc-djbl/djbl01.mp4\",\n" +
                 "    \"code\": 88,\n" +
                 "    \"seek_time\": 3,\n" +
-                "    \"x\": 32,\n" +
-                "    \"y\": 64,\n" +
-                "    \"width\": 320,\n" +
-                "    \"height\": 180,\n" +
+                "    \"x\": 0,\n" +
+                "    \"y\": 0,\n" +
+                "    \"width\": 1280,\n" +
+                "    \"height\": 720,\n" +
                 "    \"examine_id\": 200000253,\n" +
                 "    \"examine_type\": \"program\"\n" +
                 "}";
         int state = getPlayerToJS().getPlayerStatus();
-
-        new Timer().schedule(new TimerTask() {
+        getPlayerToJS().play(playParamJson);*/
+        /*new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
                 getPlayerToJS().play(playParamJson);
             }
-        },10000);*/
-        /*new Timer().schedule(new TimerTask() {
+        },10000);
+        new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
                 int state = 0;
                 switch (testCount){
                     case 0:
-                        *//*String changeParamJson = "{\n" +
+                        String changeParamJson = "{\n" +
                                 "    \"x\": 60,\n" +
                                 "    \"y\": 60,\n" +
                                 "    \"width\": 480,\n" +
                                 "    \"height\": 270\n" +
                                 "}";
-                        getPlayerToJS().change(changeParamJson);*//*
+                        getPlayerToJS().change(changeParamJson);
 
                         break;
                     case 1:

app/src/main/java/com/haochuan/hciptvbasic/test/TestActivity.java

@@ -32,7 +32,7 @@ public class TestActivity extends BaseWebActivity {
         playBtn.setOnClickListener(v -> {
             String playParamJson =  "{\n" +
                     "    \"type\": 1,\n" +
-                    "    \"url\": \"https://gzhc-sxrj.oss-cn-shenzhen.aliyuncs.com/gzhc-djbl/djbl01.mp4\",\n" +
+                    "    \"url\": \"http://202.99.114.93/88888891/16/20190807/270766111/270766111.ts\",\n" +
                     "    \"code\": 88,\n" +
                     "    \"seek_time\": 3,\n" +
                     "    \"x\": 32,\n" +

app/src/main/java/com/haochuan/hciptvbasic/test/TestPlayerActivity.java

@@ -12,9 +12,9 @@ import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.haochuan.core.BaseMediaPlayer;
 import com.haochuan.core.IVideoPlayer;
 import com.haochuan.core.Logger;
-import com.haochuan.gsyvideo.HCGsyVideoPlayer;
 import com.haochuan.hciptvbasic.R;
 
 import java.math.BigDecimal;
@@ -24,7 +24,7 @@ import java.util.Locale;
 public class TestPlayerActivity extends AppCompatActivity implements IVideoPlayer {
 
     //页面组件对象
-    private HCGsyVideoPlayer hcPlayer;
+    private BaseMediaPlayer hcPlayer;
     private ProgressBar loadingBar;
     private LinearLayout bottomContainer;
     private SeekBar videoProgressBar;

app/src/main/java/com/haochuan/hciptvbasic/webview/PlayerToJS.java

@@ -149,8 +149,8 @@ public class PlayerToJS {
             String seekTime = JSONUtil.getString(playParam,"seek_time","0");
             String x = JSONUtil.getString(playParam,"x","0");
             String y = JSONUtil.getString(playParam,"y","0");
-            String width = JSONUtil.getString(playParam,"width","0");
-            String height = JSONUtil.getString(playParam,"height","0");
+            String width = JSONUtil.getString(playParam,"width","1280");
+            String height = JSONUtil.getString(playParam,"height","720");
             String examineId = JSONUtil.getString(playParam,"examine_id","");
             String examineType = JSONUtil.getString(playParam,"examine_type","program");
             return videoPlay(url,seekTime,x,y,width,height,examineId,examineType);

app/src/main/res/values/styles.xml

@@ -6,6 +6,10 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
 </resources>

gsyvideo/src/main/java/com/haochuan/gsyvideo/EmptyControlVideoView.java

@@ -143,7 +143,7 @@ public class EmptyControlVideoView extends StandardGSYVideoPlayer {
     }
 
     public int getCurrentStatus(){
-        int currentStatus = 0;
+        int currentStatus = 6;
         switch (mCurrentState){
             case 1:
                 currentStatus =1;

settings.gradle

@@ -1 +1 @@
-include ':app', ':gsyvideo', ':core', ':weilai_video', ':systemvideo'
+include ':app',  ':core', ':systemvideo',':weilai_video', ':gsyvideo'

systemvideo/src/main/java/com/haochuan/systemvideo/SystemVideoPlayer.java

@@ -20,7 +20,7 @@ public class SystemVideoPlayer extends BaseMediaPlayer {
     private VideoView videoView;   //系统播放器对象
     private IVideoPlayer iVideoPlayer; //播放器事件监控
     private MediaPlayer mediaPlayer;
-    private int playerStatus = 0;
+    private int playerStatus = 6;
     protected boolean mHadPrepared = false;                 //Prepared
     private int startTime = 0;//播放器开始的时间,单位毫秒
 

weilai_video/src/main/java/com/haochuan/weilai_video/WeiLaiVideoPlayer.java

@@ -29,7 +29,7 @@ public class WeiLaiVideoPlayer extends BaseMediaPlayer {
     private FrameLayout icntvPlayerContainer = null;    //cntv播放器容器
     private IVideoPlayer iVideoPlayer;
     protected boolean mHadPrepared = false;                 //Prepared
-    private int playerStatus = 0;
+    private int playerStatus = 6;
     private int startTime = 0;                                 //播放器开始的时间,单位毫秒