channel auto add

86d78afc · 门心叼龙 · eda8a292 · 86d78afc · 86d78afc · 86d78afc
53 changed file
--- a/.gradle/4.6/fileHashes/fileHashes.bin
+++ b/.gradle/4.6/fileHashes/fileHashes.bin
--- a/.gradle/4.6/fileHashes/fileHashes.lock
+++ b/.gradle/4.6/fileHashes/fileHashes.lock
--- a/.gradle/4.6/fileHashes/resourceHashesCache.bin
+++ b/.gradle/4.6/fileHashes/resourceHashesCache.bin
--- a/.gradle/4.6/javaCompile/classAnalysis.bin
+++ b/.gradle/4.6/javaCompile/classAnalysis.bin
--- a/.gradle/4.6/javaCompile/jarAnalysis.bin
+++ b/.gradle/4.6/javaCompile/jarAnalysis.bin
--- a/.gradle/4.6/javaCompile/javaCompile.lock
+++ b/.gradle/4.6/javaCompile/javaCompile.lock
--- a/.gradle/4.6/javaCompile/taskHistory.bin
+++ b/.gradle/4.6/javaCompile/taskHistory.bin
--- a/.gradle/4.6/javaCompile/taskJars.bin
+++ b/.gradle/4.6/javaCompile/taskJars.bin
--- a/.gradle/4.6/taskHistory/taskHistory.bin
+++ b/.gradle/4.6/taskHistory/taskHistory.bin
--- a/.gradle/4.6/taskHistory/taskHistory.lock
+++ b/.gradle/4.6/taskHistory/taskHistory.lock
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/lib_common/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
+++ b/lib_common/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
@@ -1631,7 +1631,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/lib_common/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/lib_common/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
-#Tue May 28 14:27:48 CST 2019
+#Tue May 28 18:38:45 CST 2019
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape14.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape14.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\ic_network.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_network.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape52.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape52.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\callback_white_icon.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\callback_white_icon.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher_round.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape41.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape41.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\raw\\channel=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\channel
 D\:\\FlyTour\\lib_common\\build\\generated\\res\\pngs\\debug\\drawable-hdpi\\ic_launcher_background.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_launcher_background.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\raw\\channel=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\channel
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\view_trans_loading.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\view_trans_loading.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape19.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape19.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape57.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape57.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\rotate_progress_front_bg.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\rotate_progress_front_bg.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape30.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape30.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\expend_btn.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\expend_btn.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\raw\\news_detail1=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\news_detail1
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\empty_pic_nocar.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\empty_pic_nocar.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape46.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape46.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape4.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape4.png
@@ -68,6 +69,8 @@ D\:\\FlyTour\\lib_common\\build\\generated\\res\\pngs\\debug\\drawable-mdpi\\ic_
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape49.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape49.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape22.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape22.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape60.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape60.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\raw\\news_detail=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\news_detail
+D\:\\FlyTour\\lib_common\\src\\main\\res\\raw\\news_type=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\news_type
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape38.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape38.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape7.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape7.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape11.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape11.png
@@ -82,40 +85,40 @@ D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape43.png=D\
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable\\btn_back_menu.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable\\btn_back_menu.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\common_toolbar.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\common_toolbar.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape59.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape59.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape32.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape32.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape1.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape1.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape32.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape32.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape48.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape48.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape21.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape21.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\fragment_common_dialog.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\fragment_common_dialog.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\button_network_err.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\button_network_err.xml
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\navbar_icon_return.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\navbar_icon_return.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape37.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape37.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape6.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape6.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape37.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape37.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\navbar_icon_return.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\navbar_icon_return.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape10.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape10.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\navbar_icon_add.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\navbar_icon_add.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape26.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape26.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\stub_no_car.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\stub_no_car.xml
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape26.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape26.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape64.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape64.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\activity_root.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\activity_root.xml
-D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\rotate_progress_dialog_layout.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\rotate_progress_dialog_layout.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\navbar_icon_notice.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\navbar_icon_notice.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\rotate_progress_dialog_layout.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\rotate_progress_dialog_layout.xml
+D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\activity_root.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\activity_root.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape15.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape15.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape53.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape53.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape42.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape42.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\usecar_icon_star.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\usecar_icon_star.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable\\shape_round_blue.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_round_blue.xml
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\usecar_icon_star.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\usecar_icon_star.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\ic_menu_back_dark.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_menu_back_dark.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape58.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape58.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape31.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape31.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable\\loading_bg.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable\\loading_bg.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape0.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape0.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable\\loading_bg.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable\\loading_bg.xml
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape31.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape31.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape47.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape47.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape20.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape20.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape36.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape36.png
-D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape5.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape5.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable\\bg_dialog_fragment_bg.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable\\bg_dialog_fragment_bg.xml
-D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\stub_init_loading.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\stub_init_loading.xml
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape5.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape5.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape36.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape36.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\mipmap-xhdpi\\default_ptr_rotate.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\default_ptr_rotate.png
+D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\stub_init_loading.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\stub_init_loading.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\layout\\stub_no_data.xml=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\layout\\stub_no_data.xml
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape25.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape25.png
 D\:\\FlyTour\\lib_common\\src\\main\\res\\drawable-xhdpi\\loading_shape63.png=D\:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape63.png

--- a/lib_common/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/lib_common/build/intermediates/incremental/packageDebugResources/merger.xml
@@ -65,7 +65,7 @@
    </style><style name="AppTheme.BackBar" parent="AppTheme">
        <item name="navigationIcon">@drawable/navbar_icon_return</item>
        <item name="toolbarStyle">@style/NoSpaceActionBarTheme</item>
-    </style></file><file name="usecar_list_icon_into" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\usecar_list_icon_into.png" qualifiers="xhdpi-v4" type="drawable"/><file name="view_setting_bar" path="D:\FlyTour\lib_common\src\main\res\layout\view_setting_bar.xml" qualifiers="" type="layout"/><file name="usecar_icon_star" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\usecar_icon_star.png" qualifiers="xhdpi-v4" type="drawable"/><file name="shape_btn_blue_bg" path="D:\FlyTour\lib_common\src\main\res\drawable\shape_btn_blue_bg.xml" qualifiers="" type="drawable"/><file name="callback_white_icon" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\callback_white_icon.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_return" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_return.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_add" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_add.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_close" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_close.png" qualifiers="xhdpi-v4" type="drawable"/><file name="menu_toolbar_add" path="D:\FlyTour\lib_common\src\main\res\menu\menu_toolbar_add.xml" qualifiers="" type="menu"/><file name="navbar_icon_notice" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_notice.png" qualifiers="xhdpi-v4" type="drawable"/><file name="fragment_common_dialog" path="D:\FlyTour\lib_common\src\main\res\layout\fragment_common_dialog.xml" qualifiers="" type="layout"/><file name="bg_dialog_fragment_bg" path="D:\FlyTour\lib_common\src\main\res\drawable\bg_dialog_fragment_bg.xml" qualifiers="" type="drawable"/><file name="channel" path="D:\FlyTour\lib_common\src\main\res\raw\channel" qualifiers="" type="raw"/></source><source path="D:\FlyTour\lib_common\build\generated\res\rs\debug"/><source path="D:\FlyTour\lib_common\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\lib_common\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\lib_common\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SettingBarView">
+    </style></file><file name="usecar_list_icon_into" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\usecar_list_icon_into.png" qualifiers="xhdpi-v4" type="drawable"/><file name="view_setting_bar" path="D:\FlyTour\lib_common\src\main\res\layout\view_setting_bar.xml" qualifiers="" type="layout"/><file name="usecar_icon_star" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\usecar_icon_star.png" qualifiers="xhdpi-v4" type="drawable"/><file name="shape_btn_blue_bg" path="D:\FlyTour\lib_common\src\main\res\drawable\shape_btn_blue_bg.xml" qualifiers="" type="drawable"/><file name="callback_white_icon" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\callback_white_icon.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_return" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_return.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_add" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_add.png" qualifiers="xhdpi-v4" type="drawable"/><file name="navbar_icon_close" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_close.png" qualifiers="xhdpi-v4" type="drawable"/><file name="menu_toolbar_add" path="D:\FlyTour\lib_common\src\main\res\menu\menu_toolbar_add.xml" qualifiers="" type="menu"/><file name="navbar_icon_notice" path="D:\FlyTour\lib_common\src\main\res\drawable-xhdpi\navbar_icon_notice.png" qualifiers="xhdpi-v4" type="drawable"/><file name="fragment_common_dialog" path="D:\FlyTour\lib_common\src\main\res\layout\fragment_common_dialog.xml" qualifiers="" type="layout"/><file name="bg_dialog_fragment_bg" path="D:\FlyTour\lib_common\src\main\res\drawable\bg_dialog_fragment_bg.xml" qualifiers="" type="drawable"/><file name="news_detail" path="D:\FlyTour\lib_common\src\main\res\raw\news_detail" qualifiers="" type="raw"/><file name="news_type" path="D:\FlyTour\lib_common\src\main\res\raw\news_type" qualifiers="" type="raw"/></source><source path="D:\FlyTour\lib_common\build\generated\res\rs\debug"/><source path="D:\FlyTour\lib_common\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\lib_common\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\lib_common\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SettingBarView">
        <attr format="boolean" name="set_left_icon_visable"/>
        <attr format="reference" name="set_left_icon"/>
        <attr format="string" name="set_title"/>

--- a/lib_common/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/lib_common/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -1566,7 +1566,8 @@ mipmap reduce_btn
 mipmap rotate_process_success
 mipmap rotate_progress_back_bg
 mipmap rotate_progress_front_bg
-raw channel
+raw news_detail
+raw news_type
 string abc_action_bar_home_description
 string abc_action_bar_home_description_format
 string abc_action_bar_home_subtitle_description_format

--- a/lib_common/build/intermediates/symbols/debug/R.txt
+++ b/lib_common/build/intermediates/symbols/debug/R.txt
@@ -1565,7 +1565,8 @@ int mipmap reduce_btn 0x7f110008
 int mipmap rotate_process_success 0x7f110009
 int mipmap rotate_progress_back_bg 0x7f11000a
 int mipmap rotate_progress_front_bg 0x7f11000b
-int raw channel 0x7f140001
+int raw news_detail 0x7f140001
+int raw news_type 0x7f140002
 int string abc_action_bar_home_description 0x7f150001
 int string abc_action_bar_home_description_format 0x7f150002
 int string abc_action_bar_home_subtitle_description_format 0x7f150003

--- a/lib_common/src/main/java/com/fly/tour/common/manager/ChannelManager.java
+++ b/lib_common/src/main/java/com/fly/tour/common/manager/ChannelManager.java
@@ -4,7 +4,9 @@ import android.content.Context;

 import com.fly.tour.common.R;
 import com.fly.tour.common.util.log.KLog;
+import com.fly.tour.db.dao.NewsDetailDao;
 import com.fly.tour.db.dao.NewsTypeDao;
+import com.fly.tour.db.entity.NewsDetail;
 import com.fly.tour.db.entity.NewsType;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -16,57 +18,66 @@ import java.lang.reflect.Type;
 import java.util.List;

 /**
- * Description: <ChannelManager><br>
+ * Description: <NewsDBManager><br>
 * Author:      gxl<br>
 * Date:        2019/5/28<br>
 * Version:     V1.0.0<br>
 * Update:     <br>
 */
-public class ChannelManager {
-    public static final String TAG = ChannelManager.class.getSimpleName();
-    private static ChannelManager channelManager;
+public class NewsDBManager {
+    public static final String TAG = NewsDBManager.class.getSimpleName();
+    private static NewsDBManager newsDBManager;
    private Context mContext;
    private List<NewsType> mListNewsType;

-    private ChannelManager(Context context) {
+    private NewsDBManager(Context context) {
        mContext = context;
    }

-    public static ChannelManager getInstance(Context context){
-        if(channelManager == null){
-            synchronized (ChannelManager.class){
-                if(channelManager == null){
-                    channelManager = new ChannelManager(context);
+    public static NewsDBManager getInstance(Context context) {
+        if (newsDBManager == null) {
+            synchronized (NewsDBManager.class) {
+                if (newsDBManager == null) {
+                    newsDBManager = new NewsDBManager(context);
                }
            }
        }
-        return channelManager;
+        return newsDBManager;
    }
-    public void initChannel(){
+
+    public void initNewsDB() {
        NewsTypeDao newsTypeDao = new NewsTypeDao(mContext);
-        mListNewsType = newsTypeDao.getListNewsType();
-        if(mListNewsType == null || mListNewsType.size() == 0){
-            InputStream inputStream = mContext.getResources().openRawResource(R.raw.channel);
-            InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder stringBuilder = new StringBuilder();
-            String line = null;
-            try {
-                while((line = bufferedReader.readLine()) != null){
-                    stringBuilder.append(line);
-                }
-                Gson gson = new Gson();
-                Type type = new TypeToken<List<NewsType>>() {
-                }.getType();
-                String json = stringBuilder.toString();
-                KLog.v(TAG,"newstype:"+json);
-                mListNewsType = gson.fromJson(json, type);
-                newsTypeDao.addListNewStype(mListNewsType);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        if (newsTypeDao.isEmpty()) {
+            Gson gson = new Gson();
+            Type type = new TypeToken<List<NewsType>>() {
+            }.getType();
+            mListNewsType = gson.fromJson(getStringByResId(R.raw.news_type), type);
+            newsTypeDao.addListNewStype(mListNewsType);
+        }
+        NewsDetailDao newsDetailDao = new NewsDetailDao(mContext);
+        if(newsDetailDao.isEmpty()){
+            Gson gson = new Gson();
+            Type type = new TypeToken<List<NewsDetail>>() {
+            }.getType();
+            List<NewsDetail> newsDetailList = gson.fromJson(getStringByResId(R.raw.news_detail), type);
+            newsDetailDao.addListNewsDetail(newsDetailList);
+        }
+    }

+    private String getStringByResId(int resid) {
+        InputStream inputStream = mContext.getResources().openRawResource(resid);
+        InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
+        BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+        StringBuilder stringBuilder = new StringBuilder();
+        String line = null;
+        try {
+            while ((line = bufferedReader.readLine()) != null) {
+                stringBuilder.append(line);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
        }
+        return stringBuilder.toString();
    }

    public List<NewsType> getListNewsType() {

--- a/lib_common/src/main/res/raw/channel
+++ b/lib_common/src/main/res/raw/channel
-[
- {typename:"移动开发"},
- {typename:"大数据"},
- {typename:"人工智能"},
- {typename:"区块链"},
- {typename:"架构"},
- {typename:"物联网"}
- ]
\ No newline at end of file
--- a/lib_common/src/main/res/raw/news_detail
+++ b/lib_common/src/main/res/raw/news_detail
+[
+ {typeid:0,title:"后移动互联网时代我的一些思考",content:"这篇文章本来是写在年前的，题目太大不好下手，加之年后公司上了一个新项目一直很忙，酝酿了好长时间，一直拖到了现在，今天也终于发表了，后移动时代我的一些思考，新时代下，我们不能只顾低头拉车，更要懂得抬头看路。就在半个多月前的2月15号，在滴滴年度员工大会上程维亲自宣布裁员2000人，而2月19号京东也宣布裁员10%的副总裁级别的高管，而就在昨天3月8日下午，熊猫直播在官方微博上宣布将关闭服务器，证实了此前有关熊猫直播倒闭的传言，等等这些消息只表明一个问题，移动互联网寒冬真的来了。其实从从去年开始一直就有各种消息爆出移动互联网行业的不景气，一些小公司由于投资方的撤资，资金链断裂，而导致的裁员、倒闭的情况，出现的就更早了"},
+ {typeid:0,title:"SpringCloud微服务架构在移动后端开发中的应用与研究",content:"年前我写了一篇文章：Android组件化方案最佳实践，主要介绍了Android客户端框架FlyTour的使用，工程的架构为组件化，模块编码架构为MVP,文章地址为：https://blog.csdn.net/geduo_83/article/details/86604852，有的网友说现在自己一个人在做一个Android的项目，自己不会后端开发，问现在有没有好点的后端开源的架子给推荐一下，就自己稍加修改就能上手用的那种，为此我在网上找了一圈儿，还真没发现有什么好的后端架子，也许是我还没有发现，能不能自己搭建一个通用的后台服务端的架子？我想也很有必要，记得《Android第一行代码》作者郭霖有一句很著名的话“当你在感叹，假如有这么一个东西就好了的时候，请注意，这是你的机会”，正式因为这句话，我决定自己搭建一套后端服务的架子，希望对有需要的同学有所帮助"},
+ {typeid:0,title:"浅谈单一结构体项目的组件化改造",content:"昨天晚上一年一度的315晚会又来了，今年虽然没有哪家大公司上榜，但是曝光了一些黑心小企业，我们平时用的塑料盆、塑料袋、孩子的塑料玩具有可能都是用医疗废弃物，如输液袋、输液管、一次性注射器、血袋等加工而成的，还有平日孩子们抢着买的辣条这种混合了十几中添加剂的垃圾食品的生产环境着实让人辣眼睛，我们无比惊叹这些企业为了金钱、利益没有一点道德底线，等待他们的将是法律的制裁。好了，我们言归正传，项目功能移植可以说在日常开发中很多时候都会遇到，把A项目中的几个功能移植到B项目当中，最近工作中就有这样一个需求，需要将公司的一个老项目的几个功能模块移植到新项目当中，一开始以为工作量不是很大，但是随着改造工作的深入，不得不改变原有的移植改造方案"},
+ {typeid:0,title:"开发杂谈：Android移动应用架构发展简史",content:"好了，我们言归正传，我们在前面几篇文章谈到了一些项目架构的问题，年前写了一篇“Android组件化最佳实践”，年后写了一篇“浅谈单一结构体项目的组件化改造”，我们提到了单一结构项目里，结构混乱，层次不清，有些模块同一功能解决方案不统一、有了新需求只是在原有项目上不断的砌代码罢了。长此以往，整个项目就是铁板一块，为后期的项目维护和扩展造成了极大的困难。我们在软件开发的时候，在做一个项目之前，架构师做工作就是搭项目框架，这是一个前提工作，给整个项目制定开发标准，开发规范，如果没有规范，项目可以搞起来吗？当然可以，就是个开发人员各行其是，最后的结果就是，项目做完了，整个项目结构混乱，层次不清。反之，一旦形成自己的一套框架体系，就可以长期使用，甚至成为整个公司的一套开发标准，大大提高后期的项目开发效率，来了新项目就直接可以在新项目中使用，而把主要的精力放在业务功能的实现上"},
+ {typeid:0,title:"Android事件分发机制的探索与发现之View篇",content:"关于Android事件传递机制的文章在前面也零零散散的写过两篇，当时也是时间有限，也没有过多的去完善匆匆就发出去了。因为Android事件分发机制是整个Android系统的难点也是重点，说它是难点是因为触摸事件的流转流程错综复杂，前一阵子在有个技术群里面很多人都说，事件分发这块自己也是学习了好多次，但是都是过一阵子，对事件的流转流程又忘了，记不住，学了又忘，忘了又学，出现这种情况就是对事件流转流程理解不深刻，对书上的流程图死记硬背导致的，有些书上甚至出现流程错误的问题，真是误人子弟。"}
+ ]
\ No newline at end of file
--- a/lib_common/src/main/res/raw/news_type
+++ b/lib_common/src/main/res/raw/news_type
+[
+ {id:0,typename:"移动开发"},
+ {id:1,typename:"大数据"},
+ {id:2,typename:"人工智能"},
+ {id:3,typename:"区块链"},
+ {id:4,typename:"架构"},
+ {id:5,typename:"物联网"}
+ ]
\ No newline at end of file
--- a/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java
+++ b/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java
@@ -2,10 +2,15 @@ package com.fly.tour.db.dao;

 import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

 import com.fly.tour.db.NewsDBConfig;
 import com.fly.tour.db.NewsDBHelper;
+import com.fly.tour.db.entity.NewsDetail;
+
+import java.util.ArrayList;
+import java.util.List;

 /**
 * Description: <NewsTypeDao><br>
@@ -21,14 +26,54 @@ public class NewsDetailDao {
        mDatabase = NewsDBHelper.getInstance(context).getReadableDatabase();
    }

-    public boolean addNewsDetail(int type,String title,String content) {
+    public boolean addNewsDetail(int type, String title, String content) {
        ContentValues values = new ContentValues();
        values.put(NewsDBConfig.NewsDetail.CLUMN_TYPE_ID, type);
        values.put(NewsDBConfig.NewsDetail.CLUMN_TITLE, title);
        values.put(NewsDBConfig.NewsDetail.CLUMN_CONTENT, content);
        return mDatabase.insert(NewsDBConfig.NewsDetail.TABLE_NAME, null, values) > 0;
    }
-    public boolean deleteNewsDetail(int id){
-       return mDatabase.delete(NewsDBConfig.NewsDetail.TABLE_NAME,"where id = ?",new String[]{id+""}) > 0;
+
+    public boolean deleteNewsDetail(int id) {
+        return mDatabase.delete(NewsDBConfig.NewsDetail.TABLE_NAME, "where id = ?", new String[]{id + ""}) > 0;
+    }
+
+    public List<NewsDetail> getListNewsByType(int type) {
+        List<NewsDetail> dataList = null;
+        String sql = "select " + NewsDBConfig.NewsDetail.CLUMN_ID + "," + NewsDBConfig.NewsDetail.CLUMN_TITLE + "," + NewsDBConfig.NewsDetail.CLUMN_CONTENT + "," + NewsDBConfig.NewsDetail.CLUMN_ADD_TIME + " from " + NewsDBConfig.NewsDetail.TABLE_NAME + " where " + NewsDBConfig.NewsDetail.CLUMN_TYPE_ID + " = " + type;
+        Cursor cursor = mDatabase.rawQuery(sql, null);
+        if (cursor != null && cursor.getCount() > 0) {
+            dataList = new ArrayList<>();
+            while (cursor.moveToNext()) {
+                NewsDetail detail = new NewsDetail();
+                detail.setId(cursor.getInt(0));
+                detail.setTitle(cursor.getString(1));
+                detail.setContent(cursor.getString(2));
+                detail.setAddtime(cursor.getString(3));
+                dataList.add(detail);
+            }
+        }
+        return dataList;
+    }
+
+    public boolean isEmpty() {
+        String sql = "select * from " + NewsDBConfig.NewsDetail.TABLE_NAME;
+        Cursor cursor = mDatabase.rawQuery(sql, null);
+        if (cursor != null && cursor.getCount() > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public void addListNewsDetail(List<NewsDetail> details) {
+        if (details != null && details.size() > 0) {
+            mDatabase.beginTransaction();
+            for (NewsDetail detail : details) {
+                addNewsDetail(detail.getTypeid(), detail.getTitle(), detail.getContent());
+            }
+            mDatabase.setTransactionSuccessful();
+            mDatabase.endTransaction();
+            mDatabase.close();
+        }
    }
 }
--- a/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java
+++ b/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java
@@ -56,8 +56,20 @@ public class NewsTypeDao {
        return typeList;
    }
    public void addListNewStype(List<NewsType> newsTypeList){
+        mDatabase.beginTransaction();
        for(NewsType type : newsTypeList){
            addNewsType(type.getTypename());
        }
+        mDatabase.setTransactionSuccessful();
+        mDatabase.endTransaction();
+        mDatabase.close();
+    }
+    public boolean isEmpty(){
+        String sql = "select * from "+NewsDBConfig.NewsType.TABLE_NAME;
+        Cursor cursor = mDatabase.rawQuery(sql, null);
+        if(cursor != null && cursor.getCount() > 0){
+            return false;
+        }
+        return true;
    }
 }
--- a/module_app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/module_app/build/intermediates/blame/res/debug/multi-v2/debug.json
 {
    "logs": [
        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-uk_values-uk.arsc.flat",
            "map": [
                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
-                        "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
-                        "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-uk\\values-uk.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
@@ -25,9 +15,19 @@
                    "to": {
                        "startLines": "30",
                        "startColumns": "4",
-                        "startOffsets": "2912",
+                        "startOffsets": "2900",
                        "endColumns": "100",
-                        "endOffsets": "3008"
+                        "endOffsets": "2996"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-uk\\values-uk.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
+                        "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
+                        "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
                    }
                }
            ]
@@ -65,10 +65,20 @@
            ]
        },
        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-uk_values-uk.arsc.flat",
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
            "map": [
                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-uk\\values-uk.xml",
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
+                        "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
+                        "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
                    "from": {
                        "startLines": "2",
                        "startColumns": "4",
@@ -79,19 +89,9 @@
                    "to": {
                        "startLines": "30",
                        "startColumns": "4",
-                        "startOffsets": "2900",
+                        "startOffsets": "2912",
                        "endColumns": "100",
-                        "endOffsets": "2996"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-uk\\values-uk.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
-                        "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
-                        "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
+                        "endOffsets": "3008"
                    }
                }
            ]
@@ -224,6 +224,21 @@
                }
            ]
        },
+        {
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "112",
+                        "endOffsets": "163"
+                    }
+                }
+            ]
+        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
            "map": [
@@ -256,21 +271,6 @@
                }
            ]
        },
-        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "112",
-                        "endOffsets": "163"
-                    }
-                }
-            ]
-        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-lv_values-lv.arsc.flat",
            "map": [
@@ -303,6 +303,21 @@
                }
            ]
        },
+        {
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-zh_values-zh.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\MultiImageSelector-1.2.aar\\5b0dc57011d3fb8d5ae5217abae81b4a\\res\\values-zh\\values-zh.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "55,102,161,217,265,325,378,438,493,554,624,708,753,796",
+                        "endColumns": "46,58,55,47,59,52,59,54,60,69,83,44,42,51",
+                        "endOffsets": "97,156,212,260,320,373,433,488,549,619,703,748,791,843"
+                    }
+                }
+            ]
+        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-af_values-af.arsc.flat",
            "map": [
@@ -335,21 +350,6 @@
                }
            ]
        },
-        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-zh_values-zh.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\MultiImageSelector-1.2.aar\\5b0dc57011d3fb8d5ae5217abae81b4a\\res\\values-zh\\values-zh.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "55,102,161,217,265,325,378,438,493,554,624,708,753,796",
-                        "endColumns": "46,58,55,47,59,52,59,54,60,69,83,44,42,51",
-                        "endOffsets": "97,156,212,260,320,373,433,488,549,619,703,748,791,843"
-                    }
-                }
-            ]
-        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-ro_values-ro.arsc.flat",
            "map": [
@@ -382,72 +382,6 @@
                }
            ]
        },
-        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-eu_values-eu.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-eu\\values-eu.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
-                        "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
-                        "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-eu\\values-eu.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
-                    },
-                    "to": {
-                        "startLines": "30",
-                        "startColumns": "4",
-                        "startOffsets": "2938",
-                        "endColumns": "100",
-                        "endOffsets": "3034"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9",
-                        "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "55,124,193,263,337,413,472,543",
-                        "endColumns": "68,68,69,73,75,58,70,67",
-                        "endOffsets": "119,188,258,332,408,467,538,606"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\ef064cd6e5b13eb240faa86782342caf\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,10,11,12",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "55,115,185,256,328,386,444,553,617,680",
-                        "endLines": "2,3,4,5,6,7,9,10,11,15",
-                        "endColumns": "59,69,70,71,57,57,10,63,62,10",
-                        "endOffsets": "110,180,251,323,381,439,548,612,675,847"
-                    },
-                    "to": {
-                        "startLines": "10,11,12,13,14,15,16,18,19,20",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "611,671,741,812,884,942,1000,1109,1173,1236",
-                        "endLines": "10,11,12,13,14,15,17,18,19,23",
-                        "endColumns": "59,69,70,71,57,57,10,63,62,10",
-                        "endOffsets": "666,736,807,879,937,995,1104,1168,1231,1403"
-                    }
-                }
-            ]
-        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-v21_values-v21.arsc.flat",
            "map": [
@@ -529,6 +463,72 @@
                }
            ]
        },
+        {
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9",
+                        "startColumns": "4,4,4,4,4,4,4,4",
+                        "startOffsets": "55,124,193,263,337,413,472,543",
+                        "endColumns": "68,68,69,73,75,58,70,67",
+                        "endOffsets": "119,188,258,332,408,467,538,606"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\ef064cd6e5b13eb240faa86782342caf\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,10,11,12",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "55,115,185,256,328,386,444,553,617,680",
+                        "endLines": "2,3,4,5,6,7,9,10,11,15",
+                        "endColumns": "59,69,70,71,57,57,10,63,62,10",
+                        "endOffsets": "110,180,251,323,381,439,548,612,675,847"
+                    },
+                    "to": {
+                        "startLines": "10,11,12,13,14,15,16,18,19,20",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "611,671,741,812,884,942,1000,1109,1173,1236",
+                        "endLines": "10,11,12,13,14,15,17,18,19,23",
+                        "endColumns": "59,69,70,71,57,57,10,63,62,10",
+                        "endOffsets": "666,736,807,879,937,995,1104,1168,1231,1403"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-eu_values-eu.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\values-eu\\values-eu.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
+                        "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
+                        "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\fc175a156c14e3e26b1fcc721f99af74\\res\\values-eu\\values-eu.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "100",
+                        "endOffsets": "151"
+                    },
+                    "to": {
+                        "startLines": "30",
+                        "startColumns": "4",
+                        "startOffsets": "2938",
+                        "endColumns": "100",
+                        "endOffsets": "3034"
+                    }
+                }
+            ]
+        },
        {
            "outputFile": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\values-night-v8_values-night-v8.arsc.flat",
            "map": [

--- a/module_app/build/intermediates/blame/res/debug/single/debug.json
+++ b/module_app/build/intermediates/blame/res/debug/single/debug.json
@@ -16,16 +16,16 @@
        "source": "D:\\FlyTour\\module_news\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\record_icon_start.png"
    },
    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable_tooltip_frame_dark.xml.flat",
-        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable\\tooltip_frame_dark.xml"
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat",
+        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png"
    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_design_password_eye.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\ef064cd6e5b13eb240faa86782342caf\\res\\drawable-v21\\design_password_eye.xml"
    },
    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat",
-        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png"
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable_tooltip_frame_dark.xml.flat",
+        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable\\tooltip_frame_dark.xml"
    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_star_black_36dp.png.flat",
@@ -131,6 +131,10 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_in_bottom.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\anim\\abc_slide_in_bottom.xml"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\raw_news_detail.flat",
+        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\news_detail"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi_ic_launcher_background.png.flat",
        "source": "D:\\FlyTour\\module_app\\build\\generated\\res\\pngs\\debug\\drawable-mdpi\\ic_launcher_background.png"
@@ -151,14 +155,14 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_cab_background_internal_bg.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable\\abc_cab_background_internal_bg.xml"
    },
-    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_ic_launcher_background.png.flat",
-        "source": "D:\\FlyTour\\module_app\\build\\generated\\res\\pngs\\debug\\drawable-xhdpi\\ic_launcher_background.png"
-    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_design_ic_visibility_off.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\ef064cd6e5b13eb240faa86782342caf\\res\\drawable-hdpi-v4\\design_ic_visibility_off.png"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi_ic_launcher_background.png.flat",
+        "source": "D:\\FlyTour\\module_app\\build\\generated\\res\\pngs\\debug\\drawable-xhdpi\\ic_launcher_background.png"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_half_black_48dp.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_48dp.png"
@@ -179,26 +183,26 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-hdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png"
    },
-    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat",
-        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png"
-    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat",
        "source": "D:\\FlyTour\\module_app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png"
    },
    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat",
-        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png"
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat",
+        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png"
    },
    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_loading_shape2.png.flat",
-        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape2.png"
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat",
+        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png"
    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_loading_shape2.png.flat",
+        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\loading_shape2.png"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png"
@@ -1099,6 +1103,10 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_news_list.xml.flat",
+        "source": "D:\\FlyTour\\module_news\\build\\intermediates\\packaged_res\\debug\\layout\\fragment_news_list.xml"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_narrow_custom.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\e7ccba5fd75cbbd30a40bb4ff8d1e07d\\res\\layout\\notification_template_big_media_narrow_custom.xml"
@@ -1107,10 +1115,6 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_chip_ripple_color.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\ef064cd6e5b13eb240faa86782342caf\\res\\color\\mtrl_chip_ripple_color.xml"
    },
-    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_news_list.xml.flat",
-        "source": "D:\\FlyTour\\module_news\\build\\intermediates\\packaged_res\\debug\\layout\\fragment_news_list.xml"
-    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_16dp.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_16dp.png"
@@ -1779,6 +1783,10 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\layout_item_news_list.xml.flat",
+        "source": "D:\\FlyTour\\module_news\\build\\intermediates\\packaged_res\\debug\\layout\\item_news_list.xml"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi-v4_ic_menu_back_dark.png.flat",
        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_menu_back_dark.png"
@@ -2535,6 +2543,10 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\anim_abc_grow_fade_in_from_bottom.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\anim\\abc_grow_fade_in_from_bottom.xml"
    },
+    {
+        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\raw_news_type.flat",
+        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\news_type"
+    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_dialog_material_background.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-v21\\abc_dialog_material_background.xml"
@@ -2651,10 +2663,6 @@
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_list_selector_holo_light.xml.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable\\abc_list_selector_holo_light.xml"
    },
-    {
-        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\raw_channel.flat",
-        "source": "D:\\FlyTour\\lib_common\\build\\intermediates\\packaged_res\\debug\\raw\\channel"
-    },
    {
        "merged": "D:\\FlyTour\\module_app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat",
        "source": "C:\\Users\\gxl\\.m2\\repository\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\5a784d472a15819f333175cdebd741e3\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png"

--- a/module_app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/module_app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
--- a/module_app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/module_app/build/intermediates/incremental/mergeDebugResources/merger.xml
--- a/module_app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
+++ b/module_app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
--- a/module_app/src/main/java/com/fly/tour/MyApplication.java
+++ b/module_app/src/main/java/com/fly/tour/MyApplication.java
 package com.fly.tour;

 import com.fly.tour.common.BaseApplication;
-import com.fly.tour.common.manager.ChannelManager;
+import com.fly.tour.common.manager.NewsDBManager;

 /**
 * Description: <MyApplication><br>
@@ -14,6 +14,6 @@ public class MyApplication extends BaseApplication {
    @Override
    public void onCreate() {
        super.onCreate();
-        ChannelManager.getInstance(this).initChannel();
+        NewsDBManager.getInstance(this).initNewsDB();
    }
 }
--- a/module_find/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
+++ b/module_find/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
@@ -1631,7 +1631,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_find/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/find/R.java
+++ b/module_find/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/find/R.java
@@ -1635,7 +1635,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_find/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/module_find/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -1570,7 +1570,8 @@ mipmap reduce_btn
 mipmap rotate_process_success
 mipmap rotate_progress_back_bg
 mipmap rotate_progress_front_bg
-raw channel
+raw news_detail
+raw news_type
 string abc_action_bar_home_description
 string abc_action_bar_home_description_format
 string abc_action_bar_home_subtitle_description_format

--- a/module_find/build/intermediates/symbols/debug/R.txt
+++ b/module_find/build/intermediates/symbols/debug/R.txt
@@ -1569,7 +1569,8 @@ int mipmap reduce_btn 0x7f110008
 int mipmap rotate_process_success 0x7f110009
 int mipmap rotate_progress_back_bg 0x7f11000a
 int mipmap rotate_progress_front_bg 0x7f11000b
-int raw channel 0x7f140001
+int raw news_detail 0x7f140001
+int raw news_type 0x7f140002
 int string abc_action_bar_home_description 0x7f150001
 int string abc_action_bar_home_description_format 0x7f150002
 int string abc_action_bar_home_subtitle_description_format 0x7f150003

--- a/module_main/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
+++ b/module_main/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
@@ -1631,7 +1631,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_main/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/main/R.java
+++ b/module_main/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/main/R.java
@@ -1650,7 +1650,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_main/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/module_main/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
-#Tue May 28 09:26:42 CST 2019
-D\:\\FlyTour\\module_main\\src\\main\\res\\layout\\activity_splash.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\layout\\activity_splash.xml
+#Tue May 28 17:49:11 CST 2019
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher_round.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher_round.xml
+D\:\\FlyTour\\module_main\\src\\main\\res\\layout\\activity_splash.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\layout\\activity_splash.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher_round.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\tabbar_icon_my_select.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\tabbar_icon_my_select.png
@@ -14,14 +14,14 @@ D\:\\FlyTour\\module_main\\src\\main\\res\\drawable\\ic_bottom_my.xml=D\:\\FlyTo
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_launcher_round.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\tabbar_icon_find_select.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\tabbar_icon_find_select.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\tabbar_icon_trip_normal.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\tabbar_icon_trip_normal.png
-D\:\\FlyTour\\module_main\\src\\main\\res\\drawable\\ic_bottom_trip.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_bottom_trip.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\color\\color_state_menu_navi.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\color\\color_state_menu_navi.xml
-D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\tabbar_icon_find_normal.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\tabbar_icon_find_normal.png
+D\:\\FlyTour\\module_main\\src\\main\\res\\drawable\\ic_bottom_trip.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_bottom_trip.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher.png
+D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\tabbar_icon_find_normal.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\tabbar_icon_find_normal.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\drawable-v24\\ic_launcher_foreground.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\drawable-v24\\ic_launcher_foreground.xml
-D\:\\FlyTour\\module_main\\src\\main\\res\\drawable\\ic_bottom_discover.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_bottom_discover.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher_round.png
+D\:\\FlyTour\\module_main\\src\\main\\res\\drawable\\ic_bottom_discover.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_bottom_discover.xml
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher.png
-D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher_round.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher.png
+D\:\\FlyTour\\module_main\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher_round.png
 D\:\\FlyTour\\module_main\\src\\main\\res\\layout\\activity_main.xml=D\:\\FlyTour\\module_main\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
--- a/module_main/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/module_main/build/intermediates/incremental/packageDebugResources/merger.xml
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\main\res"/><source path="D:\FlyTour\module_main\build\generated\res\rs\debug"/><source path="D:\FlyTour\module_main\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\main\res"><file name="color_state_menu_navi" path="D:\FlyTour\module_main\src\main\res\color\color_state_menu_navi.xml" qualifiers="" type="color"/><file name="ic_bottom_discover" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_discover.xml" qualifiers="" type="drawable"/><file name="ic_bottom_my" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_my.xml" qualifiers="" type="drawable"/><file name="ic_bottom_trip" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_trip.xml" qualifiers="" type="drawable"/><file name="ic_launcher_foreground" path="D:\FlyTour\module_main\src\main\res\drawable-v24\ic_launcher_foreground.xml" qualifiers="v24" type="drawable"/><file name="activity_main" path="D:\FlyTour\module_main\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="menu_navigation" path="D:\FlyTour\module_main\src\main\res\menu\menu_navigation.xml" qualifiers="" type="menu"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-anydpi-v26\ic_launcher.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-anydpi-v26\ic_launcher_round.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-hdpi\ic_launcher_round.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-mdpi\ic_launcher_round.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\ic_launcher_round.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_find_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_find_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_find_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_find_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_my_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_my_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_my_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_my_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_trip_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_trip_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_trip_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_trip_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xxhdpi\ic_launcher_round.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xxxhdpi\ic_launcher_round.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="D:\FlyTour\module_main\src\main\res\values\colors.xml" qualifiers=""/><file path="D:\FlyTour\module_main\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">module_main</string><string name="title_news">新闻</string><string name="title_find">发现</string><string name="title_my">我的</string></file><file path="D:\FlyTour\module_main\src\main\res\values\styles.xml" qualifiers=""/><file name="activity_splash" path="D:\FlyTour\module_main\src\main\res\layout\activity_splash.xml" qualifiers="" type="layout"/></source><source path="D:\FlyTour\module_main\build\generated\res\rs\debug"/><source path="D:\FlyTour\module_main\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\main\res"/><source path="D:\FlyTour\module_main\build\generated\res\rs\debug"/><source path="D:\FlyTour\module_main\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\main\res"><file name="color_state_menu_navi" path="D:\FlyTour\module_main\src\main\res\color\color_state_menu_navi.xml" qualifiers="" type="color"/><file name="ic_bottom_discover" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_discover.xml" qualifiers="" type="drawable"/><file name="ic_bottom_my" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_my.xml" qualifiers="" type="drawable"/><file name="ic_bottom_trip" path="D:\FlyTour\module_main\src\main\res\drawable\ic_bottom_trip.xml" qualifiers="" type="drawable"/><file name="ic_launcher_foreground" path="D:\FlyTour\module_main\src\main\res\drawable-v24\ic_launcher_foreground.xml" qualifiers="v24" type="drawable"/><file name="activity_main" path="D:\FlyTour\module_main\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="activity_splash" path="D:\FlyTour\module_main\src\main\res\layout\activity_splash.xml" qualifiers="" type="layout"/><file name="menu_navigation" path="D:\FlyTour\module_main\src\main\res\menu\menu_navigation.xml" qualifiers="" type="menu"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-anydpi-v26\ic_launcher.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-anydpi-v26\ic_launcher_round.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-hdpi\ic_launcher_round.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-mdpi\ic_launcher_round.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\ic_launcher_round.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_find_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_find_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_find_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_find_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_my_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_my_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_my_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_my_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_trip_normal" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_trip_normal.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="tabbar_icon_trip_select" path="D:\FlyTour\module_main\src\main\res\mipmap-xhdpi\tabbar_icon_trip_select.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xxhdpi\ic_launcher_round.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\FlyTour\module_main\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="D:\FlyTour\module_main\src\main\res\mipmap-xxxhdpi\ic_launcher_round.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="D:\FlyTour\module_main\src\main\res\values\colors.xml" qualifiers=""/><file path="D:\FlyTour\module_main\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">module_main</string><string name="title_news">新闻</string><string name="title_find">发现</string><string name="title_my">我的</string></file><file path="D:\FlyTour\module_main\src\main\res\values\styles.xml" qualifiers=""/></source><source path="D:\FlyTour\module_main\build\generated\res\rs\debug"/><source path="D:\FlyTour\module_main\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\FlyTour\module_main\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
--- a/module_main/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/module_main/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -1585,7 +1585,8 @@ mipmap tabbar_icon_my_normal
 mipmap tabbar_icon_my_select
 mipmap tabbar_icon_trip_normal
 mipmap tabbar_icon_trip_select
-raw channel
+raw news_detail
+raw news_type
 string abc_action_bar_home_description
 string abc_action_bar_home_description_format
 string abc_action_bar_home_subtitle_description_format

--- a/module_main/build/intermediates/symbols/debug/R.txt
+++ b/module_main/build/intermediates/symbols/debug/R.txt
@@ -1584,7 +1584,8 @@ int mipmap tabbar_icon_my_normal 0x7f11000e
 int mipmap tabbar_icon_my_select 0x7f11000f
 int mipmap tabbar_icon_trip_normal 0x7f110010
 int mipmap tabbar_icon_trip_select 0x7f110011
-int raw channel 0x7f140001
+int raw news_detail 0x7f140001
+int raw news_type 0x7f140002
 int string abc_action_bar_home_description 0x7f150001
 int string abc_action_bar_home_description_format 0x7f150002
 int string abc_action_bar_home_subtitle_description_format 0x7f150003

--- a/module_main/src/main/java/com/fly/tour/main/MainActivity.java
+++ b/module_main/src/main/java/com/fly/tour/main/MainActivity.java
@@ -10,6 +10,7 @@ import android.view.MenuItem;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.fly.tour.common.base.BaseActivity;
+import com.fly.tour.common.manager.NewsDBManager;
 import com.fly.tour.common.provider.IFindProvider;
 import com.fly.tour.common.provider.IMeProvider;
 import com.fly.tour.common.provider.INewsProvider;
@@ -39,6 +40,7 @@ public class MainActivity extends BaseActivity {

    @Override
    public void initView() {
+
        BottomNavigationView navigation = findViewById(R.id.navigation);
        navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
            @Override

--- a/module_me/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
+++ b/module_me/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/common/R.java
@@ -1631,7 +1631,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_me/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/me/R.java
+++ b/module_me/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/fly/tour/me/R.java
@@ -1657,7 +1657,8 @@ public final class R {
    public static final class raw {
        private raw() {}

-        public static int channel = 0x7f140001;
+        public static int news_detail = 0x7f140001;
+        public static int news_type = 0x7f140002;
    }
    public static final class string {
        private string() {}

--- a/module_me/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/module_me/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -1592,7 +1592,8 @@ mipmap reduce_btn
 mipmap rotate_process_success
 mipmap rotate_progress_back_bg
 mipmap rotate_progress_front_bg
-raw channel
+raw news_detail
+raw news_type
 string abc_action_bar_home_description
 string abc_action_bar_home_description_format
 string abc_action_bar_home_subtitle_description_format

--- a/module_me/build/intermediates/symbols/debug/R.txt
+++ b/module_me/build/intermediates/symbols/debug/R.txt
@@ -1591,7 +1591,8 @@ int mipmap reduce_btn 0x7f110008
 int mipmap rotate_process_success 0x7f110009
 int mipmap rotate_progress_back_bg 0x7f11000a
 int mipmap rotate_progress_front_bg 0x7f11000b
-int raw channel 0x7f140001
+int raw news_detail 0x7f140001
+int raw news_type 0x7f140002
 int string abc_action_bar_home_description 0x7f150001
 int string abc_action_bar_home_description_format 0x7f150002
 int string abc_action_bar_home_subtitle_description_format 0x7f150003

--- a/module_news/src/main/java/com/fly/tour/news/adapter/NewsListAdatper.java
+++ b/module_news/src/main/java/com/fly/tour/news/adapter/NewsListAdatper.java
+package com.fly.tour.news.adapter;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+import com.fly.tour.common.base.BaseAdapter;
+import com.fly.tour.db.NewsDBConfig;
+import com.fly.tour.db.entity.NewsDetail;
+import com.fly.tour.trip.R;
+
+/**
+ * Description: <NewsListAdatper><br>
+ * Author:      gxl<br>
+ * Date:        2019/5/28<br>
+ * Version:     V1.0.0<br>
+ * Update:     <br>
+ */
+public class NewsListAdatper extends BaseAdapter<NewsDetail, NewsListAdatper.MyViewHolder> {
+    public NewsListAdatper(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int onBindLayout() {
+        return R.layout.item_news_list;
+    }
+
+    @Override
+    protected MyViewHolder onCreateHolder(View view) {
+        return new MyViewHolder(view);
+    }
+
+    @Override
+    protected void onBindData(MyViewHolder holder, NewsDetail newsDetail, int positon) {
+        holder.txtNewsDetailIdValue.setText(newsDetail.getId() + "");
+        holder.txtNewsDetailTitleValue.setText(newsDetail.getTitle());
+        holder.txtNewsDetailContentValue.setText(newsDetail.getContent());
+        holder.txtNewsDetailAddtimeValue.setText(newsDetail.getAddtime());
+    }
+
+    class MyViewHolder extends RecyclerView.ViewHolder {
+        TextView txtNewsDetailIdValue;
+        TextView txtNewsDetailTitleValue;
+        TextView txtNewsDetailContentValue;
+        TextView txtNewsDetailAddtimeValue;
+
+        public MyViewHolder(@NonNull View itemView) {
+            super(itemView);
+            txtNewsDetailIdValue = itemView.findViewById(R.id.txt_news_detail_id_value);
+            txtNewsDetailTitleValue = itemView.findViewById(R.id.txt_news_detail_title_value);
+            txtNewsDetailContentValue = itemView.findViewById(R.id.txt_news_detail_content_value);
+            txtNewsDetailAddtimeValue = itemView.findViewById(R.id.txt_news_detail_addtime_value);
+        }
+    }
+}
--- a/module_news/src/main/java/com/fly/tour/news/contract/NewsListContract.java
+++ b/module_news/src/main/java/com/fly/tour/news/contract/NewsListContract.java
+package com.fly.tour.news.contract;
+
+import com.fly.tour.common.mvp.BaseRefreshView;
+import com.fly.tour.common.mvp.BaseView;
+import com.fly.tour.db.entity.NewsDetail;
+import com.fly.tour.db.entity.NewsType;
+
+import java.util.List;
+
+/**
+ * Description: <NewsListContract><br>
+ * Author:      gxl<br>
+ * Date:        2019/5/28<br>
+ * Version:     V1.0.0<br>
+ * Update:     <br>
+ */
+public interface NewsListContract {
+    interface Presenter{
+    }
+    interface View<NewsDetail> extends BaseRefreshView<NewsDetail> {}
+    interface Model{
+        List<NewsDetail> getNewsType(int type);
+    }
+}
--- a/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java
+++ b/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java
@@ -7,7 +7,7 @@ import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 import com.fly.tour.common.base.BaseFragment;
-import com.fly.tour.common.manager.ChannelManager;
+import com.fly.tour.common.manager.NewsDBManager;
 import com.fly.tour.db.entity.NewsType;
 import com.fly.tour.trip.R;

@@ -25,7 +25,7 @@ public class MainNewsFragment extends BaseFragment {
    private List<String> titles = new ArrayList<>();
    private List<NewsListFragment> mArrayList = new ArrayList<NewsListFragment>() {
        {
-            List<NewsType> listNewsType = ChannelManager.getInstance(getContext()).getListNewsType();
+            List<NewsType> listNewsType = NewsDBManager.getInstance(getContext()).getListNewsType();
            if(listNewsType != null && listNewsType.size() > 0){
                for(int i = 0; i < listNewsType.size();i++){
                    NewsType newsType = listNewsType.get(i);

--- a/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java
+++ b/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java
@@ -3,13 +3,24 @@ package com.fly.tour.news.fragment;

 import android.content.Context;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;

 import com.fly.tour.common.base.BaseFragment;
+import com.fly.tour.common.base.BaseRefreshFragment;
 import com.fly.tour.common.event.KeyCode;
+import com.fly.tour.common.mvp.BaseRefreshPresenter;
+import com.fly.tour.db.entity.NewsDetail;
 import com.fly.tour.db.entity.NewsType;
+import com.fly.tour.news.adapter.NewsListAdatper;
+import com.fly.tour.news.contract.NewsListContract;
+import com.fly.tour.news.model.NewsListModel;
+import com.fly.tour.news.presenter.NewsListPresenter;
 import com.fly.tour.trip.R;

+import java.util.List;
+
 /**
 * Description: <人工智能><br>
 * Author:      gxl<br>
@@ -17,9 +28,11 @@ import com.fly.tour.trip.R;
 * Version:     V1.0.0<br>
 * Update:     <br>
 */
-public class NewsListFragment extends BaseFragment {
+public class NewsListFragment extends BaseRefreshFragment<NewsListModel,NewsListContract.View<NewsDetail>,NewsListPresenter,NewsDetail> implements NewsListContract.View<NewsDetail>{

    private NewsType mNewsType;
+    private RecyclerView mRecViewNewsDetail;
+    private NewsListAdatper mNewsListAdatper;

    public static NewsListFragment newInstance(NewsType newsType) {
        NewsListFragment newsListFragment = new NewsListFragment();
@@ -29,12 +42,7 @@ public class NewsListFragment extends BaseFragment {

        return newsListFragment;
    }
-    public String getFragmentTitle(){
-        if(mNewsType != null){

-        }
-        return null;
-    }
    @Override
    public void onAttach(Context context) {
        super.onAttach(context);
@@ -48,11 +56,16 @@ public class NewsListFragment extends BaseFragment {

    @Override
    public void initView(View view) {
-
+        mRecViewNewsDetail = view.findViewById(R.id.recview_news_list);
+        mRecViewNewsDetail.setLayoutManager(new LinearLayoutManager(mActivity));
+        mNewsListAdatper = new NewsListAdatper(mActivity);
+        mRecViewNewsDetail.setAdapter(mNewsListAdatper);
    }

    @Override
    public void initData() {
+        mPresenter.setNewsType(mNewsType.getId());
+        autoLoadData();

    }

@@ -60,4 +73,41 @@ public class NewsListFragment extends BaseFragment {
    public String getToolbarTitle() {
        return null;
    }
+
+    @Override
+    protected int onBindRreshLayout() {
+        return R.id.refview_news_list;
+    }
+
+    @Override
+    public NewsListPresenter initPresenter() {
+        return new NewsListPresenter(mActivity);
+    }
+
+
+
+    @Override
+    public void onRefreshEvent() {
+        mPresenter.refreshData();
+    }
+
+    @Override
+    public void onLoadMoreEvent() {
+        mPresenter.loadMoreData();
+    }
+
+    @Override
+    public void onAutoLoadEvent() {
+        mPresenter.refreshData();
+    }
+
+    @Override
+    public void refreshData(List<NewsDetail> data) {
+        mNewsListAdatper.refresh(data);
+    }
+
+    @Override
+    public void loadMoreData(List<NewsDetail> data) {
+        mNewsListAdatper.addAll(data);
+    }
 }
--- a/module_news/src/main/java/com/fly/tour/news/model/NewsListModel.java
+++ b/module_news/src/main/java/com/fly/tour/news/model/NewsListModel.java
+package com.fly.tour.news.model;
+
+import android.content.Context;
+
+import com.fly.tour.common.mvp.BaseModel;
+import com.fly.tour.db.NewsDBConfig;
+import com.fly.tour.db.dao.NewsDetailDao;
+import com.fly.tour.db.entity.NewsDetail;
+import com.fly.tour.db.entity.NewsType;
+import com.fly.tour.news.contract.NewsListContract;
+
+import java.util.List;
+
+/**
+ * Description: <NewsListModel><br>
+ * Author:      gxl<br>
+ * Date:        2019/5/28<br>
+ * Version:     V1.0.0<br>
+ * Update:     <br>
+ */
+public class NewsListModel extends BaseModel implements NewsListContract.Model {
+    private NewsDetailDao mDetailDao;
+    public NewsListModel(Context context) {
+        super(context);
+        mDetailDao = new NewsDetailDao(context);
+    }
+
+    @Override
+    public List<NewsDetail> getNewsType(int type) {
+        return mDetailDao.getListNewsByType(type);
+    }
+}
--- a/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java
+++ b/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java
+package com.fly.tour.news.presenter;
+
+import android.content.Context;
+import android.os.Handler;
+
+import com.fly.tour.common.mvp.BaseModel;
+import com.fly.tour.common.mvp.BaseRefreshPresenter;
+import com.fly.tour.common.util.NetUtil;
+import com.fly.tour.db.NewsDBConfig;
+import com.fly.tour.db.entity.NewsDetail;
+import com.fly.tour.news.contract.NewsListContract;
+import com.fly.tour.news.model.NewsListModel;
+
+import java.util.List;
+
+/**
+ * Description: <NewsListPresenter><br>
+ * Author:      gxl<br>
+ * Date:        2019/5/28<br>
+ * Version:     V1.0.0<br>
+ * Update:     <br>
+ */
+public class NewsListPresenter extends BaseRefreshPresenter<NewsListModel, NewsListContract.View<NewsDetail>, NewsDetail> implements NewsListContract.Presenter {
+    private int newsType = 0;
+
+    public NewsListPresenter(Context context) {
+        super(context);
+    }
+
+    @Override
+    public NewsListModel initModel() {
+        return new NewsListModel(mContext);
+    }
+
+
+    @Override
+    public void refreshData() {
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if(!NetUtil.checkNetToast()){
+                    mView.showNetWorkErrView();
+                    return;
+                }
+                List<NewsDetail> datailList = mModel.getNewsType(newsType);
+                if(datailList != null && datailList.size() > 0){
+                    mView.refreshData(datailList);
+                }else{
+                    mView.showNoDataView();
+                }
+                mView.stopRefresh();
+
+            }
+        }, 1000 * 2);
+    }
+
+    @Override
+    public void loadMoreData() {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                List<NewsDetail> datailList = mModel.getNewsType(newsType);
+                mView.loadMoreData(datailList);
+                mView.stopLoadMore();
+
+            }
+        }, 1000 * 2);
+    }
+
+    public void setNewsType(int newsType) {
+        this.newsType = newsType;
+    }
+}
--- a/module_news/src/main/res/layout/fragment_news_list.xml
+++ b/module_news/src/main/res/layout/fragment_news_list.xml
@@ -4,6 +4,14 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">
-
+<com.refresh.lib.DaisyRefreshLayout
+    android:id="@+id/refview_news_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recview_news_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</com.refresh.lib.DaisyRefreshLayout>

 </LinearLayout>
\ No newline at end of file
--- a/module_news/src/main/res/layout/item_news_list.xml
+++ b/module_news/src/main/res/layout/item_news_list.xml
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginRight="12dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
+                                    app:cardCornerRadius="10dp"
+                                    app:cardElevation="3dp"
+                                    app:contentPaddingBottom="15dp"
+                                    app:contentPaddingLeft="10dp"
+                                    app:contentPaddingRight="10dp"
+                                    app:contentPaddingTop="15dp">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/txt_news_detail_id_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="ID"
+            android:textColor="#888888"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_id_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/txt_news_detail_id_key"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/txt_news_detail_id_key"
+            android:singleLine="true"
+            android:textColor="#222222"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_title_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/txt_news_detail_id_key"
+            android:layout_marginTop="4dp"
+            android:text="标题"
+            android:textColor="#888888"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_title_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/txt_news_detail_title_key"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/txt_news_detail_title_key"
+            android:singleLine="true"
+            android:textColor="#222222"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_content_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/txt_news_detail_title_value"
+            android:layout_marginTop="4dp"
+            android:text="内容详情"
+            android:textColor="#888888"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_content_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/txt_news_detail_content_key"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/txt_news_detail_content_key"
+            android:text="2019-02-27 17:00"
+            android:textColor="#222222"
+            android:singleLine="true"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_addtime_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/txt_news_detail_content_key"
+            android:layout_marginTop="4dp"
+            android:text="添加日期"
+            android:textColor="#888888"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/txt_news_detail_addtime_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/txt_news_detail_addtime_key"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/txt_news_detail_addtime_key"
+            android:text="2019-02-27 20:00"
+            android:textColor="#222222"
+            android:textSize="15sp" />
+
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file