diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
index 9bf868a334..c98758bc14 100644
--- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
+++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
@@ -305,7 +305,7 @@ public class WebFragment extends NormalFragment {
public void onReceivedTitle(WebView view, String title) {
super.onReceivedTitle(view, title);
// title 有可能超出边界
- if (TextUtils.isEmpty(newsId) && TextUtils.isEmpty(mNavigationTitle) && !mIsTools && mAutoCompletionTitle) {
+ if (TextUtils.isEmpty(newsId) && TextUtils.isEmpty(mNavigationTitle) && !mIsTools && mAutoCompletionTitle && !view.getUrl().contains(title)) {
mNavigationTitle = title;
setNavigationTitle(mNavigationTitle);
}
@@ -385,6 +385,7 @@ public class WebFragment extends NormalFragment {
}, true, "H5页面", "退出弹窗");
return true;
} else if (mWebView.canGoBack()) {
+ mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
mWebView.goBack();
return true;
}
diff --git a/app/src/main/res/drawable/bg_video_detail_bottom.xml b/app/src/main/res/drawable/bg_video_detail_bottom.xml
index 3cc3742e3e..6af86dc651 100644
--- a/app/src/main/res/drawable/bg_video_detail_bottom.xml
+++ b/app/src/main/res/drawable/bg_video_detail_bottom.xml
@@ -3,6 +3,6 @@
+ android:endColor="#00060A0F"
+ android:startColor="#99060A0F" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/border_round_ccc.xml b/app/src/main/res/drawable/border_round_ccc.xml
new file mode 100644
index 0000000000..806d4c7615
--- /dev/null
+++ b/app/src/main/res/drawable/border_round_ccc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_video_detail_surface.xml b/app/src/main/res/layout/layout_video_detail_surface.xml
index d53170ba9c..c9b7b727c2 100644
--- a/app/src/main/res/layout/layout_video_detail_surface.xml
+++ b/app/src/main/res/layout/layout_video_detail_surface.xml
@@ -26,23 +26,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="视频加载失败"
- android:textColor="@color/white"
+ android:textColor="@color/text_eeeeee"
android:textSize="14sp" />
+ android:textColor="@color/text_eeeeee"
+ android:textSize="14sp" />
@@ -259,13 +258,37 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-