diff --git a/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java b/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java index d53fbe4..b8fcf00 100644 --- a/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java +++ b/base/src/main/java/com/heyongrui/base/utils/UpdateCheckUtil.java @@ -26,6 +26,7 @@ import com.blankj.utilcode.util.PermissionUtils; import com.blankj.utilcode.util.ToastUtils; import com.heyongrui.base.R; +import com.heyongrui.base.assist.AppManager; import com.heyongrui.base.widget.catloadingview.CatLoadingDialog; import org.json.JSONException; @@ -170,6 +171,9 @@ public void onDenied(List permissionsDeniedForever, List permiss @Override public void onNo(Dialog dialog) { dialog.dismiss(); + if (isForceUpdate) { + AppManager.getInstance().exitApp(); + } } }).showRemindDialog(); } diff --git a/main/src/main/java/com/heyongrui/main/HomeFragment.java b/main/src/main/java/com/heyongrui/main/HomeFragment.java index eb65f49..586c457 100644 --- a/main/src/main/java/com/heyongrui/main/HomeFragment.java +++ b/main/src/main/java/com/heyongrui/main/HomeFragment.java @@ -163,6 +163,12 @@ public View getView(Context context, int position, ViewGroup parent) { case 11://音乐搜索 ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://ys.juan8014.cn/yin/").navigation(); break; + case 12://炫光 + ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "http://weavesilk.com/").navigation(); + break; + case 13://唐宋文学编年地图 + ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://sou-yun.cn/MPoetLifeMap.aspx").navigation(); + break; } } }); @@ -203,6 +209,8 @@ private List getFloatListData() { floatingDtoList.add(creatFloatingDto(getString(R.string.garbage_classify_query), R.drawable.ic_ashcan, 9)); floatingDtoList.add(creatFloatingDto(getString(R.string.artificial_intelligence), R.drawable.ic_robot, 10)); floatingDtoList.add(creatFloatingDto(getString(R.string.music_search), R.drawable.ic_music_disc, 11)); + floatingDtoList.add(creatFloatingDto(getString(R.string.weavesilk), R.drawable.ic_weavesilk, 12)); + floatingDtoList.add(creatFloatingDto(getString(R.string.literature_chronicle_map), R.drawable.ic_literature_chronicle, 13)); return floatingDtoList; } diff --git a/main/src/main/res/drawable-xhdpi/ic_literature_chronicle.png b/main/src/main/res/drawable-xhdpi/ic_literature_chronicle.png new file mode 100644 index 0000000..0f74421 Binary files /dev/null and b/main/src/main/res/drawable-xhdpi/ic_literature_chronicle.png differ diff --git a/main/src/main/res/drawable-xhdpi/ic_weavesilk.png b/main/src/main/res/drawable-xhdpi/ic_weavesilk.png new file mode 100644 index 0000000..4e69ec7 Binary files /dev/null and b/main/src/main/res/drawable-xhdpi/ic_weavesilk.png differ diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index feba537..c1f8488 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -53,4 +53,6 @@ 垃圾分类查询 人工智障 音乐搜索 + 炫光 + 唐宋文学编年地图 diff --git a/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java b/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java index 93e4f1d..a9e89c5 100644 --- a/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java +++ b/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java @@ -143,6 +143,9 @@ private void initBalls() { case 8://瞎推荐 ARouter.getInstance().build(ConfigConstants.PATH_LEISURE_READ).navigation(); break; + case 9://小专栏 + ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://xiaozhuanlan.com/").navigation(); + break; } }); poolBall.addView(floatingActionButton, layoutParams); @@ -159,6 +162,7 @@ private List getMenuList() { gankMenuDtos.add(new GankMenuDto(getString(R.string.expand), R.drawable.ic_expand, 6)); gankMenuDtos.add(new GankMenuDto(getString(R.string.app), R.drawable.ic_app, 7)); gankMenuDtos.add(new GankMenuDto(getString(R.string.blind_recommend), R.drawable.ic_recommend, 8)); + gankMenuDtos.add(new GankMenuDto(getString(R.string.xiaozhuanlan), R.drawable.ic_xiaozhuanlan, 9)); return gankMenuDtos; } diff --git a/module2/src/main/res/drawable-xhdpi/ic_xiaozhuanlan.png b/module2/src/main/res/drawable-xhdpi/ic_xiaozhuanlan.png new file mode 100644 index 0000000..a063ede Binary files /dev/null and b/module2/src/main/res/drawable-xhdpi/ic_xiaozhuanlan.png differ diff --git a/module2/src/main/res/values/strings.xml b/module2/src/main/res/values/strings.xml index fd55fba..21cc470 100644 --- a/module2/src/main/res/values/strings.xml +++ b/module2/src/main/res/values/strings.xml @@ -11,4 +11,5 @@ 拓展 App 瞎推荐 + 小专栏