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" /> + + + + + + 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 @@ 选择本地图片 编辑书籍 跳过 | %ds + 插屏广告 + 插屏视频 跟随系统