Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan@ghzhushou.com
2020-02-18 16:11:41 +08:00
parent aa6294bfd4 77a6d3f295
commit dca5565f45
4 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/halo/assistant/fragment/WebFragment.java
View File

@ -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;
}

4
app/src/main/res/drawable/bg_video_detail_bottom.xml
View File

@ -3,6 +3,6 @@
<gradient
android:angle="90"
android:endColor="#00000000"
android:startColor="#66000000" />
android:endColor="#00060A0F"
android:startColor="#99060A0F" />
</shape>

13
app/src/main/res/drawable/border_round_ccc.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android = "http://schemas.android.com/apk/res/android"
android:shape = "rectangle" >
<stroke
android:width = "1dp"
android:color = "@color/text_cccccc" />
<corners android:radius = "1dp" />
<solid android:color = "@android:color/transparent" />
</shape >

74
app/src/main/res/layout/layout_video_detail_surface.xml
View File

@ -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" />
<TextView
android:id="@+id/errorBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:alpha="0.5"
android:background="@drawable/border_round_white"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:layout_height="34dp"
android:layout_marginTop="24dp"
android:background="@drawable/border_round_ccc"
android:paddingLeft="50dp"
android:paddingRight="50dp"
android:includeFontPadding="false"
android:gravity="center"
android:text="点击重试"
android:textColor="@color/white"
android:textSize="12sp" />
android:textColor="@color/text_eeeeee"
android:textSize="14sp" />
</LinearLayout>
@ -259,13 +258,37 @@
</LinearLayout>
<LinearLayout
android:id="@+id/likeContainer"
android:id="@+id/commentContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_alignParentRight="true"
android:orientation="vertical">
<ImageView
android:layout_width="28dp"
android:layout_height="28dp"
android:src="@drawable/ic_video_detail_comments" />
<TextView
android:id="@+id/commentCountTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="1.0W" />
</LinearLayout>
<LinearLayout
android:id="@+id/likeContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginRight="32dp"
android:layout_toLeftOf="@+id/commentContainer"
android:orientation="vertical">
<ImageView
android:id="@+id/likeIv"
android:layout_width="28dp"
@ -277,35 +300,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="@color/text_999999"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="1.0W" />
</LinearLayout>
<LinearLayout
android:id="@+id/commentContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginRight="32dp"
android:layout_toLeftOf="@+id/likeContainer"
android:orientation="vertical">
<ImageView
android:layout_width="28dp"
android:layout_height="28dp"
android:src="@drawable/ic_video_detail_comments" />
<TextView
android:id="@+id/commentCountTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="@color/text_999999"
android:textSize="12sp"
tools:text="1.0W" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>