Liu Song’s Projects

diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml
index 354fc27be6434ed1054939100990f52f06c5bd1e..ee72df966af89c73cbc162efc91e94c61c0770b1 100644
--- a/app/src/mobile/AndroidManifest.xml
+++ b/app/src/mobile/AndroidManifest.xml
@@ -110,8 +110,8 @@             android:screenOrientation="sensorLandscape"
             android:supportsPictureInPicture="true" />
 
         <activity
-    <uses-feature
         android:name="android.hardware.camera"
+        android:required="false" />
             android:configChanges="screenSize|smallestScreenSize|screenLayout"
             android:screenOrientation="fullUser" />
 




diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index 91d615e24b63de846ffeb1ffdfdef6063fb1cefc..05e4bb86eb8a860b9521294a0cf5b5a0004f48d8 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -270,8 +270,9 @@     }
 
     @Override
     public void onItemClick(Vod item) {
+
 package com.fongmi.android.tv.ui.activity;
-                if (s.toString().isEmpty()) getHot();
+package com.fongmi.android.tv.ui.activity;
         else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
     }
 




diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/FolderActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/FolderActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..6e9be78ba14828d5b488d3a53083f7bd8f6c5bef
--- /dev/null
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/FolderActivity.java
@@ -0,0 +1,59 @@
+package com.fongmi.android.tv.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.viewbinding.ViewBinding;
+
+import com.fongmi.android.tv.R;
+import com.fongmi.android.tv.bean.Class;
+import com.fongmi.android.tv.bean.Result;
+import com.fongmi.android.tv.databinding.ActivityFolderBinding;
+import com.fongmi.android.tv.ui.base.BaseActivity;
+import com.fongmi.android.tv.ui.fragment.TypeFragment;
+
+import java.util.HashMap;
+
+public class FolderActivity extends BaseActivity {
+
+    private ActivityFolderBinding mBinding;
+
+    public static void start(Activity activity, String key, Result result) {
+        if (result == null || result.getTypes().isEmpty()) return;
+        Intent intent = new Intent(activity, FolderActivity.class);
+        intent.putExtra("key", key);
+        intent.putExtra("result", result);
+        activity.startActivity(intent);
+    }
+
+    private String getKey() {
+        return getIntent().getStringExtra("key");
+    }
+
+    private Result getResult() {
+        return getIntent().getParcelableExtra("result");
+    }
+
+    @Override
+    protected ViewBinding getBinding() {
+        return mBinding = ActivityFolderBinding.inflate(getLayoutInflater());
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        Result result = getResult();
+        Class type = result.getTypes().get(0);
+        mBinding.text.setText(type.getTypeName());
+        getSupportFragmentManager().beginTransaction().replace(R.id.container, TypeFragment.newInstance(getKey(), type.getTypeId(), new HashMap<>(), type.getTypeFlag().equals("1")), "0").commitAllowingStateLoss();
+    }
+
+    private TypeFragment getFragment() {
+        return (TypeFragment) getSupportFragmentManager().findFragmentByTag("0");
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (getFragment().canBack()) super.onBackPressed();
+    }
+}




diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VodActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VodActivity.java
deleted file mode 100644
index 4cff7b186a4b6fc663603d1abd6b0ec9a98778eb..0000000000000000000000000000000000000000
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VodActivity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fongmi.android.tv.ui.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.viewbinding.ViewBinding;
-
-import com.fongmi.android.tv.R;
-import com.fongmi.android.tv.bean.Class;
-import com.fongmi.android.tv.bean.Result;
-import com.fongmi.android.tv.databinding.ActivityVodBinding;
-import com.fongmi.android.tv.ui.base.BaseActivity;
-import com.fongmi.android.tv.ui.fragment.TypeFragment;
-
-import java.util.HashMap;
-
-public class VodActivity extends BaseActivity {
-
-    private ActivityVodBinding mBinding;
-
-    public static void start(Activity activity, String key, Result result) {
-        if (result == null || result.getTypes().isEmpty()) return;
-        Intent intent = new Intent(activity, VodActivity.class);
-        intent.putExtra("key", key);
-        intent.putExtra("result", result);
-        activity.startActivity(intent);
-    }
-
-    private String getKey() {
-        return getIntent().getStringExtra("key");
-    }
-
-    private Result getResult() {
-        return getIntent().getParcelableExtra("result");
-    }
-
-    @Override
-    protected ViewBinding getBinding() {
-        return mBinding = ActivityVodBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        Result result = getResult();
-        Class type = result.getTypes().get(0);
-        mBinding.text.setText(type.getTypeName());
-        getSupportFragmentManager().beginTransaction().replace(R.id.container, TypeFragment.newInstance(getKey(), type.getTypeId(), new HashMap<>(), type.getTypeFlag().equals("1")), "0").commitAllowingStateLoss();
-    }
-
-    private TypeFragment getFragment() {
-        return (TypeFragment) getSupportFragmentManager().findFragmentByTag("0");
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (getFragment().canBack()) super.onBackPressed();
-    }
-}




diff --git a/app/src/mobile/res/layout/activity_folder.xml b/app/src/mobile/res/layout/activity_folder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4edec1e894923f731fc20b165b5ca288501706a
--- /dev/null
+++ b/app/src/mobile/res/layout/activity_folder.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/selector_item_round"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textSize="14sp"
+        tools:text="電影" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file




diff --git a/app/src/mobile/res/layout/activity_vod.xml b/app/src/mobile/res/layout/activity_vod.xml
deleted file mode 100644
index f4edec1e894923f731fc20b165b5ca288501706a..0000000000000000000000000000000000000000
--- a/app/src/mobile/res/layout/activity_vod.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/selector_item_round"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        tools:text="電影" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file