Skip to content

X
xxsq
Commit a056df77 authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：小象省钱
[实现方案] ：调整UI
parent 9be26765
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 117 deletions
cms/src/main/java/com/zxhl/cms/common/H5Activity.kt
View file @ a056df77
......@@ -29,7 +29,8 @@ class H5Activity : AppCompatActivity() {
id_activity_web_view?.loadUrl(url)
initWebView()
}
fun initWebView(){
fun initWebView() {
val webSettings = mWebView!!.getSettings()
//如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
webSettings.javaScriptEnabled = true
......@@ -73,9 +74,9 @@ class H5Activity : AppCompatActivity() {
override fun onProgressChanged(view: WebView?, newProgress: Int) {
super.onProgressChanged(view, newProgress)
if(newProgress==100){
if (newProgress == 100) {
id_webview_progress_view.visibility = View.GONE
}else{
} else {
id_webview_progress_view.visibility = View.VISIBLE
id_webview_progress_view.progress = newProgress
}
......@@ -84,7 +85,7 @@ class H5Activity : AppCompatActivity() {
mWebView?.setWebViewClient(object : WebViewClient() {
override fun shouldOverrideUrlLoading(wv: WebView, url: String): Boolean {
Log.e("MXL","URL"+url)
Log.e("MXL", "URL" + url)
if (url == null) return false
try {
if (url.startsWith("weixin://") //微信
......@@ -96,6 +97,7 @@ class H5Activity : AppCompatActivity() {
|| url.startsWith("openapp.jdmobile://") //淘宝
|| url.startsWith("tmast://") //淘宝
|| url.startsWith("pinduoduo://") //拼多多
|| url.startsWith("imeituan://") //美团
//其他自定义的scheme
) {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
......@@ -133,17 +135,18 @@ class H5Activity : AppCompatActivity() {
}
})
}
var firstLoad:Boolean=false
var firstLoad: Boolean = false
override fun onPause() {
super.onPause()
firstLoad=true
firstLoad = true
}
override fun onResume() {
super.onResume()
if(firstLoad){
if (firstLoad) {
//从支付宝回来
Log.e("MXL","从支付宝回来")
Log.e("MXL", "从支付宝回来")
finish()
}
}
......
moduleMain/src/main/java/com/zxbw/modulemain/fragment/HomeFragment.kt
View file @ a056df77
......@@ -60,6 +60,9 @@ class HomeFragment : BaseFragment(), HomeContract.View {
id_rl_search_view.setOnClickListener {
showToast("搜索")
}
id_img_kefu.setOnClickListener {
showToast("客服")
}
val config = SettingPreference.getConfig();
if (config != null && !config.tabs.isNullOrEmpty()) {
......@@ -104,7 +107,7 @@ class HomeFragment : BaseFragment(), HomeContract.View {
indicator_view.setupWithViewPager(id_home_top_banner)
}
private fun setHomeTabColor(bannerType:String){
private fun setHomeTabColor(bannerType: String) {
if (bannerType.equals("blindBox")) {
id_fragment_home_tab.textSelectColor = Color.parseColor("#FFFFFF")
id_fragment_home_tab.textUnselectColor = Color.parseColor("#FCFFFFFF")
......
moduleMain/src/main/res/layout/activity_layout_rights_detail.xml
View file @ a056df77
......@@ -14,7 +14,7 @@
android:id="@+id/id_rights_detail_title_sys_bar_view"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginBottom="5dp" />
android:layout_marginBottom="10dp" />
<ImageView
android:id="@+id/id_img_back"
......
moduleMain/src/main/res/layout/fragment_layout_home.xml
View file @ a056df77
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tl="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F6F6F6">
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
android:layout_height="match_parent"
android:background="#F6F6F6">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
tl:contentScrim="#ED2E28"
tl:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
tl:titleEnabled="false">
<RelativeLayout
android:id="@+id/id_home_top_banner_view"
android:layout_width="match_parent"
android:layout_height="280dp"
android:paddingBottom="16dp">
<androidx.viewpager.widget.ViewPager
android:id="@+id/id_home_top_banner"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:background="@color/transparent"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<com.zhpan.indicator.IndicatorView
android:id="@+id/indicator_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
tl:vpi_slider_checked_color="@color/white"
tl:vpi_slider_normal_color="#80ffffff"
tl:vpi_slider_radius="3dp" />
</RelativeLayout>
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
tl:contentInsetEnd="0dp"
tl:contentInsetStart="0dp"
tl:layout_collapseMode="pin">
android:background="@color/white"
tl:contentScrim="#ED2E28"
tl:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
tl:titleEnabled="false">
<RelativeLayout
android:id="@+id/id_home_top_banner_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="280dp"
android:paddingBottom="16dp">
<View
android:id="@+id/id_title_sys_bar_view"
<androidx.viewpager.widget.ViewPager
android:id="@+id/id_home_top_banner"
android:layout_width="match_parent"
android:layout_height="40dp" />
android:layout_height="match_parent" />
<com.zhpan.indicator.IndicatorView
android:id="@+id/indicator_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
tl:vpi_slider_checked_color="@color/white"
tl:vpi_slider_normal_color="#80ffffff"
tl:vpi_slider_radius="3dp" />
</RelativeLayout>
<androidx.appcompat.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
tl:contentInsetEnd="0dp"
tl:contentInsetStart="0dp"
tl:layout_collapseMode="pin">
<RelativeLayout
android:id="@+id/id_rl_search_view"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_below="@+id/id_title_sys_bar_view"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/shape_ffffff_r20"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:drawableLeft="@drawable/icon_search"
android:drawablePadding="4dp"
android:text="搜索商品"
android:textColor="@color/color_000000"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="3dp"
android:background="@drawable/shape_eb3625_r15"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingRight="14dp"
android:text="搜索"
android:textColor="@color/white"
android:textSize="14sp" />
android:layout_height="wrap_content">
<View
android:id="@+id/id_title_sys_bar_view"
android:layout_width="match_parent"
android:layout_height="40dp" />
<RelativeLayout
android:id="@+id/id_rl_search_view"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_below="@+id/id_title_sys_bar_view"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/shape_ffffff_r20"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:drawableLeft="@drawable/icon_search"
android:drawablePadding="4dp"
android:text="搜索商品"
android:textColor="@color/color_000000"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="3dp"
android:background="@drawable/shape_eb3625_r15"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingRight="14dp"
android:text="搜索"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
<com.zxbw.modulemain.view.SlidingTabLayout2
android:id="@+id/id_fragment_home_tab"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_below="@+id/id_rl_search_view"
android:layout_marginTop="17dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
tl:tl_indicator_color="@color/color_333333"
tl:tl_indicator_corner_radius="1dp"
tl:tl_indicator_height="2dp"
tl:tl_indicator_style="NORMAL"
tl:tl_indicator_width="14dp"
tl:tl_tab_padding="10dp"
tl:tl_textBold="SELECT"
tl:tl_textSelectColor="@color/color_333333"
tl:tl_textUnselectColor="#FC333333"
tl:tl_textsize="18sp" />
</RelativeLayout>
<com.zxbw.modulemain.view.SlidingTabLayout2
android:id="@+id/id_fragment_home_tab"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_below="@+id/id_rl_search_view"
android:layout_marginTop="17dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
tl:tl_indicator_color="@color/color_333333"
tl:tl_indicator_corner_radius="1dp"
tl:tl_indicator_height="2dp"
tl:tl_indicator_style="NORMAL"
tl:tl_indicator_width="14dp"
tl:tl_tab_padding="10dp"
tl:tl_textBold="SELECT"
tl:tl_textSelectColor="@color/color_333333"
tl:tl_textUnselectColor="#FC333333"
tl:tl_textsize="18sp" />
</RelativeLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
tl:layout_behavior="@string/appbar_scrolling_view_behavior" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
tl:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<ImageView
android:id="@+id/id_img_kefu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="16dp"
android:layout_marginBottom="10dp"
android:src="@drawable/icon_kefu" />
</RelativeLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment