From ea5d34b659e8fce2fb2cf0a2ae3921666c85eeca Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Wed, 12 May 2021 17:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=8B=B1=E6=96=87=E6=8E=92?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/updatelog.fy              |  4 +++
 .../myreader/ui/activity/DonateActivity.java  | 32 +++++++++++++++++++
 .../xyz/fycz/myreader/util/utils/AdUtils.java |  5 +--
 .../fycz/myreader/widget/page/PageLoader.java |  2 +-
 app/src/main/res/layout/activity_donate.xml   | 24 ++++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 6 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index ee16fb7..5a1674e 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,3 +1,7 @@
+风月读书v1.9.6
+更新内容：
+1、适配英文书籍排版(建议使用等距排版)
+
 2021.05.09
 风月读书v1.9.5
 更新内容：
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
index b80ad1d..3fe4479 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
@@ -8,6 +8,8 @@ import android.view.View;
 import androidx.appcompat.widget.Toolbar;
 
 import com.weaction.ddsdk.ad.DdSdkFlowAd;
+import com.weaction.ddsdk.ad.DdSdkInterAd;
+import com.weaction.ddsdk.ad.DdSdkInterVideoAd;
 import com.weaction.ddsdk.ad.DdSdkRewardAd;
 
 import java.util.List;
@@ -117,6 +119,36 @@ public class DonateActivity extends BaseActivity {
                 }
             });
         });
+
+        binding.llInterAd.setOnClickListener(v -> {
+            /*
+             * 参数 1  activity
+             * 参数 2  marginDp (float)，插屏默认 margin 全屏幕的 24dp，此处允许开发者手动调节 margin 大小，单位为 dp，允许范围为 0dp (全屏) ~ 48dp，请开发者按需填写
+             */
+            DdSdkInterAd.show(this, 48f, new DdSdkInterAd.Callback() {
+                @Override
+                public void show() {
+                    Log.i(TAG, "插屏广告展示成功");
+                    AdUtils.adRecord("inter","adShow");
+                }
+
+                @Override
+                public void click() {
+                    Log.i(TAG, "插屏广告");
+                    AdUtils.adRecord("inter","adClick");
+                }
+
+                @Override
+                public void error(String msg) {
+                }
+
+                @Override
+                public void close() {
+                    Log.i(TAG, "插屏广告被关闭");
+                    AdUtils.adRecord("inter","adClose");
+                }
+            });
+        });
     }
 
 
diff --git a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java b/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java
index b3da89e..738fd51 100644
--- a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java
+++ b/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java
@@ -125,10 +125,7 @@ public class AdUtils {
     public static void initAd() {
         if (!hasInitAd) {
             hasInitAd = true;
-            DdSdkHelper.init("1234", "216", "51716a16fbdf50905704b6575b1b3b60",
-                    "142364", "35ce0efe5f3cc960b116db227498e238",
-                    "8167", "85bd159309c3da1b",
-                    App.getApplication(), true);
+
         }
     }
 }
diff --git a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
index 019bc5d..79026d7 100644
--- a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
+++ b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
@@ -1673,7 +1673,7 @@ public abstract class PageLoader {
                 }
                 // 重置段落
                 if (!showTitle) {
-                    paragraph = paragraph.replaceAll("\\s", "").trim();
+                    paragraph = paragraph.replaceAll("[ |　]", " ").trim();
                     // 如果只有换行符，那么就不执行
                     if (paragraph.equals("")) continue;
                     paragraph = indent + paragraph + "\n";
diff --git a/app/src/main/res/layout/activity_donate.xml b/app/src/main/res/layout/activity_donate.xml
index 535b613..70b68d6 100644
--- a/app/src/main/res/layout/activity_donate.xml
+++ b/app/src/main/res/layout/activity_donate.xml
@@ -150,7 +150,30 @@
                     android:text="@string/flow_ad_tip"
                     android:textColor="@color/textSecondary" />
             </RelativeLayout>
+            <LinearLayout
+                android:id="@+id/ll_inter_ad"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:background="@drawable/selector_common_bg"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingTop="8dp"
+                android:paddingRight="20dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/inter_ad"
+                    android:textColor="@color/textSecondary"
+                    android:textSize="@dimen/text_normal_size" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="5dp"
+                    android:text="@string/donate_tip"
+                    android:textColor="@color/textAssist" />
+            </LinearLayout>
             <LinearLayout
                 android:id="@+id/ll_rewarded_video"
                 android:layout_width="match_parent"
@@ -175,6 +198,7 @@
                     android:text="@string/donate_tip"
                     android:textColor="@color/textAssist" />
             </LinearLayout>
+
         </LinearLayout>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e064642..7c4501f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,6 +478,8 @@
     <string name="select_local_pic">选择本地图片</string>
     <string name="menu_edit">编辑书籍</string>
     <string name="skip_ad">跳过 | %ds</string>
+    <string name="inter_ad">插屏广告</string>
+    <string name="inter_video">插屏视频</string>
 
     <string-array name="reset_screen_time">
         <item>跟随系统</item>