加入新资源

HeYongRui · Sep 25, 2019 · ab0c8d2 · ab0c8d2
1 parent 903fbc3
commit ab0c8d2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 0 deletions.
diff --git 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<String> permissionsDeniedForever, List<String> 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
@@ -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<FloatingDto> 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
diff --git a/main/src/main/res/drawable-xhdpi/ic_weavesilk.png b/main/src/main/res/drawable-xhdpi/ic_weavesilk.png
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
@@ -53,4 +53,6 @@
     <string name="garbage_classify_query">垃圾分类查询</string>
     <string name="artificial_intelligence">人工智障</string>
     <string name="music_search">音乐搜索</string>
+    <string name="weavesilk">炫光</string>
+    <string name="literature_chronicle_map">唐宋文学编年地图</string>
 </resources>
diff --git 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<GankMenuDto> 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
diff --git a/module2/src/main/res/values/strings.xml b/module2/src/main/res/values/strings.xml
@@ -11,4 +11,5 @@
     <string name="expand">拓展</string>
     <string name="app">App</string>
     <string name="blind_recommend">瞎推荐</string>
+    <string name="xiaozhuanlan">小专栏</string>
 </resources>