pull/137/head
FongMi 4 years ago
parent a72f5fdc5b
commit 9cdbfbcd05
  1. 1
      app/src/leanback/res/values-zh-rCN/strings.xml
  2. 1
      app/src/leanback/res/values-zh-rTW/strings.xml
  3. 1
      app/src/leanback/res/values/strings.xml
  4. 2
      app/src/main/java/com/fongmi/android/tv/bean/Collect.java
  5. 1
      app/src/main/res/values-zh-rCN/strings.xml
  6. 1
      app/src/main/res/values-zh-rTW/strings.xml
  7. 1
      app/src/main/res/values/strings.xml
  8. 10
      app/src/mobile/AndroidManifest.xml
  9. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java
  10. 3
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java
  11. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
  12. 0
      app/src/mobile/res/drawable/selector_text.xml
  13. 15
      app/src/mobile/res/drawable/shape_text_activated.xml
  14. 15
      app/src/mobile/res/drawable/shape_text_focused.xml
  15. 15
      app/src/mobile/res/drawable/shape_text_normal.xml

@ -17,7 +17,6 @@
<!-- Collect -->
<string name="collect_result"><xliff:g name="name">%s</xliff:g>”的搜索结果</string>
<string name="collect_all">全部</string>
<!-- Push -->
<string name="push_info">手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>

@ -17,7 +17,6 @@
<!-- Collect -->
<string name="collect_result"><xliff:g name="name">%s</xliff:g>」的搜尋結果</string>
<string name="collect_all">全部</string>
<!-- Push -->
<string name="push_info">手機或電腦連接同一個區域網路,掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>

@ -17,7 +17,6 @@
<!-- Collect -->
<string name="collect_result">Search results for <xliff:g name="name">%s</xliff:g></string>
<string name="collect_all">All</string>
<!-- Push -->
<string name="push_info">Connect phone or pc to LAN and scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>

@ -12,7 +12,7 @@ public class Collect {
private final List<Vod> list;
public static Collect all() {
return new Collect(Site.get("all", ResUtil.getString(R.string.collect_all)), new ArrayList<>());
return new Collect(Site.get("all", ResUtil.getString(R.string.all)), new ArrayList<>());
}
public static Collect create(List<Vod> list) {

@ -76,6 +76,7 @@
<string name="crash_details_close">关闭</string>
<!-- UNIT -->
<string name="all">全部</string>
<string name="second"><xliff:g name="name">%s</xliff:g></string>
<string-array name="select_quality">

@ -76,6 +76,7 @@
<string name="crash_details_close">關閉</string>
<!-- UNIT -->
<string name="all">全部</string>
<string name="second"><xliff:g name="name">%s</xliff:g></string>
<string-array name="select_quality">

@ -76,6 +76,7 @@
<string name="crash_details_close">Close</string>
<!-- UNIT -->
<string name="all">All</string>
<string name="second"><xliff:g name="name">%s</xliff:g> s</string>
<string-array name="select_render">

@ -12,6 +12,14 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<meta-data
android:name="design_width_in_dp"
android:value="411" />
<meta-data
android:name="design_height_in_dp"
android:value="891" />
<activity
android:name=".ui.activity.SplashActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
@ -27,7 +35,7 @@
<activity
android:name=".ui.activity.MainActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:screenOrientation="sensorPortrait" />
android:screenOrientation="fullSensor" />
</application>
</manifest>

@ -83,6 +83,6 @@ public class VodAdapter extends RecyclerView.Adapter<VodAdapter.ViewHolder> {
holder.binding.remark.setText(item.getVodRemarks());
holder.binding.year.setVisibility(item.getYearVisible());
holder.binding.remark.setVisibility(item.getRemarkVisible());
ImgUtil.load(item.getVodName(), item.getVodPic(), holder.binding.image);
ImgUtil.load(item.getVodPic(), holder.binding.image);
}
}

@ -13,7 +13,6 @@ import com.fongmi.android.tv.api.ApiConfig;
import com.fongmi.android.tv.bean.History;
import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentHomeBinding;
import com.fongmi.android.tv.db.AppDatabase;
import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.BaseFragment;
import com.fongmi.android.tv.ui.adapter.HistoryAdapter;
@ -69,7 +68,7 @@ public class HomeFragment extends BaseFragment implements VodAdapter.OnClickList
}
private void getHistory() {
mHistoryAdapter.addAll(AppDatabase.get().getHistoryDao().getAll());
mHistoryAdapter.addAll(History.get());
}
@Override

@ -19,7 +19,6 @@ import androidx.viewbinding.ViewBinding;
import com.fongmi.android.tv.api.ApiConfig;
import com.fongmi.android.tv.bean.Site;
import com.fongmi.android.tv.databinding.FragmentSettingBinding;
import com.fongmi.android.tv.db.AppDatabase;
import com.fongmi.android.tv.event.RefreshEvent;
import com.fongmi.android.tv.net.Callback;
import com.fongmi.android.tv.ui.activity.BaseFragment;
@ -63,7 +62,6 @@ public class SettingFragment extends BaseFragment implements ConfigDialog.Callba
public void setConfig(String url) {
mBinding.url.setText(url);
Notify.progress(getActivity());
AppDatabase.clear();
Prefers.putUrl(url);
checkUrl(url);
}

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_80" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_70" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_50" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>
Loading…
Cancel
Save