完善用户模块.

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

@@ -5,8 +5,9 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 import android.view.View;
 
 
-import com.dayu.bigfish.R;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.dayu.base.ui.activity.BaseActivity;
 import com.dayu.base.ui.activity.BaseActivity;
+import com.dayu.bigfish.R;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding;
 import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding;
 import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract;
 import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract;
@@ -14,6 +15,7 @@ import com.dayu.bigfish.presenter.orderdetail.OrderDetailPresenter;
 import com.dayu.bigfish.ui.fragment.OrderDetaillsFragment;
 import com.dayu.bigfish.ui.fragment.OrderDetaillsFragment;
 import com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment;
 import com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment;
 import com.dayu.bigfish.ui.fragment.OrderPartFragment;
 import com.dayu.bigfish.ui.fragment.OrderPartFragment;
+import com.dayu.provider.router.RouterPath;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.analytics.MobclickAgent;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -22,7 +24,7 @@ import java.util.ArrayList;
  * 工单详情信息页面，包含工单详情、服务记录、备件信息.
  * 工单详情信息页面，包含工单详情、服务记录、备件信息.
  * on 2017/9/13.
  * on 2017/9/13.
  */
  */
-
+@Route(path = RouterPath.PATH_ORDER_DETAIL)
 public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding>
 public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding>
         implements OrderDetailContract.View {
         implements OrderDetailContract.View {
     private OrderDetaillsFragment orderDatailsFragment;
     private OrderDetaillsFragment orderDatailsFragment;

baseLibrary/src/main/java/com/dayu/base/api/Api.java

@@ -105,6 +105,7 @@ public class Api {
         public Response intercept(Chain chain) throws IOException {
         public Response intercept(Chain chain) throws IOException {
             Request request = chain.request();
             Request request = chain.request();
             String token = (String) SPUtils.get(BaseConstant.TOKEN, "");
             String token = (String) SPUtils.get(BaseConstant.TOKEN, "");
+//            token = "8f2896af061e477faacd0b284aa62865";
             if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) {
             if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) {
                 request = request.newBuilder()
                 request = request.newBuilder()
                         .header(BaseConstant.TOKEN, token)
                         .header(BaseConstant.TOKEN, token)

baseLibrary/src/main/java/com/dayu/utils/UserManager.java

@@ -50,6 +50,7 @@ public class UserManager {
      */
      */
     public void clearUserInfo() {
     public void clearUserInfo() {
         SPUtils.remove("USER_INFO");
         SPUtils.remove("USER_INFO");
+        SPUtils.remove("token");
     }
     }
 
 
     /**
     /**

messageCenter/src/main/debug/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.dayu.messagecenter" >
+    package="com.dayu.messagecenter">
+
     <application
     <application
         android:name="com.dayu.common.BaseApplication"
         android:name="com.dayu.common.BaseApplication"
         android:allowBackup="true"
         android:allowBackup="true"
@@ -8,11 +9,12 @@
         android:theme="@style/AppTheme">
         android:theme="@style/AppTheme">
         <activity android:name=".ui.activity.TestActivity">
         <activity android:name=".ui.activity.TestActivity">
             <intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
 
 
+        <activity android:name=".ui.activity.MessageDetailActivity" />
     </application>
     </application>
 </manifest>
 </manifest>

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

@@ -35,6 +35,7 @@ public class messagePresenter extends messageContract.Presenter {
         mCategory = ((MessageFragment) mView).getArguments().getInt("category", 1);
         mCategory = ((MessageFragment) mView).getArguments().getInt("category", 1);
         UserInfo userInfo = UserManager.getInstance().getUser();
         UserInfo userInfo = UserManager.getInstance().getUser();
         mHxId = userInfo.getHxAccount();
         mHxId = userInfo.getHxAccount();
+//        mHxId = "0e09ed696cf843dda34ac729a1231d4f";
         refresh();
         refresh();
     }
     }
 
 
@@ -73,7 +74,8 @@ public class messagePresenter extends messageContract.Presenter {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        MessageApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {}));
+        MessageApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {
+        }));
     }
     }
 
 
     @Override
     @Override

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

@@ -4,11 +4,14 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View;
 
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.dayu.base.ui.activity.DataBindingActivity;
 import com.dayu.base.ui.activity.DataBindingActivity;
 import com.dayu.common.Constants;
 import com.dayu.common.Constants;
 import com.dayu.messagecenter.R;
 import com.dayu.messagecenter.R;
 import com.dayu.messagecenter.data.protocol.NewMessage;
 import com.dayu.messagecenter.data.protocol.NewMessage;
 import com.dayu.messagecenter.databinding.ActivityMessageDetailBinding;
 import com.dayu.messagecenter.databinding.ActivityMessageDetailBinding;
+import com.dayu.provider.common.ProviderConstant;
+import com.dayu.provider.router.RouterPath;
 import com.dayu.utils.UtilsDate;
 import com.dayu.utils.UtilsDate;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.GsonBuilder;
@@ -74,11 +77,11 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe
         if (!TextUtils.isEmpty(map.get("orderId"))) {
         if (!TextUtils.isEmpty(map.get("orderId"))) {
             id = Integer.parseInt(map.get("orderId"));
             id = Integer.parseInt(map.get("orderId"));
         }
         }
-//        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);
+        Bundle bundle = new Bundle();
+        bundle.putInt(Constants.ORDER_ID, id);
+        ARouter.getInstance().build(RouterPath.PATH_ORDER_DETAIL)
+                .withBundle(ProviderConstant.BUNDLE, bundle)
+                .navigation();
         MobclickAgent.onEvent(mActivity, "message_check_order");
         MobclickAgent.onEvent(mActivity, "message_check_order");
     }
     }
 
 

messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/TestActivity.java

@@ -6,6 +6,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager;
 
 
 import com.dayu.messagecenter.R;
 import com.dayu.messagecenter.R;
+import com.dayu.messagecenter.ui.fragment.HomeMessageFragment;
 
 
 /**
 /**
  * Created by luofan
  * Created by luofan
@@ -13,6 +14,7 @@ import com.dayu.messagecenter.R;
  */
  */
 
 
 public class TestActivity extends AppCompatActivity {
 public class TestActivity extends AppCompatActivity {
+
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
@@ -20,5 +22,12 @@ public class TestActivity extends AppCompatActivity {
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_test);
         setContentView(R.layout.activity_test);
+        initView();
+    }
+
+    public void initView() {
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.fl_content, HomeMessageFragment.newInstance())
+                .commit();
     }
     }
 }
 }

messageCenter/src/main/res/layout/activity_test.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="测试一下"
-        />
-</LinearLayout>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fl_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file

provider/src/main/java/com/dayu/provider/common/ProviderConstant.java

@@ -6,4 +6,12 @@ package com.dayu.provider.common;
  */
  */
 
 
 public class ProviderConstant {
 public class ProviderConstant {
+    /**
+     * 订单id.
+     */
+    public final static String ORDER_ID = "orderId";
+    /**
+     * bundle.
+     */
+    public final static String BUNDLE = "bundle";
 }
 }

provider/src/main/java/com/dayu/provider/router/RouterPath.java

@@ -6,5 +6,13 @@ package com.dayu.provider.router;
  */
  */
 
 
 public class RouterPath {
 public class RouterPath {
+    /**
+     * 用户模块.
+     */
     public final static String PATH_LOGIN = "/user/login";
     public final static String PATH_LOGIN = "/user/login";
+
+    /**
+     * 工单模块.
+     */
+    public final static String PATH_ORDER_DETAIL = "/order/detail";
 }
 }