diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml
index d59b78ccb..60df34071 100644
--- a/app/src/mobile/AndroidManifest.xml
+++ b/app/src/mobile/AndroidManifest.xml
@@ -31,6 +31,11 @@
+
+
-
-
+
+
mTypeIds;
private VodAdapter mAdapter;
- public static TypeFragment newInstance(String typeId, boolean folder) {
+ public static TypeFragment newInstance(String key, String typeId, boolean folder) {
Bundle args = new Bundle();
+ args.putString("key", key);
args.putString("typeId", typeId);
args.putBoolean("folder", folder);
TypeFragment fragment = new TypeFragment();
@@ -47,6 +47,10 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
return fragment;
}
+ private String getKey() {
+ return getArguments().getString("key");
+ }
+
private String getTypeId() {
return getArguments().getString("typeId");
}
@@ -115,7 +119,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
if (page.equals("1")) mAdapter.clear();
if (page.equals("1") && !mBinding.swipeLayout.isRefreshing()) mBinding.progressLayout.showProgress();
if (isHome() && page.equals("1")) setAdapter(getParent().getResult());
- else mViewModel.categoryContent(ApiConfig.get().getHome().getKey(), typeId, page, true, mExtends);
+ else mViewModel.categoryContent(getKey(), typeId, page, true, mExtends);
}
private void setAdapter(Result result) {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index 72ec8e626..b0afb3be0 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -300,7 +300,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
@Override
public Fragment getItem(int position) {
Class type = mAdapter.get(position);
- return TypeFragment.newInstance(type.getTypeId(), type.getTypeFlag().equals("1"));
+ return TypeFragment.newInstance(getSite().getKey(), type.getTypeId(), type.getTypeFlag().equals("1"));
}
@Override
diff --git a/app/src/mobile/res/layout/activity_vod.xml b/app/src/mobile/res/layout/activity_vod.xml
new file mode 100644
index 000000000..f4edec1e8
--- /dev/null
+++ b/app/src/mobile/res/layout/activity_vod.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_vod_folder.xml b/app/src/mobile/res/layout/adapter_vod_folder.xml
index 2526f784c..d963b3bfc 100644
--- a/app/src/mobile/res/layout/adapter_vod_folder.xml
+++ b/app/src/mobile/res/layout/adapter_vod_folder.xml
@@ -15,7 +15,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
android:scaleType="fitCenter"
app:shapeAppearanceOverlay="@style/Vod.Grid"
tools:src="@drawable/ic_img_error" />
@@ -24,7 +23,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingStart="12dp"
+ android:paddingEnd="12dp">