增加消息model

app/src/main/AndroidManifest.xml

@@ -166,7 +166,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.MessageDetailActivity"
+            android:name="com.dayu.messagecenter.ui.activity.MessageDetailActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.SopWebViewActivity"

app/src/main/java/com/dayu/bigfish/api/APIService.java

@@ -10,7 +10,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
 import com.dayu.bigfish.bean.ErrorOrder;
 import com.dayu.bigfish.bean.KaAddress;
 import com.dayu.bigfish.bean.LogsticsInfo;
-import com.dayu.bigfish.bean.NewMessage;
+import com.dayu.messagecenter.data.protocol.NewMessage;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.bean.OrderPart;

app/src/main/java/com/dayu/bigfish/api/ApiFactory.java

@@ -8,7 +8,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
 import com.dayu.bigfish.bean.ErrorOrder;
 import com.dayu.bigfish.bean.KaAddress;
 import com.dayu.bigfish.bean.LogsticsInfo;
-import com.dayu.bigfish.bean.NewMessage;
+import com.dayu.messagecenter.data.protocol.NewMessage;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.bean.OrderPart;

app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java

@@ -14,7 +14,7 @@ import com.dayu.bigfish.bean.event.RefreshApoiment;
 import com.dayu.bigfish.bean.event.RefreshServe;
 import com.dayu.bigfish.bean.event.RefreshTab;
 import com.dayu.utils.UIUtils;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.utils.UtilsDate;
 import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
 
 import org.greenrobot.eventbus.EventBus;
@@ -29,9 +29,9 @@ import io.reactivex.disposables.Disposable;
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_DOING;
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.SUBCRIBE_TIME;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_DATE;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_DATE_FORMAT;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.LONG_DATE;
+import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 /**
  * Created by luofan

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -29,7 +29,7 @@ import com.dayu.bigfish.databinding.ActivityMainBinding;
 import com.dayu.bigfish.presenter.main.MainContract;
 import com.dayu.bigfish.presenter.main.MainPresenter;
 import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment;
-import com.dayu.bigfish.ui.fragment.HomeMessageFragment;
+import com.dayu.messagecenter.ui.fragment.HomeMessageFragment;
 import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
 import com.dayu.bigfish.ui.fragment.HomePersonFragment;
 import com.dayu.widgets.listener.onDownloadListener;

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java

@@ -18,7 +18,7 @@ import com.dayu.bigfish.ui.ProcessOrderActivity;
 import com.dayu.bigfish.ui.SopWebViewActivity;
 import com.dayu.bigfish.ui.SubcribeTimeActivity;
 import com.dayu.bigfish.utils.LocationUtils;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.utils.UtilsDate;
 import com.dayu.common.Constants;
 import com.dayu.utils.ProgressUtil;
 import com.umeng.analytics.MobclickAgent;
@@ -30,8 +30,8 @@ import java.util.Map;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
-import static com.dayu.bigfish.utils.UtilsDate.FORMAT_ONE;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 
 /**

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFourTabAdapter.java

@@ -7,10 +7,10 @@ import com.dayu.bigfish.R;
 import com.dayu.base.ui.adapter.CoreAdapter;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.databinding.FragmentOrderCancleItemBinding;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.utils.UtilsDate;
 
-import static com.dayu.bigfish.utils.UtilsDate.FORMAT_ONE;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 /**
  * 已取消列表的适配器

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderThreeTabAdapter.java

@@ -7,10 +7,10 @@ import com.dayu.bigfish.R;
 import com.dayu.base.ui.adapter.CoreAdapter;
 import com.dayu.bigfish.bean.ErrorOrder;
 import com.dayu.bigfish.databinding.FragmentOrderErrorItemBinding;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.utils.UtilsDate;
 
-import static com.dayu.bigfish.utils.UtilsDate.FORMAT_ONE;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 /**
  * 异常单列表的适配器

app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java

@@ -16,8 +16,8 @@ import com.dayu.bigfish.bean.event.RefreshTab;
 import com.dayu.bigfish.databinding.FragmentOrderHomeBinding;
 import com.dayu.bigfish.presenter.homeorder.HomeOrderContract;
 import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter;
-import com.dayu.bigfish.ui.adapter.FragmentAdapter;
-import com.dayu.bigfish.utils.TabLayoutUtils;
+import com.dayu.base.ui.adapter.FragmentAdapter;
+import com.dayu.utils.TabLayoutUtils;
 import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetailsServeFragment.java

@@ -7,7 +7,7 @@ import com.dayu.bigfish.R;
 import com.dayu.base.ui.fragment.DataBindingFragment;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.databinding.FragmentOrderServeBinding;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.utils.UtilsDate;
 import com.umeng.analytics.MobclickAgent;
 
 import java.text.ParseException;

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderPartFragment.java

@@ -8,8 +8,8 @@ import com.dayu.bigfish.R;
 import com.dayu.base.ui.fragment.DataBindingFragment;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.databinding.FragmentOrderPartBinding;
-import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
-import com.dayu.bigfish.utils.TabLayoutUtils;
+import com.dayu.base.ui.adapter.FragmentBaseAdapter;
+import com.dayu.utils.TabLayoutUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/res/layout/activity_order_details.xml

@@ -18,7 +18,7 @@
                 android:layout_gravity="center"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="25dp"
-                android:src="@mipmap/back_btn_normal" />
+                android:src="@drawable/back_btn_normal" />
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/activity_process_order.xml

@@ -262,7 +262,7 @@
                             android:textColor="@color/cl_home_title_text_color"
                             android:textSize="@dimen/sp_13.3" />
 
-                        <com.dayu.bigfish.ui.views.SwitchImage
+                        <com.dayu.widgets.SwitchImage
                             android:id="@+id/iv_switch"
                             chageButton="@{presenter.buttonState}"
                             android:layout_width="wrap_content"
@@ -271,7 +271,7 @@
                             android:layout_centerVertical="true"
                             android:layout_marginRight="@dimen/dp_14.3"
                             android:onClick="@{()->presenter.swtichButton()}"
-                            android:src="@mipmap/set_switch_off" />
+                            android:src="@drawable/set_switch_off" />
                     </RelativeLayout>
 
 

app/src/main/res/layout/activity_setting.xml

@@ -52,7 +52,7 @@
                     android:textColor="@color/cl_home_title_text_color"
                     android:textSize="14.7sp" />
 
-                <com.dayu.bigfish.ui.views.SwitchImage
+                <com.dayu.widgets.SwitchImage
                     android:id="@+id/set_message_switch"
                     chageButton="@{presenter.buttonState}"
                     android:layout_width="wrap_content"
@@ -61,7 +61,7 @@
                     android:layout_centerVertical="true"
                     android:layout_marginRight="@dimen/dp_16.7"
                     android:onClick="@{()->presenter.switchButton()}"
-                    android:src="@mipmap/set_switch_start" />
+                    android:src="@drawable/set_switch_start" />
 
             </RelativeLayout>
 

app/src/main/res/layout/message_adapter.xml

@@ -5,7 +5,7 @@
 
         <variable
             name="item"
-            type="com.dayu.bigfish.bean.NewMessage"/>
+            type="com.dayu.messagecenter.data.protocol.NewMessage"/>
     </data>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

app/src/main/res/values/styles.xml

@@ -22,66 +22,6 @@
         <attr name="border_color" format="color"/>
     </declare-styleable>
 
-    <style name="title">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/size_main_title</item>
-        <item name="android:background">@color/cl_white</item>
-    </style>
-
-    <style name="text_title">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_centerHorizontal">true</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/cl_home_title_text_color</item>
-        <item name="android:textSize">@dimen/size_text_title</item>
-    </style>
-
-    <style name="title_image_back">
-        <item name="android:layout_width">@dimen/dp_40</item>
-        <item name="android:layout_height">@dimen/dp_40</item>
-        <item name="android:src">@mipmap/back_btn_normal</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginLeft">@dimen/size_title_ml</item>
-        <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="title_right_image">
-        <item name="android:layout_width">@dimen/dp_30</item>
-        <item name="android:layout_height">@dimen/dp_30</item>
-        <item name="android:layout_marginRight">13.3dp</item>
-        <item name="android:layout_alignParentRight">true</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="title_right_text">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginRight">13.3dp</item>
-        <item name="android:layout_alignParentRight">true</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="card_line">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">6dp</item>
-        <item name="android:background">@drawable/line_shape</item>
-    </style>
-
-    <style name="line">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0.5dp</item>
-        <item name="android:background">@color/cl_order_item_line_bg</item>
-    </style>
-
-    <style name="TabLayoutTextStyle">
-        <item name="android:textSize">@dimen/sp_13.3</item>
-    </style>
-
     <!--<style name="Dialog" parent="@android:style/Theme.Holo.Dialog">-->
         <!--<item name="android:windowSoftInputMode">stateHidden|adjustResize</item>-->
         <!--&lt;!&ndash; 边框 &ndash;&gt;-->

app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentAdapter.java → baseLibrary/src/main/java/com/dayu/base/ui/adapter/FragmentAdapter.java

-package com.dayu.bigfish.ui.adapter;
+package com.dayu.base.ui.adapter;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentBaseAdapter.java → baseLibrary/src/main/java/com/dayu/base/ui/adapter/FragmentBaseAdapter.java

-package com.dayu.bigfish.ui.adapter;
+package com.dayu.base.ui.adapter;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

app/src/main/java/com/dayu/bigfish/utils/BindingUtils.java → baseLibrary/src/main/java/com/dayu/utils/BindingUtils.java

-package com.dayu.bigfish.utils;
+package com.dayu.utils;
 
 import android.databinding.BindingAdapter;
 import android.databinding.BindingConversion;
@@ -13,18 +13,17 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.dayu.base.api.protocol.BasePageBean;
 import com.dayu.base.ui.presenter.BaseListPresenter;
-import com.dayu.bigfish.MyApplication;
-import com.dayu.bigfish.R;
-import com.dayu.bigfish.ui.views.SwitchImage;
+import com.dayu.baselibrary.R;
+import com.dayu.common.BaseApplication;
 import com.dayu.common.Constants;
-import com.dayu.utils.UIUtils;
 import com.dayu.widgets.LRecyclerView;
+import com.dayu.widgets.SwitchImage;
 
 import java.text.ParseException;
 import java.util.List;
 
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
-import static com.dayu.bigfish.utils.UtilsDate.SHORT_DATE_FORMAT;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.SHORT_DATE_FORMAT;
 
 /**
  * Created by luofan on 2017/12/12.
@@ -60,7 +59,7 @@ public class BindingUtils {
         if (!TextUtils.isEmpty(url)) {
             RequestOptions options = new RequestOptions()
                     .diskCacheStrategy(DiskCacheStrategy.ALL)
-                    .centerCrop().transform(new GlideRoundTransform(MyApplication.getContext()));
+                    .centerCrop().transform(new GlideRoundTransform(BaseApplication.getContext()));
             Glide.with(view.getContext())
                     .load(url)
                     .apply(options)
@@ -78,7 +77,7 @@ public class BindingUtils {
     @BindingConversion
     public static Typeface convertStringToFace(String s) {
         try {
-            return Typeface.createFromAsset(MyApplication.getContext().getAssets(), s);
+            return Typeface.createFromAsset(BaseApplication.getContext().getAssets(), s);
         } catch (Exception e) {
             throw e;
         }

app/src/main/java/com/dayu/bigfish/utils/GlideRoundTransform.java → baseLibrary/src/main/java/com/dayu/utils/GlideRoundTransform.java

-package com.dayu.bigfish.utils;
+package com.dayu.utils;
 
 import android.content.Context;
 import android.content.res.Resources;

app/src/main/java/com/dayu/bigfish/utils/TabLayoutUtils.java → baseLibrary/src/main/java/com/dayu/utils/TabLayoutUtils.java

-package com.dayu.bigfish.utils;
+package com.dayu.utils;
 
 import android.app.Activity;
 import android.content.res.Resources;

app/src/main/java/com/dayu/bigfish/utils/UtilsDate.java → baseLibrary/src/main/java/com/dayu/utils/UtilsDate.java

@@ -2,13 +2,13 @@
  * CopyRight (C), 2012, www.winchannel.net
  */
 
-package com.dayu.bigfish.utils;
+package com.dayu.utils;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
 
-import com.dayu.bigfish.MyApplication;
-import com.dayu.bigfish.R;
+import com.dayu.baselibrary.R;
+import com.dayu.common.BaseApplication;
 
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -1597,9 +1597,9 @@ public class UtilsDate {
     public static String getDayOrIsToday(String time) {
         try {
             if (IsToday(time)) {
-                return MyApplication.getContext().getString(R.string.today);
+                return BaseApplication.getContext().getString(R.string.today);
             } else if (IsNextday(time)) {
-                return MyApplication.getContext().getString(R.string.tomorrow);
+                return BaseApplication.getContext().getString(R.string.tomorrow);
             } else {
                 return UtilsDate.changeFormat(time, FORMAT_ONE, SHORT_DATE_FORMAT);
             }
@@ -1610,5 +1610,5 @@ public class UtilsDate {
     }
 
 
-    private static ThreadLocal<SimpleDateFormat> DateLocal = new ThreadLocal<SimpleDateFormat>();
+    private static ThreadLocal<SimpleDateFormat> DateLocal = new ThreadLocal<>();
 }

app/src/main/java/com/dayu/bigfish/ui/views/SwitchImage.java → baseLibrary/src/main/java/com/dayu/widgets/SwitchImage.java

-package com.dayu.bigfish.ui.views;
+package com.dayu.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.dayu.bigfish.R;
+import com.dayu.baselibrary.R;
+
 
 /**
  * 开关按钮的自定义
@@ -20,9 +21,9 @@ public class SwitchImage extends android.support.v7.widget.AppCompatImageView {
     public void setSwitchButton(Boolean switchButton) {
         this.switchButton = switchButton;
         if (switchButton) {
-            setImageResource(R.mipmap.set_switch_start);
+            setImageResource(R.drawable.set_switch_start);
         } else {
-            setImageResource(R.mipmap.set_switch_off);
+            setImageResource(R.drawable.set_switch_off);
         }
     }
     public void changeSwitchButton() {

app/src/main/res/drawable/btn_login_selector.xml → baseLibrary/src/main/res/drawable/btn_login_selector.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 定义按钮按下时的图片 -->
-    <item android:drawable="@mipmap/denglu_btn_press"
+    <item android:drawable="@drawable/denglu_btn_press"
           android:state_pressed="true"/>
     <!-- 定义按钮默认的图片 -->
-    <item android:drawable="@mipmap/denglu_btn_normal"/>
+    <item android:drawable="@drawable/denglu_btn_normal"/>
 </selector>
\ No newline at end of file

baseLibrary/src/main/res/values/styles.xml

@@ -8,6 +8,67 @@
         <item name="colorAccent">@color/cl_accent</item>
     </style>
 
+    <style name="title">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/size_main_title</item>
+        <item name="android:background">@color/cl_white</item>
+    </style>
+
+    <style name="text_title">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/cl_home_title_text_color</item>
+        <item name="android:textSize">@dimen/size_text_title</item>
+    </style>
+
+    <style name="title_image_back">
+        <item name="android:layout_width">@dimen/dp_40</item>
+        <item name="android:layout_height">@dimen/dp_40</item>
+        <item name="android:src">@drawable/back_btn_normal</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginLeft">@dimen/size_title_ml</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+
+    <style name="title_right_image">
+        <item name="android:layout_width">@dimen/dp_30</item>
+        <item name="android:layout_height">@dimen/dp_30</item>
+        <item name="android:layout_marginRight">13.3dp</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+
+    <style name="title_right_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginRight">13.3dp</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+
+    <style name="card_line">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">6dp</item>
+        <item name="android:background">@drawable/line_shape</item>
+    </style>
+
+    <style name="line">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0.5dp</item>
+        <item name="android:background">@color/cl_order_item_line_bg</item>
+    </style>
+
+    <style name="TabLayoutTextStyle">
+        <item name="android:textSize">@dimen/sp_13.3</item>
+    </style>
+
+
     <style name="Dialog" parent="@android:style/Theme.Holo.Dialog">
         <item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
         <!-- 边框 -->

messageCenter/src/main/java/com/dayu/messagecenter/api/MessageApiFactory.java

+package com.dayu.messagecenter.api;
+
+import com.dayu.base.api.Api;
+import com.dayu.base.api.protocol.BasePageBean;
+import com.dayu.messagecenter.data.protocol.NewMessage;
+
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+
+/**
+ * 全局model类.
+ */
+public class MessageApiFactory {
+
+    public static Observable<BasePageBean<NewMessage>> getHxMessage(String hxAccount, int category, int page, int pageSize) {
+        return Api.getService(MessageService.class).getHxMessage(hxAccount, category, page, pageSize).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Integer> getHxNum(String hxAccount) {
+        return Api.getService(MessageService.class).getHxNum(hxAccount).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> readMessage(RequestBody body) {
+        return Api.getService(MessageService.class).readMessage(body).compose(Api.applySchedulers());
+    }
+
+}

messageCenter/src/main/java/com/dayu/messagecenter/api/MessageService.java

+package com.dayu.messagecenter.api;
+
+
+import com.dayu.base.api.protocol.BasePageBean;
+import com.dayu.base.api.protocol.BaseResponse;
+import com.dayu.common.Constants;
+import com.dayu.messagecenter.data.protocol.NewMessage;
+
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.PUT;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+
+/**
+ * Created by luofan on 2017/11/09.
+ */
+public interface MessageService {
+    /**
+     * 获取环信信息.
+     *
+     * @param hxAccount
+     * @param category  1:系统消息,2:大鱼通知.
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @GET(Constants.MESSAGE_HX_LIST)
+    Observable<BaseResponse<BasePageBean<NewMessage>>> getHxMessage(@Path("hxAccount") String hxAccount,
+                                                                    @Path("category") int category,
+                                                                    @Query("page") int page,
+                                                                    @Query("pageSize") int pageSize);
+
+    /**
+     * 获取环信信息数量.
+     *
+     * @param hxAccount
+     * @return
+     */
+    @GET(Constants.MESSAGE_NUM)
+    Observable<BaseResponse<Integer>> getHxNum(@Path("hxAccount") String hxAccount);
+
+    /**
+     * 获取环信信息数量.
+     *
+     * @param body
+     * @return
+     */
+    @PUT(Constants.MESSAGE_HX)
+    Observable<BaseResponse<Boolean>> readMessage(@Body RequestBody body);
+}

app/src/main/java/com/dayu/bigfish/bean/NewMessage.java → messageCenter/src/main/java/com/dayu/messagecenter/data/protocol/NewMessage.java

-package com.dayu.bigfish.bean;
+package com.dayu.messagecenter.data.protocol;
 
 import java.io.Serializable;
 

app/src/main/java/com/dayu/bigfish/presenter/message/messageContract.java → messageCenter/src/main/java/com/dayu/messagecenter/presenter/message/messageContract.java

-package com.dayu.bigfish.presenter.message;
+package com.dayu.messagecenter.presenter.message;
 
 
 import com.dayu.base.ui.presenter.BaseListPresenter;
 import com.dayu.common.BaseView;
-import com.dayu.bigfish.bean.NewMessage;
+import com.dayu.messagecenter.data.protocol.NewMessage;
 
 /**
  * Created by luo on 2016/8/4.

app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java → messageCenter/src/main/java/com/dayu/messagecenter/presenter/message/messagePresenter.java

-package com.dayu.bigfish.presenter.message;
+package com.dayu.messagecenter.presenter.message;
 
 import android.databinding.ObservableField;
 import android.os.Bundle;
 import android.view.View;
 
-import com.app.annotation.apt.InstanceFactory;
-import com.dayu.bigfish.MyApplication;
-import com.dayu.bigfish.api.ApiFactory;
-import com.dayu.bigfish.bean.NewMessage;
+import com.dayu.common.BaseApplication;
+import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
-import com.dayu.bigfish.ui.MessageDetailActivity;
-import com.dayu.bigfish.ui.fragment.MessageFragment;
+import com.dayu.messagecenter.api.MessageApiFactory;
+import com.dayu.messagecenter.data.protocol.NewMessage;
+import com.dayu.messagecenter.ui.activity.MessageDetailActivity;
+import com.dayu.messagecenter.ui.fragment.MessageFragment;
 import com.dayu.utils.UserManager;
-import com.dayu.common.Constants;
 import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONException;
@@ -25,7 +24,6 @@ import okhttp3.RequestBody;
  * Created by luofan
  * on 2017/11/8.
  */
-@InstanceFactory
 public class messagePresenter extends messageContract.Presenter {
     public ObservableField data = new ObservableField<>();
     private String mHxId;
@@ -58,7 +56,7 @@ public class messagePresenter extends messageContract.Presenter {
 
     @Override
     public void getHxMessage(String hxUserId, int category, int page, int pageSize) {
-        ApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(
+        MessageApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(
                 messageBasePageBean -> {
                     data.set(messageBasePageBean);
                     mPage++;
@@ -75,7 +73,7 @@ public class messagePresenter extends messageContract.Presenter {
             e.printStackTrace();
         }
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {}));
+        MessageApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {}));
     }
 
     @Override
@@ -88,6 +86,6 @@ public class messagePresenter extends messageContract.Presenter {
         bundle.putSerializable(Constants.HX_MESSAGE, message);
         bundle.putInt("category", message.getCategory());
         mView.startActivity(MessageDetailActivity.class, bundle);
-        MobclickAgent.onEvent(MyApplication.getContext(), "read_message");
+        MobclickAgent.onEvent(BaseApplication.getContext(), "read_message");
     }
 }

app/src/main/java/com/dayu/bigfish/ui/MessageDetailActivity.java → messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/MessageDetailActivity.java

-package com.dayu.bigfish.ui;
+package com.dayu.messagecenter.ui.activity;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.dayu.common.Constants;
-import com.dayu.bigfish.R;
 import com.dayu.base.ui.activity.DataBindingActivity;
-import com.dayu.bigfish.bean.NewMessage;
-import com.dayu.bigfish.databinding.ActivityMessageDetailBinding;
-import com.dayu.bigfish.utils.UtilsDate;
+import com.dayu.common.Constants;
+import com.dayu.messagecenter.R;
+import com.dayu.messagecenter.data.protocol.NewMessage;
+import com.dayu.messagecenter.databinding.ActivityMessageDetailBinding;
+import com.dayu.utils.UtilsDate;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -19,9 +18,9 @@ import com.umeng.analytics.MobclickAgent;
 import java.text.ParseException;
 import java.util.Map;
 
-import static com.dayu.bigfish.utils.UtilsDate.FORMAT_ONE;
-import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
-import static com.dayu.bigfish.utils.UtilsDate.SHORT_DATE_FORMAT;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+import static com.dayu.utils.UtilsDate.SHORT_DATE_FORMAT;
 
 /**
  * Created by luofan on 2017/11/27.
@@ -70,16 +69,16 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe
     }
 
     private void dumpDetail() {
-        Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
         Map<String, String> map = parseData(message.getCustomJson());
         int id = 0;
         if (!TextUtils.isEmpty(map.get("orderId"))) {
             id = Integer.parseInt(map.get("orderId"));
         }
-        Bundle bundle = new Bundle();
-        bundle.putInt(Constants.ORDER_ID, id);
-        intent.putExtra(Constants.BUNDLE,bundle);
-        startActivity(intent, bundle);
+//        Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
+//        Bundle bundle = new Bundle();
+//        bundle.putInt(Constants.ORDER_ID, id);
+//        intent.putExtra(Constants.BUNDLE,bundle);
+//        startActivity(intent, bundle);
         MobclickAgent.onEvent(mActivity, "message_check_order");
     }
 

app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageFragment.java → messageCenter/src/main/java/com/dayu/messagecenter/ui/fragment/HomeMessageFragment.java

-package com.dayu.bigfish.ui.fragment;
+package com.dayu.messagecenter.ui.fragment;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 
-import com.dayu.bigfish.R;
+import com.dayu.base.ui.adapter.FragmentBaseAdapter;
 import com.dayu.base.ui.fragment.DataBindingFragment;
-import com.dayu.bigfish.databinding.FragmentMessageBinding;
-import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
-import com.dayu.bigfish.utils.TabLayoutUtils;
+import com.dayu.messagecenter.R;
+import com.dayu.messagecenter.databinding.FragmentMessageBinding;
+import com.dayu.utils.TabLayoutUtils;
 import com.umeng.analytics.MobclickAgent;
 
 import java.util.ArrayList;

app/src/main/java/com/dayu/bigfish/ui/fragment/MessageFragment.java → messageCenter/src/main/java/com/dayu/messagecenter/ui/fragment/MessageFragment.java

-package com.dayu.bigfish.ui.fragment;
+package com.dayu.messagecenter.ui.fragment;
 
 import android.os.Bundle;
 
 import com.dayu.base.ui.fragment.BaseFragment;
-import com.dayu.bigfish.R;
-import com.dayu.bigfish.bean.NewMessage;
-import com.dayu.bigfish.databinding.ItemMessageLayoutBinding;
-import com.dayu.bigfish.databinding.LrecyclerViewBinding;
-import com.dayu.bigfish.presenter.message.messageContract;
-import com.dayu.bigfish.presenter.message.messagePresenter;
+import com.dayu.messagecenter.R;
+import com.dayu.messagecenter.data.protocol.NewMessage;
+import com.dayu.messagecenter.databinding.ItemMessageLayoutBinding;
+import com.dayu.messagecenter.databinding.LrecyclerViewBinding;
+import com.dayu.messagecenter.presenter.message.messageContract;
+import com.dayu.messagecenter.presenter.message.messagePresenter;
 import com.dayu.widgets.listener.OnItemClickListener;
 
 

app/src/main/res/layout/item_message_layout.xml → messageCenter/src/main/res/layout/item_message_layout.xml

@@ -5,11 +5,11 @@
 
         <import type="android.view.View"/>
 
-        <import type="com.dayu.bigfish.utils.UtilsDate"/>
+        <import type="com.dayu.utils.UtilsDate"/>
 
         <variable
             name="item"
-            type="com.dayu.bigfish.bean.NewMessage"/>
+            type="com.dayu.messagecenter.data.protocol.NewMessage"/>
     </data>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"