diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java
index cf26e30d..c8947e68 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
@@ -126,7 +126,6 @@ public class App extends Application {
@Override
public void onCreate() {
super.onCreate();
- Notify.createChannel();
Logger.addLogAdapter(getLogAdapter());
OkHttp.get().setProxy(Setting.getProxy());
OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));
diff --git a/app/src/main/res/drawable/ic_charging_bolt.xml b/app/src/main/res/drawable/ic_charging_bolt.xml
new file mode 100644
index 00000000..4600542c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_charging_bolt.xml
@@ -0,0 +1,10 @@
+
+
+
+
diff --git a/app/src/main/res/layout/activity_privacy_agreement.xml b/app/src/main/res/layout/activity_privacy_agreement.xml
index 1f46f535..e1bebc07 100644
--- a/app/src/main/res/layout/activity_privacy_agreement.xml
+++ b/app/src/main/res/layout/activity_privacy_agreement.xml
@@ -15,13 +15,6 @@
android:orientation="vertical"
android:padding="24dp">
-
-
-
= 0 ? mBatteryLevel + "%" : "";
- String text = time + (battery.isEmpty() ? "" : " | " + battery);
- timeBattery.setText(text);
- timeBattery.setVisibility(View.VISIBLE);
+ // 只在全屏模式下显示
+ if (isFullscreen()) {
+ // 更新时间
+ if (timeBattery != null) {
+ String time = DateFormat.getTimeFormat(this).format(System.currentTimeMillis());
+ timeBattery.setText(time);
+ timeBattery.setVisibility(View.VISIBLE);
+ }
+
+ // 更新充电图标
+ if (chargingIndicator != null) {
+ chargingIndicator.setVisibility(mIsCharging && mBatteryLevel >= 0 ? View.VISIBLE : View.GONE);
+ }
+
+ // 更新电池百分比文字
+ if (batteryText != null && mBatteryLevel >= 0) {
+ batteryText.setText(mBatteryLevel + "%");
+ batteryText.setVisibility(View.VISIBLE);
+ } else if (batteryText != null) {
+ batteryText.setVisibility(View.GONE);
+ }
} else {
- timeBattery.setVisibility(View.GONE);
+ if (timeBattery != null) {
+ timeBattery.setVisibility(View.GONE);
+ }
+ if (batteryText != null) {
+ batteryText.setVisibility(View.GONE);
+ }
+ if (chargingIndicator != null) {
+ chargingIndicator.setVisibility(View.GONE);
+ }
}
}
diff --git a/app/src/mobile/res/layout-land/view_control_vod.xml b/app/src/mobile/res/layout-land/view_control_vod.xml
index 91f8108d..b6bf3efd 100644
--- a/app/src/mobile/res/layout-land/view_control_vod.xml
+++ b/app/src/mobile/res/layout-land/view_control_vod.xml
@@ -56,7 +56,30 @@
android:paddingEnd="8dp"
android:textColor="@color/white"
android:textSize="16sp"
- tools:text="21:30 | 85%" />
+ tools:text="21:30" />
+
+
+
+
diff --git a/app/src/mobile/res/layout/view_control_vod.xml b/app/src/mobile/res/layout/view_control_vod.xml
index 745d9f65..b6bf3efd 100644
--- a/app/src/mobile/res/layout/view_control_vod.xml
+++ b/app/src/mobile/res/layout/view_control_vod.xml
@@ -56,8 +56,30 @@
android:paddingEnd="8dp"
android:textColor="@color/white"
android:textSize="16sp"
+ tools:text="21:30" />
+
+
+ tools:visibility="visible" />
+
+