Merge pull request #118 from CatVodTVOfficial/dev

Fix
pull/1/head
DreamDSTR 4 years ago committed by GitHub
commit 3d9dd3eccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
  2. 4
      app/src/main/res/layout/activity_search.xml
  3. 2
      app/src/main/res/layout/item_search.xml
  4. 1
      app/src/main/res/values/dimens.xml

@ -345,7 +345,7 @@ public class HomeActivity extends BaseActivity {
if (sortAdapter.getData().size() > 0) {
for (MovieSort.SortData data : sortAdapter.getData()) {
if (data.id.equals("my0")) {
if (Hawk.get(HawkConfig.HOME_REC, 0) == 1 && absXml.videoList != null && absXml.videoList.size() > 0) {
if (Hawk.get(HawkConfig.HOME_REC, 0) == 1 && absXml != null && absXml.videoList != null && absXml.videoList.size() > 0) {
fragments.add(UserFragment.newInstance(absXml.videoList));
} else {
fragments.add(UserFragment.newInstance(null));

@ -6,7 +6,7 @@
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/vs_440"
android:layout_width="@dimen/vs_420"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/vs_20">
@ -101,7 +101,7 @@
<LinearLayout
android:id="@+id/llWord"
android:layout_width="@dimen/vs_180"
android:layout_width="@dimen/vs_160"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/vs_20"

@ -7,7 +7,7 @@
android:padding="@dimen/vs_1">
<FrameLayout
android:layout_width="@dimen/vs_220"
android:layout_width="@dimen/vs_214"
android:layout_height="@dimen/vs_280">
<ImageView

@ -75,6 +75,7 @@
<dimen name="vs_360">360mm</dimen>
<dimen name="vs_390">390mm</dimen>
<dimen name="vs_400">400mm</dimen>
<dimen name="vs_420">420mm</dimen>
<dimen name="vs_440">440mm</dimen>
<dimen name="vs_410">410mm</dimen>
<dimen name="vs_470">470mm</dimen>

Loading…
Cancel
Save