[mobile] fix some bug

pull/123/head
FongMi 3 years ago
parent 09f87377a4
commit af18d0bb90
  1. 2
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  2. 6
      app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
  3. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  4. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
  5. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java

@ -258,7 +258,7 @@ public class ApiConfig {
}
public String getAds() {
return ads;
return TextUtils.isEmpty(ads) ? "" : ads;
}
private void setAds(List<String> ads) {

@ -30,6 +30,10 @@ public class RefreshEvent {
EventBus.getDefault().post(new RefreshEvent(Type.WALL));
}
public static void empty() {
EventBus.getDefault().post(new RefreshEvent(Type.EMPTY));
}
private RefreshEvent(Type type) {
this.type = type;
}
@ -39,6 +43,6 @@ public class RefreshEvent {
}
public enum Type {
IMAGE, VIDEO, HISTORY, KEEP, SIZE, WALL
IMAGE, VIDEO, HISTORY, KEEP, SIZE, WALL, EMPTY
}
}

@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.text.Html;
import android.text.Layout;
import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
@ -323,9 +324,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
@Override
public void onGlobalLayout() {
mBinding.content.getViewTreeObserver().removeOnGlobalLayoutListener(this);
int lines = mBinding.content.getLayout().getLineCount() - 1;
boolean ellipse = mBinding.content.getLayout().getEllipsisCount(lines) > 0;
mBinding.more.setVisibility(ellipse ? View.VISIBLE : View.GONE);
Layout layout = mBinding.content.getLayout();
if (layout != null) {
int lines = layout.getLineCount() - 1;
boolean ellipse = layout.getEllipsisCount(lines) > 0;
mBinding.more.setVisibility(ellipse ? View.VISIBLE : View.GONE);
}
}
});
}

@ -70,6 +70,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
@Override
public void error(int resId) {
RefreshEvent.empty();
Notify.show(resId);
}
};

@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.viewbinding.ViewBinding;
import androidx.viewpager.widget.ViewPager;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.api.ApiConfig;
import com.fongmi.android.tv.bean.Class;
@ -154,7 +155,14 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreshEvent(RefreshEvent event) {
if (event.getType() == RefreshEvent.Type.VIDEO) homeContent();
switch (event.getType()) {
case VIDEO:
homeContent();
break;
case EMPTY:
App.post(() -> EventBus.getDefault().post(Result.empty()), 250);
break;
}
}
private void homeContent() {

Loading…
Cancel
Save