From 55e1194a8b583093f309f800de7b50c5496161b6 Mon Sep 17 00:00:00 2001 From: kodak Date: Wed, 19 Jun 2024 10:17:51 +0800 Subject: [PATCH] fix --- app/build.gradle | 2 +- .../Pages/ArticlePage/Thumbnail_ItemView.java | 8 +- .../Pages/EssencePage/ArticleEssencePage.kt | 7 +- .../java/com/kota/Bahamut/Pages/MailPage.java | 7 +- .../java/com/kota/Bahamut/Pages/MainPage.java | 9 +- .../main/res/layout/article_essence_page.xml | 2 +- app/src/main/res/layout/article_page.xml | 15 +- app/src/main/res/layout/mail_page.xml | 23 +- book/outline.md | 10 +- book/pics/shortUrl.gif | Bin 0 -> 59230 bytes book/pics/shortUrl_01.png | Bin 0 -> 103814 bytes book/shortUrl.md | 15 + cloud/cloudflare/cloud-backup/.editorconfig | 12 + cloud/cloudflare/cloud-backup/.gitignore | 172 +++ cloud/cloudflare/cloud-backup/.prettierrc | 6 + .../cloudflare/cloud-backup/package-lock.json | 1329 ++++++++++++++++ cloud/cloudflare/cloud-backup/package.json | 13 + cloud/cloudflare/cloud-backup/src/worker.js | 37 + cloud/cloudflare/cloud-backup/wrangler.toml | 9 + .../cloudflare/user-buy-history/.editorconfig | 12 + cloud/cloudflare/user-buy-history/.gitignore | 172 +++ cloud/cloudflare/user-buy-history/.prettierrc | 6 + .../user-buy-history/package-lock.json | 1332 +++++++++++++++++ .../cloudflare/user-buy-history/package.json | 13 + .../cloudflare/user-buy-history/src/worker.js | 79 + .../cloudflare/user-buy-history/wrangler.toml | 9 + .../worker-get-url-content/src/worker.js | 200 ++- .../worker-get-url-content/wrangler.toml | 4 +- developSource/menu_icon.svg | 8 + developSource/ojigi_mask_sagyouin.png | Bin 0 -> 468385 bytes 30 files changed, 3373 insertions(+), 138 deletions(-) create mode 100644 book/pics/shortUrl.gif create mode 100644 book/pics/shortUrl_01.png create mode 100644 book/shortUrl.md create mode 100644 cloud/cloudflare/cloud-backup/.editorconfig create mode 100644 cloud/cloudflare/cloud-backup/.gitignore create mode 100644 cloud/cloudflare/cloud-backup/.prettierrc create mode 100644 cloud/cloudflare/cloud-backup/package-lock.json create mode 100644 cloud/cloudflare/cloud-backup/package.json create mode 100644 cloud/cloudflare/cloud-backup/src/worker.js create mode 100644 cloud/cloudflare/cloud-backup/wrangler.toml create mode 100644 cloud/cloudflare/user-buy-history/.editorconfig create mode 100644 cloud/cloudflare/user-buy-history/.gitignore create mode 100644 cloud/cloudflare/user-buy-history/.prettierrc create mode 100644 cloud/cloudflare/user-buy-history/package-lock.json create mode 100644 cloud/cloudflare/user-buy-history/package.json create mode 100644 cloud/cloudflare/user-buy-history/src/worker.js create mode 100644 cloud/cloudflare/user-buy-history/wrangler.toml create mode 100644 developSource/menu_icon.svg create mode 100644 developSource/ojigi_mask_sagyouin.png diff --git a/app/build.gradle b/app/build.gradle index c7d8e1c..48a6a83 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.kota.Bahamut" minSdk 26 targetSdk 34 - versionCode 21 + versionCode 22 versionName "2.4" } diff --git a/app/src/main/java/com/kota/Bahamut/Pages/ArticlePage/Thumbnail_ItemView.java b/app/src/main/java/com/kota/Bahamut/Pages/ArticlePage/Thumbnail_ItemView.java index 256bc6e..efe70da 100644 --- a/app/src/main/java/com/kota/Bahamut/Pages/ArticlePage/Thumbnail_ItemView.java +++ b/app/src/main/java/com/kota/Bahamut/Pages/ArticlePage/Thumbnail_ItemView.java @@ -135,7 +135,9 @@ public void loadUrl(String url) { // 非圖片類比較會有擷取問題 if (!_isPic && (_title.equals("") || _description.equals(""))) { - String userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0"; + String userAgent = System.getProperty("http.agent"); + if (_url.contains("youtu") || _url.contains("amazon")) + userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0"; // cookie // Create a new Map to store cookies @@ -178,6 +180,10 @@ public void loadUrl(String url) { _imageUrl = document.select("meta[property=og:image]").attr("content"); if (_imageUrl.isEmpty()) _imageUrl = document.select("meta[property=og:image]").attr("content"); + if (_imageUrl.isEmpty()) + _imageUrl = document.select("meta[property=og:images]").attr("content"); + if (_imageUrl.isEmpty()) + _imageUrl = document.select("#landingImage").attr("src"); } } diff --git a/app/src/main/java/com/kota/Bahamut/Pages/EssencePage/ArticleEssencePage.kt b/app/src/main/java/com/kota/Bahamut/Pages/EssencePage/ArticleEssencePage.kt index 900a7ca..4e73091 100644 --- a/app/src/main/java/com/kota/Bahamut/Pages/EssencePage/ArticleEssencePage.kt +++ b/app/src/main/java/com/kota/Bahamut/Pages/EssencePage/ArticleEssencePage.kt @@ -96,9 +96,10 @@ class ArticleEssencePage : TelnetPage(), View.OnClickListener, SendMailPage_List itemViewOrigin = ArticlePage_TimeTimeView(context) } } else { - if (type == ArticlePageItemType.Content) { + if (type == ArticlePageItemType.Content) itemViewOrigin = ArticlePage_TextItemView(context) - } + else + itemViewOrigin = itemView } if (itemViewOrigin == null) @@ -208,7 +209,7 @@ class ArticleEssencePage : TelnetPage(), View.OnClickListener, SendMailPage_List } override fun onPageDidLoad() { - mainLayout = findViewById(R.id.contentView) as RelativeLayout + mainLayout = findViewById(R.id.content_view) as RelativeLayout telnetViewBlock = mainLayout!!.findViewById(R.id.Essence_contentTelnetViewBlock) telnetView = mainLayout!!.findViewById(R.id.Essence_contentTelnetView) reloadTelnetLayout() diff --git a/app/src/main/java/com/kota/Bahamut/Pages/MailPage.java b/app/src/main/java/com/kota/Bahamut/Pages/MailPage.java index af6d6a4..4a0888a 100644 --- a/app/src/main/java/com/kota/Bahamut/Pages/MailPage.java +++ b/app/src/main/java/com/kota/Bahamut/Pages/MailPage.java @@ -59,7 +59,7 @@ public boolean isPopupPage() { } public void onPageDidLoad() { - mainLayout = (RelativeLayout) findViewById(R.id.contentView); + mainLayout = (RelativeLayout) findViewById(R.id.content_view); telnetViewBlock = mainLayout.findViewById(R.id.Mail_contentTelnetViewBlock); telnetView = mainLayout.findViewById(R.id.Mail_contentTelnetView); @@ -153,6 +153,11 @@ public View getView(int itemIndex, View itemView, ViewGroup parentView) { case ArticlePageItemType.PostTime -> itemViewOrigin = new ArticlePage_TimeTimeView(getContext()); } + } else { + if (type == ArticlePageItemType.Content) + itemViewOrigin = new ArticlePage_TextItemView(getContext()); + else + itemViewOrigin = itemView; } if (itemViewOrigin == null) diff --git a/app/src/main/java/com/kota/Bahamut/Pages/MainPage.java b/app/src/main/java/com/kota/Bahamut/Pages/MainPage.java index 6852730..f1b4846 100644 --- a/app/src/main/java/com/kota/Bahamut/Pages/MainPage.java +++ b/app/src/main/java/com/kota/Bahamut/Pages/MainPage.java @@ -126,13 +126,20 @@ public boolean onBackPressed() { public void onProcessHotMessage() { if (this._save_hot_message_dialog == null) { - this._save_hot_message_dialog = ASAlertDialog.createDialog().setTitle("熱訊").setMessage("本次上站熱訊處理 ").addButton("備忘錄").addButton("保留").addButton("清除").setListener((aDialog, index) -> { + this._save_hot_message_dialog = ASAlertDialog.createDialog() + .setTitle("熱訊") + .setMessage("本次上站熱訊處理 ") + .addButton("備忘錄") + .addButton("保留") + .addButton("清除") + .setListener((aDialog, index) -> { MainPage.this._save_hot_message_dialog = null; switch (index) { case 0 -> TelnetClient.getClient().sendStringToServerInBackground("M"); case 1 -> TelnetClient.getClient().sendStringToServerInBackground("K"); case 2 -> TelnetClient.getClient().sendStringToServerInBackground("C"); default -> { + TelnetClient.getClient().sendStringToServerInBackground("K"); } } }).scheduleDismissOnPageDisappear(this).setOnBackDelegate(aDialog -> { diff --git a/app/src/main/res/layout/article_essence_page.xml b/app/src/main/res/layout/article_essence_page.xml index 0f5a03b..e16e8a3 100644 --- a/app/src/main/res/layout/article_essence_page.xml +++ b/app/src/main/res/layout/article_essence_page.xml @@ -2,7 +2,7 @@ - + android:layout_height="match_parent" + android:orientation="vertical">