From 37e6120768e411f902f055c9a69e1b6263004808 Mon Sep 17 00:00:00 2001 From: Jack <1484288157@qq.com> Date: Tue, 18 Feb 2020 10:46:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.0-?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=88?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AF=A6=E6=83=85=EF=BC=891=EF=BC=8C2=20http?= =?UTF-8?q?s://gitlab.ghzs.com/pm/halo-app-issues/issues/777?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/bg_video_detail_bottom.xml | 4 +- .../main/res/drawable/border_round_ccc.xml | 13 ++++ .../layout/layout_video_detail_surface.xml | 74 +++++++++---------- 3 files changed, 51 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable/border_round_ccc.xml 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 @@ + + + + + + + - - - - - - - - From 10fd6d9aef5027662ac78090da87d2096784c939 Mon Sep 17 00:00:00 2001 From: Jack <1484288157@qq.com> Date: Tue, 18 Feb 2020 10:46:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.0-?= =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E6=B1=87?= =?UTF-8?q?=E6=80=BB4=EF=BC=8C5=20https://gitlab.ghzs.com/pm/halo-app-issu?= =?UTF-8?q?es/issues/778?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/halo/assistant/fragment/WebFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; }