diff --git a/app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java b/app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java index 74f0482..736ea1f 100755 --- a/app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java +++ b/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.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.bigfish.R; import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding; 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.OrderDetailsServeFragment; import com.dayu.bigfish.ui.fragment.OrderPartFragment; +import com.dayu.provider.router.RouterPath; import com.umeng.analytics.MobclickAgent; import java.util.ArrayList; @@ -22,7 +24,7 @@ import java.util.ArrayList; * 工单详情信息页面,包含工单详情、服务记录、备件信息. * on 2017/9/13. */ - +@Route(path = RouterPath.PATH_ORDER_DETAIL) public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding> implements OrderDetailContract.View { private OrderDetaillsFragment orderDatailsFragment; diff --git a/app/src/main/assets/fonts/DIN Alternate Bold.ttf b/baseLibrary/src/main/assets/fonts/DIN Alternate Bold.ttf similarity index 100% rename from app/src/main/assets/fonts/DIN Alternate Bold.ttf rename to baseLibrary/src/main/assets/fonts/DIN Alternate Bold.ttf Binary files a/app/src/main/assets/fonts/DIN Alternate Bold.ttf and b/baseLibrary/src/main/assets/fonts/DIN Alternate Bold.ttf differ diff --git a/baseLibrary/src/main/java/com/dayu/base/api/Api.java b/baseLibrary/src/main/java/com/dayu/base/api/Api.java index dc8cd6c..4b13f27 100755 --- a/baseLibrary/src/main/java/com/dayu/base/api/Api.java +++ b/baseLibrary/src/main/java/com/dayu/base/api/Api.java @@ -105,6 +105,7 @@ public class Api { public Response intercept(Chain chain) throws IOException { Request request = chain.request(); String token = (String) SPUtils.get(BaseConstant.TOKEN, ""); +// token = "8f2896af061e477faacd0b284aa62865"; if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) { request = request.newBuilder() .header(BaseConstant.TOKEN, token) diff --git a/baseLibrary/src/main/java/com/dayu/utils/UserManager.java b/baseLibrary/src/main/java/com/dayu/utils/UserManager.java index 946acc8..5ce1ab4 100755 --- a/baseLibrary/src/main/java/com/dayu/utils/UserManager.java +++ b/baseLibrary/src/main/java/com/dayu/utils/UserManager.java @@ -50,6 +50,7 @@ public class UserManager { */ public void clearUserInfo() { SPUtils.remove("USER_INFO"); + SPUtils.remove("token"); } /** diff --git a/messageCenter/src/main/debug/AndroidManifest.xml b/messageCenter/src/main/debug/AndroidManifest.xml index 21dc635..f8f28dc 100644 --- a/messageCenter/src/main/debug/AndroidManifest.xml +++ b/messageCenter/src/main/debug/AndroidManifest.xml @@ -1,5 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.dayu.messagecenter" > + package="com.dayu.messagecenter"> + <application android:name="com.dayu.common.BaseApplication" android:allowBackup="true" @@ -8,11 +9,12 @@ android:theme="@style/AppTheme"> <activity android:name=".ui.activity.TestActivity"> <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> </activity> + <activity android:name=".ui.activity.MessageDetailActivity" /> </application> </manifest> diff --git a/messageCenter/src/main/java/com/dayu/messagecenter/presenter/message/messagePresenter.java b/messageCenter/src/main/java/com/dayu/messagecenter/presenter/message/messagePresenter.java index fca6d14..a0c5f3d 100644 --- a/messageCenter/src/main/java/com/dayu/messagecenter/presenter/message/messagePresenter.java +++ b/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); UserInfo userInfo = UserManager.getInstance().getUser(); mHxId = userInfo.getHxAccount(); +// mHxId = "0e09ed696cf843dda34ac729a1231d4f"; refresh(); } @@ -73,7 +74,8 @@ public class messagePresenter extends messageContract.Presenter { e.printStackTrace(); } RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); - MessageApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {})); + MessageApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> { + })); } @Override diff --git a/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/MessageDetailActivity.java b/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/MessageDetailActivity.java index 2525218..8286001 100644 --- a/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/MessageDetailActivity.java +++ b/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.view.View; +import com.alibaba.android.arouter.launcher.ARouter; import com.dayu.base.ui.activity.DataBindingActivity; 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.provider.common.ProviderConstant; +import com.dayu.provider.router.RouterPath; import com.dayu.utils.UtilsDate; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -74,11 +77,11 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe if (!TextUtils.isEmpty(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"); } diff --git a/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/TestActivity.java b/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/TestActivity.java index a0e6797..8160c30 100644 --- a/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/TestActivity.java +++ b/messageCenter/src/main/java/com/dayu/messagecenter/ui/activity/TestActivity.java @@ -6,6 +6,7 @@ import android.view.Window; import android.view.WindowManager; import com.dayu.messagecenter.R; +import com.dayu.messagecenter.ui.fragment.HomeMessageFragment; /** * Created by luofan @@ -13,6 +14,7 @@ import com.dayu.messagecenter.R; */ public class TestActivity extends AppCompatActivity { + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -20,5 +22,12 @@ public class TestActivity extends AppCompatActivity { WindowManager.LayoutParams.FLAG_FULLSCREEN); supportRequestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.activity_test); + initView(); + } + + public void initView() { + getSupportFragmentManager().beginTransaction() + .add(R.id.fl_content, HomeMessageFragment.newInstance()) + .commit(); } } diff --git a/messageCenter/src/main/res/layout/activity_test.xml b/messageCenter/src/main/res/layout/activity_test.xml index ca92d5f..af03e65 100644 --- a/messageCenter/src/main/res/layout/activity_test.xml +++ b/messageCenter/src/main/res/layout/activity_test.xml @@ -1,10 +1,5 @@ <?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> \ No newline at end of file +<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" /> diff --git a/provider/src/main/java/com/dayu/provider/common/ProviderConstant.java b/provider/src/main/java/com/dayu/provider/common/ProviderConstant.java index bff04b2..13b165b 100644 --- a/provider/src/main/java/com/dayu/provider/common/ProviderConstant.java +++ b/provider/src/main/java/com/dayu/provider/common/ProviderConstant.java @@ -6,4 +6,12 @@ package com.dayu.provider.common; */ public class ProviderConstant { + /** + * 订单id. + */ + public final static String ORDER_ID = "orderId"; + /** + * bundle. + */ + public final static String BUNDLE = "bundle"; } diff --git a/provider/src/main/java/com/dayu/provider/router/RouterPath.java b/provider/src/main/java/com/dayu/provider/router/RouterPath.java index 4b75f01..b15c4ab 100644 --- a/provider/src/main/java/com/dayu/provider/router/RouterPath.java +++ b/provider/src/main/java/com/dayu/provider/router/RouterPath.java @@ -6,5 +6,13 @@ package com.dayu.provider.router; */ public class RouterPath { + /** + * 用户模块. + */ public final static String PATH_LOGIN = "/user/login"; + + /** + * 工单模块. + */ + public final static String PATH_ORDER_DETAIL = "/order/detail"; }