hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

历史记录保留非当前配置源;

Browse Source
pull/144/head
于俊 1 year ago
parent c25727eea0
commit 5262fffa30
6 changed files with 49 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java
  2. 15
      app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
  3. 8
      app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
  4. 8
      app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
  5. 27
      app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
  6. 2
      gradle.properties

4
app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java vendored
Unescape View File

@ -98,8 +98,8 @@ public class RoomDataManger {
info = getVodInfoGson().fromJson(record.dataJson, new TypeToken<VodInfo>() {
}.getType());
info.sourceKey = record.sourceKey;
SourceBean sourceBean = ApiConfig.get().getSource(info.sourceKey);
if (sourceBean == null || info.name == null)
// SourceBean sourceBean = ApiConfig.get().getSource(info.sourceKey);
if (info.name == null)
info = null;
}
} catch (Exception e) {

15
app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
Unescape View File

@ -8,8 +8,10 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.github.tvbox.osc.R;
import com.github.tvbox.osc.api.ApiConfig;
import com.github.tvbox.osc.base.BaseActivity;
import com.github.tvbox.osc.bean.Movie;
import com.github.tvbox.osc.bean.SourceBean;
import com.github.tvbox.osc.bean.VodInfo;
import com.github.tvbox.osc.cache.RoomDataManger;
import com.github.tvbox.osc.event.RefreshEvent;
@ -17,6 +19,7 @@ import com.github.tvbox.osc.ui.adapter.HistoryAdapter;
import com.github.tvbox.osc.ui.dialog.ConfirmClearDialog;
import com.github.tvbox.osc.util.FastClickCheckUtil;
import com.github.tvbox.osc.util.HawkConfig;
import com.orhanobut.hawk.Hawk;
import com.owen.tvrecyclerview.widget.TvRecyclerView;
import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
@ -123,7 +126,17 @@ public class HistoryActivity extends BaseActivity {
Bundle bundle = new Bundle();
bundle.putString("id", vodInfo.id);
bundle.putString("sourceKey", vodInfo.sourceKey);
jumpActivity(DetailActivity.class, bundle);
SourceBean sourceBean = ApiConfig.get().getSource(vodInfo.sourceKey);
if(sourceBean!=null){
jumpActivity(DetailActivity.class, bundle);
}else {
bundle.putString("title", vodInfo.name);
if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
jumpActivity(FastSearchActivity.class, bundle);
}else {
jumpActivity(SearchActivity.class, bundle);
}
}
}
}
}

8
app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
Unescape View File

@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.github.tvbox.osc.R;
import com.github.tvbox.osc.api.ApiConfig;
import com.github.tvbox.osc.bean.SourceBean;
import com.github.tvbox.osc.bean.VodInfo;
import com.github.tvbox.osc.picasso.RoundTransformation;
import com.github.tvbox.osc.util.DefaultConfig;
@ -48,7 +49,12 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
tvYear.setText(String.valueOf(item.year));
tvYear.setVisibility(View.VISIBLE);
}*/
tvYear.setText(ApiConfig.get().getSource(item.sourceKey).getName());
SourceBean bean = ApiConfig.get().getSource(item.sourceKey);
if(bean!=null){
tvYear.setText(bean.getName());
}else {
tvYear.setVisibility(View.GONE);
}
/*TextView tvLang = helper.getView(R.id.tvLang);
if (TextUtils.isEmpty(item.lang)) {
tvLang.setVisibility(View.GONE);

8
app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
Unescape View File

@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.github.tvbox.osc.R;
import com.github.tvbox.osc.api.ApiConfig;
import com.github.tvbox.osc.bean.Movie;
import com.github.tvbox.osc.bean.SourceBean;
import com.github.tvbox.osc.picasso.RoundTransformation;
import com.github.tvbox.osc.util.DefaultConfig;
import com.github.tvbox.osc.util.HawkConfig;
@ -41,7 +42,12 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
TextView tvRate = helper.getView(R.id.tvRate);
if (Hawk.get(HawkConfig.HOME_REC, 0) == 2){
tvRate.setText(ApiConfig.get().getSource(item.sourceKey).getName());
SourceBean bean = ApiConfig.get().getSource(item.sourceKey);
if(bean!=null){
tvRate.setText(bean.getName());
}else {
tvRate.setVisibility(View.GONE);
}
}else if(Hawk.get(HawkConfig.HOME_REC, 0) == 0){
tvRate.setText("豆瓣热播");
}else {

27
app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
Unescape View File

@ -12,6 +12,7 @@ import com.github.tvbox.osc.R;
import com.github.tvbox.osc.api.ApiConfig;
import com.github.tvbox.osc.base.BaseLazyFragment;
import com.github.tvbox.osc.bean.Movie;
import com.github.tvbox.osc.bean.SourceBean;
import com.github.tvbox.osc.bean.VodInfo;
import com.github.tvbox.osc.cache.RoomDataManger;
import com.github.tvbox.osc.event.ServerEvent;
@ -111,6 +112,17 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
return R.layout.fragment_user;
}
private void jumpSearch(Movie.Video vod){
Intent newIntent;
if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
newIntent = new Intent(mContext, FastSearchActivity.class);
}else {
newIntent = new Intent(mContext, SearchActivity.class);
}
newIntent.putExtra("title", vod.name);
newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
mActivity.startActivity(newIntent);
}
@Override
protected void init() {
EventBus.getDefault().register(this);
@ -152,17 +164,14 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
Bundle bundle = new Bundle();
bundle.putString("id", vod.id);
bundle.putString("sourceKey", vod.sourceKey);
jumpActivity(DetailActivity.class, bundle);
} else {
Intent newIntent;
if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
newIntent = new Intent(mContext, FastSearchActivity.class);
SourceBean sourceBean = ApiConfig.get().getSource(vod.sourceKey);
if(sourceBean!=null){
jumpActivity(DetailActivity.class, bundle);
}else {
newIntent = new Intent(mContext, SearchActivity.class);
jumpSearch(vod);
}
newIntent.putExtra("title", vod.name);
newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
mActivity.startActivity(newIntent);
} else {
jumpSearch(vod);
}
}
});

2
gradle.properties
Unescape View File

@ -18,4 +18,4 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
IsDebug=true
org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
#org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED

Write Preview
Loading…
Cancel
Save