搜索界面取消自动拉起软键盘 再次尝试优化倒序 bug fix ps :别催更 随缘

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
             android:screenOrientation="sensorLandscape" />
         <activity
             android:name=".ui.activity.DetailActivity"
-            android:screenOrientation="landscape" />
+            android:screenOrientation="sensorLandscape" />
         <activity
             android:name=".ui.activity.PlayActivity"
             android:screenOrientation="sensorLandscape" />

app/src/main/java/com/github/tvbox/osc/bean/AbsJson.java

@@ -24,7 +24,7 @@ public class AbsJson implements Serializable {
         public int group_id; //: 0
         public int type_id; //: 32
         public int type_id_1; //: 31
-        public String type_name; //: "国产剧"
+//        public String type_name; //: "国产剧"
         public String vod_actor; //: "黄小戈,赵旭东,时男,傅隽,张佳琳"
         public String vod_area; //: "中国大陆"
         public String vod_author; //: ""
@@ -111,7 +111,7 @@ public class AbsJson implements Serializable {
             video.id = vod_id;
             video.tid = type_id;
             video.name = vod_name;
-            video.type = type_name;
+            video.type = "";
             // video.dt = vod_play_from == null ? "" : vod_play_from.replace("$$$", ",");
             video.pic = vod_pic;
             video.lang = vod_lang;

app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java

@@ -170,14 +170,8 @@ public class DetailActivity extends BaseActivity {
                 if (vodInfo != null && vodInfo.seriesMap.size() > 0) {
                     vodInfo.reverseSort = !vodInfo.reverseSort;
                     isReverse = !isReverse;
-//                    if (vodInfo.seriesMap.get(vodInfo.playFlag).size() > vodInfo.playIndex) {
-//                        vodInfo.seriesMap.get(vodInfo.playFlag).get(vodInfo.playIndex).selected = false;
-//                    }
                     vodInfo.reverse();
-//                    if (vodInfo.seriesMap.get(vodInfo.playFlag).size() > vodInfo.playIndex) {
-//                        vodInfo.seriesMap.get(vodInfo.playFlag).get(vodInfo.playIndex).selected = false;
-//                    }
-//                    insertVod(sourceKey, vodInfo);
+                    vodInfo.playIndex=(vodInfo.seriesMap.get(vodInfo.playFlag).size()-1)-vodInfo.playIndex;
                     seriesAdapter.notifyDataSetChanged();
                 }
             }
@@ -302,12 +296,16 @@ public class DetailActivity extends BaseActivity {
                 FastClickCheckUtil.check(view);
                 if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
                     boolean reload = false;
+                    for (int j = 0; j < vodInfo.seriesMap.get(vodInfo.playFlag).size(); j++) {
+                        seriesAdapter.getData().get(j).selected = false;
+                        seriesAdapter.notifyItemChanged(j);
+                    }
+                    //解决倒叙不刷新
                     if (vodInfo.playIndex != position) {
-                        seriesAdapter.getData().get(vodInfo.playIndex).selected = false;
-                        seriesAdapter.notifyItemChanged(vodInfo.playIndex);
                         seriesAdapter.getData().get(position).selected = true;
                         seriesAdapter.notifyItemChanged(position);
                         vodInfo.playIndex = position;
+
                         reload = true;
                     }
                     //解决当前集不刷新的BUG
@@ -315,11 +313,6 @@ public class DetailActivity extends BaseActivity {
                         reload = true;
                     }
 
-                    //解决倒叙不刷新
-                    if (isReverse) {
-                        reload = true;
-                    }
-
                     seriesAdapter.getData().get(vodInfo.playIndex).selected = true;
                     seriesAdapter.notifyItemChanged(vodInfo.playIndex);
                     //选集全屏 想选集不全屏的注释下面一行
@@ -768,7 +761,10 @@ public class DetailActivity extends BaseActivity {
         fullWindows = !fullWindows;
         llPlayerFragmentContainer.setLayoutParams(fullWindows ? windowsFull : windowsPreview);
         llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
+        mGridView.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
+        mGridViewFlag.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
 
+        //全屏下禁用详情页几个按键的焦点 防止上键跑过来
         tvPlay.setFocusable(!fullWindows);
         tvSort.setFocusable(!fullWindows);
         tvCollect.setFocusable(!fullWindows);

app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java

@@ -568,15 +568,24 @@ public class HomeActivity extends BaseActivity {
                 @Override
                 public void onDismiss(DialogInterface dialog) {
                     if (homeSourceKey != null && !homeSourceKey.equals(Hawk.get(HawkConfig.HOME_API, ""))) {
-                        Intent intent = getApplicationContext().getPackageManager().getLaunchIntentForPackage(getApplication().getPackageName());
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP
-                                | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+//                        Intent intent = getApplicationContext().getPackageManager().getLaunchIntentForPackage(getApplication().getPackageName());
+//                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP
+//                                | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+//                        Bundle bundle = new Bundle();
+//                        bundle.putBoolean("useCache", true);
+//                        intent.putExtras(bundle);
+//                        getApplicationContext().startActivity(intent);
+//                        System.exit(0);
+
+                        Intent intent =new Intent(getApplicationContext(), HomeActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
                         Bundle bundle = new Bundle();
                         bundle.putBoolean("useCache", true);
                         intent.putExtras(bundle);
-                        getApplicationContext().startActivity(intent);
+                        HomeActivity.this.startActivity(intent);
                         android.os.Process.killProcess(android.os.Process.myPid());
                         System.exit(0);
+
                     }
                 }
             });

app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java

@@ -1,9 +1,11 @@
 package com.github.tvbox.osc.ui.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -79,9 +81,27 @@ public class SearchActivity extends BaseActivity {
 
     @Override
     protected void init() {
+        disableKeyboard(this);
         initView();
         initViewModel();
         initData();
+        enableKeyboard(this);
+    }
+
+    /*
+     * 禁止软键盘
+     * @param activity Activity
+     */
+    public static void disableKeyboard(Activity activity) {
+        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    }
+
+    /*
+     * 启用软键盘
+     * @param activity Activity
+     */
+    public static void enableKeyboard(Activity activity) {
+        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
     }
 
     private List<Runnable> pauseRunnable = null;