Commit 5f0caed5 authored by wanglei's avatar wanglei

...

parent ffc183d2
...@@ -4,6 +4,7 @@ plugins { ...@@ -4,6 +4,7 @@ plugins {
} }
android { android {
namespace = "com.base.browserwhite" namespace = "com.base.browserwhite"
compileSdk = 34 compileSdk = 34
...@@ -16,10 +17,21 @@ android { ...@@ -16,10 +17,21 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
signingConfigs {
create("release") {
storeFile = file("../smartcl.jks")
storePassword = "123456"
keyAlias = "key0"
keyPassword = "123456"
}
}
buildTypes { buildTypes {
release { release {
isMinifyEnabled = false isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
} }
} }
......
...@@ -145,7 +145,7 @@ class WebViewFragment(val url: String) : BaseFragment<FragmentWebViewBinding>() ...@@ -145,7 +145,7 @@ class WebViewFragment(val url: String) : BaseFragment<FragmentWebViewBinding>()
} }
override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) { override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
LogEx.logDebug(TAG, "onReceivedError ${error?.description}") LogEx.logDebug(TAG, "onReceivedError ${error?.errorCode} ${error?.description}")
super.onReceivedError(view, request, error) super.onReceivedError(view, request, error)
job?.cancel() job?.cancel()
binding.webView.visibility = View.GONE binding.webView.visibility = View.GONE
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="85dp" android:layout_height="50dp"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed" app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
tools:ignore="ContentDescription"> tools:ignore="ContentDescription">
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginVertical="15dp" android:layout_marginTop="5dp"
android:layout_marginBottom="15dp"
android:background="@drawable/bg_stroke_070709" android:background="@drawable/bg_stroke_070709"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="45dp"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/news" android:src="@mipmap/news"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="4dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:text="News" android:text="News"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="45dp"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/clean" android:src="@mipmap/clean"
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="4dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:text="Clean" android:text="Clean"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="45dp"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/process" android:src="@mipmap/process"
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="4dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:text="Process" android:text="Process"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="45dp"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="8.5dp"
android:src="@mipmap/bookmark" android:src="@mipmap/bookmark"
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8.5dp" android:layout_marginTop="4dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:text="Bookmark" android:text="Bookmark"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
......
...@@ -14,20 +14,20 @@ ...@@ -14,20 +14,20 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="8dp"> android:padding="4dp">
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/iv_icon" android:id="@+id/iv_icon"
android:layout_width="60dp" android:layout_width="45dp"
android:layout_height="60dp" android:layout_height="45dp"
app:civ_circle_background_color="#FDFDFD" app:civ_circle_background_color="#FDFDFD"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@mipmap/amazon" /> tools:src="@mipmap/amazon" />
<ImageView <ImageView
android:id="@+id/iv_add" android:id="@+id/iv_add"
android:layout_width="60dp" android:layout_width="45dp"
android:layout_height="60dp" android:layout_height="45dp"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="#FDFDFD" app:civ_circle_background_color="#FDFDFD"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
......
File added
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