From 73a51765e7cceeaac3644f9ed1f08cd763a192b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E4=BA=91?= Date: Tue, 20 Oct 2020 18:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=A8=E6=B0=B4=E5=B1=8F=20=202.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 6 ++ .idea/gradle.xml | 1 + .idea/jarRepositories.xml | 25 ++++++++ .idea/misc.xml | 2 +- .idea/vcs.xml | 6 ++ app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 29 +++++---- .../yzx/webebook/activity/BookActivity.java | 43 ++++++++++--- .../com/yzx/webebook/activity/WebActivity.kt | 35 +++++++--- .../linearlayout_vertical_divider.xml | 5 ++ app/src/main/res/drawable/shape_select.xml | 4 ++ app/src/main/res/layout/activity_book.xml | 60 ++++++++++++++++-- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_web.xml | 12 +++- app/src/main/res/mipmap-xhdpi/ic_back_def.png | Bin 1116 -> 673 bytes .../main/res/mipmap-xhdpi/ic_book_clear.png | Bin 0 -> 1038 bytes app/src/main/res/mipmap-xhdpi/ic_book_pen.png | Bin 0 -> 618 bytes .../res/mipmap-xhdpi/ic_book_pen_select.png | Bin 0 -> 505 bytes .../main/res/mipmap-xhdpi/ic_book_rubber.png | Bin 0 -> 610 bytes .../mipmap-xhdpi/ic_book_rubber_select.png | Bin 0 -> 514 bytes app/src/main/res/mipmap-xhdpi/ic_close.png | Bin 1421 -> 569 bytes app/src/main/res/mipmap-xhdpi/ic_refresh.png | Bin 1322 -> 1003 bytes .../main/res/mipmap-xhdpi/icon_save_btn.png | Bin 0 -> 615 bytes 23 files changed, 193 insertions(+), 41 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/vcs.xml create mode 100644 app/src/main/res/drawable/linearlayout_vertical_divider.xml create mode 100644 app/src/main/res/drawable/shape_select.xml create mode 100644 app/src/main/res/mipmap-xhdpi/ic_book_clear.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_book_pen.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_book_pen_select.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_book_rubber.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_book_rubber_select.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_save_btn.png diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e04498a..6e45dfc 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3691e08..811ac8a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.yzx.webebook" minSdkVersion 26 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } signingConfigs { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 956f110..28df13f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,34 +9,39 @@ - - + + - + android:screenOrientation="portrait"> - - + + + >() { private val webView: WebView by lazy { WebView(this) } private var url: String = "" + private var count = 0 + private val run = Runnable { + count = 0 + } override val inflateId: Int get() = R.layout.activity_web + override fun onNewIntent(intent: Intent?) { + super.onNewIntent(intent) + url = intent?.getStringExtra("link") ?: "https://m.qbjjyyun.net/" + this.initData() + } @SuppressLint("SetJavaScriptEnabled") override fun initView() { - url = intent?.getStringExtra("link") ?: "https://m.ykj.qbjjyyun.net/" - + url = intent?.getStringExtra("link") ?: "https://m.qbjjyyun.net/" + titleTv.setOnClickListener { + count++ + titleTv.removeCallbacks(run) + titleTv.postDelayed(run, 1000) + if (count >= 5) { + startActivity() + } + } btnBack.setOnClickListener { onBackPressed() } btnClose.setOnClickListener { finish() @@ -119,11 +136,11 @@ class WebActivity : BaseActivity>() { view?.post { progressbar.visibility = View.GONE if (view.canGoBack()) { - btnClose.visibility = View.VISIBLE - //btnBack.visibility = View.VISIBLE + //btnClose.visibility = View.VISIBLE + btnBack.visibility = View.VISIBLE } else { - btnClose.visibility = View.GONE - //btnBack.visibility = View.GONE + //btnClose.visibility = View.GONE + btnBack.visibility = View.GONE } } } else { @@ -210,8 +227,8 @@ class WebActivity : BaseActivity>() { obj.put("key", mKey) obj.put("identity", mIdentity) obj.put("name", data?.getStringExtra("name") ?: "") - obj.put("index", data?.getIntExtra("index",0)) - obj.put("type", data?.getIntExtra("type",1)) + obj.put("index", data?.getIntExtra("index", 0)) + obj.put("type", data?.getIntExtra("type", 1)) evaluateJavascript("onImageUploadSuccess", obj.toString()) } } @@ -239,7 +256,7 @@ class YzxJavascriptInterface(var ctx: Activity) { index: Int, type: Int ) { - BookActivity.active(ctx, title, key, identity,name,index,type) + BookActivity.active(ctx, title, key, identity, name, index, type) } /** diff --git a/app/src/main/res/drawable/linearlayout_vertical_divider.xml b/app/src/main/res/drawable/linearlayout_vertical_divider.xml new file mode 100644 index 0000000..284d027 --- /dev/null +++ b/app/src/main/res/drawable/linearlayout_vertical_divider.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_select.xml b/app/src/main/res/drawable/shape_select.xml new file mode 100644 index 0000000..d1f8c7d --- /dev/null +++ b/app/src/main/res/drawable/shape_select.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_book.xml b/app/src/main/res/layout/activity_book.xml index 199a797..99ccd7b 100644 --- a/app/src/main/res/layout/activity_book.xml +++ b/app/src/main/res/layout/activity_book.xml @@ -51,8 +51,9 @@ android:layout_centerVertical="true" android:background="@drawable/btn_select" android:paddingHorizontal="15dp" + android:drawableLeft="@mipmap/icon_save_btn" + android:drawablePadding="5dp" android:textSize="@dimen/title_text_size" - android:textStyle="bold" android:text="保存" /> + + @@ -115,8 +122,42 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:orientation="horizontal" - android:paddingTop="4dp"> + android:divider="@drawable/linearlayout_vertical_divider" + android:showDividers="middle|end" + android:orientation="horizontal"> + + + + + +