Skip to content

android / dayu

Go to a project
Commit bfddf18a by 罗翻
Options

将constanst api分模块，删除无用资源。

parent c31fe82b
Inline Side-by-side
Showing with 305 additions and 500 deletions
app/src/main/java/com/dayu/bigfish/MyApplication.java
......@@ -8,7 +8,7 @@ import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Handler;
import com.dayu.bigfish.utils.managers.HxManager;
import com.dayu.bigfish.utils.HxManager;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
package com.dayu.bigfish.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.common.Constants;
import com.dayu.message.data.protocol.NewMessage;
import java.util.List;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Multipart;
import retrofit2.http.POST;
import retrofit2.http.Part;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.Streaming;
import retrofit2.http.Url;
/**
* Created by luofan on 2017/11/09.
......@@ -66,21 +56,6 @@ public interface APIService {
/**
* 获取环信信息.
*
* @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
......@@ -88,31 +63,5 @@ public interface APIService {
*/
@GET(Constants.MESSAGE_NUM)
Observable<BaseResponse<Integer>> getHxNum(@Path("hxAccount") String hxAccount);
/**
* 上传图片多张.
*
* @param partMap
* @return
*/
@Multipart
@POST(Constants.UP_PHOTO)
Observable<BaseResponse<List<String>>> uploadPhoto(
@Part MultipartBody.Part[] partMap);
/**
* 上传图片单张.
*
* @param part
* @return
*/
@Multipart
@POST(Constants.UP_PHOTO)
Observable<BaseResponse<List<String>>> uploadPhoto(
@Part MultipartBody.Part part);
@Streaming
@GET
Observable<ResponseBody> download(@Url String url);
}
app/src/main/java/com/dayu/bigfish/api/ApiFactory.java
package com.dayu.bigfish.api;
import com.dayu.base.api.Api;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.api.protocol.VersionInfo;
import io.reactivex.Observable;
import okhttp3.RequestBody;
......
app/src/main/java/com/dayu/bigfish/bean/InformBean.java → app/src/main/java/com/dayu/bigfish/api/protocol/InformBean.java
package com.dayu.bigfish.bean;
package com.dayu.bigfish.api.protocol;
import java.io.Serializable;
......
app/src/main/java/com/dayu/bigfish/bean/VersionInfo.java → app/src/main/java/com/dayu/bigfish/api/protocol/VersionInfo.java
package com.dayu.bigfish.bean;
package com.dayu.bigfish.api.protocol;
/**
* Created by luofan on 2017/11/14.
......
app/src/main/java/com/dayu/bigfish/bean/event/RxBus.java deleted 100755 → 0
package com.dayu.bigfish.bean.event;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.subjects.Subject;
/**
* RxBus1
* Created by luofan on 2016/7/23.
*/
public class RxBus {
private static volatile RxBus mDefaultInstance;
private final Map<Class<?>, Object> mStickyEventMap;
private final Subject<Object> mBus;
public RxBus() {
mBus = PublishSubject.create().toSerialized();
mStickyEventMap = new ConcurrentHashMap<>();
}
public static RxBus getDefault() {
if (mDefaultInstance == null) {
synchronized (RxBus.class) {
if (mDefaultInstance == null) {
mDefaultInstance = new RxBus();
}
}
}
return mDefaultInstance;
}
/**
* 发送事件
*/
public void post(Object event) {
mBus.onNext(event);
}
/**
* 根据传递的 eventType 类型返回特定类型(eventType)的 被观察者
*/
public <T> Observable<T> toObservable(Class<T> eventType) {
return mBus.ofType(eventType);
}
/**
* 判断是否有订阅者
*/
public boolean hasObservers() {
return mBus.hasObservers();
}
public void reset() {
mDefaultInstance = null;
}
/**
* Stciky 相关
*/
/**
* 发送一个新Sticky事件
*/
public void postSticky(Object event) {
synchronized (mStickyEventMap) {
mStickyEventMap.put(event.getClass(), event);
}
post(event);
}
/**
* 根据传递的 eventType 类型返回特定类型(eventType)的 被观察者
*/
public <T> Observable<T> toObservableSticky(final Class<T> eventType) {
synchronized (mStickyEventMap) {
Observable<T> observable = mBus.ofType(eventType);
final Object event = mStickyEventMap.get(eventType);
if (event != null) {
return observable.mergeWith(Observable.create(new ObservableOnSubscribe<T>() {
@Override
public void subscribe(ObservableEmitter<T> e) throws Exception {
e.onNext(eventType.cast(event));
}
}));
} else {
return observable;
}
}
}
/**
* 根据eventType获取Sticky事件
*/
public <T> T getStickyEvent(Class<T> eventType) {
synchronized (mStickyEventMap) {
return eventType.cast(mStickyEventMap.get(eventType));
}
}
/**
* 移除指定eventType的Sticky事件
*/
public <T> T removeStickyEvent(Class<T> eventType) {
synchronized (mStickyEventMap) {
return eventType.cast(mStickyEventMap.remove(eventType));
}
}
/**
* 移除所有的Sticky事件
*/
public void removeAllStickyEvents() {
synchronized (mStickyEventMap) {
mStickyEventMap.clear();
}
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.main;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.common.BaseView;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
......@@ -136,7 +136,6 @@ public class SettingPresenter extends SettingContract.Presenter {
@Override
public void dumpToFeed() {
Bundle bundle = new Bundle();
bundle.putInt(Constants.TYPE, Constants.FEED_BACK);
mView.startActivity(FeedBackActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "feed_back");
}
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -21,21 +21,21 @@ import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.BuildConfig;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.api.protocol.InformBean;
import com.dayu.bigfish.api.protocol.VersionInfo;
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.common.Constants;
import com.dayu.event.DownloadBean;
import com.dayu.event.RefreshReceivingNum;
import com.dayu.provider.event.RefreshReceivingNum;
import com.dayu.location.base.LocationUtils;
import com.dayu.message.ui.fragment.HomeMessageFragment;
import com.dayu.order.event.SwtichFragment;
import com.dayu.provider.event.SwtichFragment;
import com.dayu.order.ui.activity.ReceivingActivity;
import com.dayu.order.ui.fragment.HomeOrderFragment;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.onDownloadListener;
......@@ -51,7 +51,7 @@ import java.io.File;
* Created by luofan
* on 2017/11/20.
*/
@Route(path = BaseRouterPath.PATH_MAIN)
@Route(path = RouterPath.PATH_MAIN)
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
private int mPosition = 0;
private FragmentManager mFragmentManger;
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
......@@ -6,7 +6,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.databinding.ActivitySettingBinding;
import com.dayu.bigfish.presenter.setting.SettingContract;
import com.dayu.bigfish.presenter.setting.SettingPresenter;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener;
......@@ -14,7 +14,7 @@ import com.dayu.widgets.listener.OnCloseListener;
* 设置页面
* 2017/9/2.
*/
@Route(path = BaseRouterPath.PATH_SETTING)
@Route(path = RouterPath.PATH_SETTING)
public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySettingBinding>
implements SettingContract.View {
......
app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java → app/src/main/java/com/dayu/bigfish/utils/HxManager.java
package com.dayu.bigfish.utils.managers;
package com.dayu.bigfish.utils;
import android.app.ActivityManager;
import android.app.Notification;
......@@ -10,7 +10,7 @@ import android.support.v4.app.NotificationCompat;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.api.protocol.InformBean;
import com.dayu.bigfish.ui.MainActivity;
import com.google.gson.Gson;
import com.hyphenate.EMMessageListener;
......
baseLibrary/src/main/java/com/dayu/common/Constants.java
......@@ -9,19 +9,11 @@ import com.dayu.utils.LogUtils;
*/
public class Constants {
/**************************微服务测试路径*******************************/
// /api-user/
public static final String BASE_USER = "https://47.94.101.239:7100/";
// /api-order/
public static final String BASE_ORDER = "https://47.94.101.239:7200/";
// /api-base/
public static final String BASE_OTHER = "https://47.94.101.239:7300/";
// /api-message/
public static final String BASE_MESSAGE = "https://47.94.101.239:7400/";
// /api-count/
public static final String BASE_COUNT = "https://47.94.101.239:7500/";
/***********************测试环境配置**********************************/
//打包配置处。。。。。
/**
* 测试环境配置.
*/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
......@@ -29,169 +21,45 @@ public class Constants {
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true;
/**************************正式环境*******************************/
/**
* 正式环境.
*/
// public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.dayu.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static final boolean IS_DEBUG = false;
/*****************/
//api
/**
* 登录.
*/
public static final String LOGIN_URL = "/check";
/**
* 登录时发送验证码
*/
public static final String REGISTER_URL = "/api-user/" + "account/loginSms/{telephone}/type/{type}";
/**
* 修改用户信息.
*/
public static final String MODIFY_USER_INFO = "/api-user/" + "auditInfo/accountReAuthenticate";
/**
* 修改用户头像.
*/
public static final String MODIFY_USER_HEADER = "/api-user/" + "/account/modifyHeadURL";
/**
* 异常单获取.
*/
public static final String ERROR_ORDER = "/api-order/" + "orders/findExceptionSimpleOrderVO";
/**
* 工程师接单.
*/
public static final String ORDER_RECEIVING = "/api-order/" + "orders/{orderId}/engineer/{engineerId}";
/**
* 重新预约时间.
*/
public static final String SUBCRIBE_TIME = "/api-order/" + "orders/bespeakDoor";
/**
* 开始出发.
*/
public static final String START_ORDER = "/api-order/" + "orders/onWayUpgrade";
/**
* 开始服务.
*/
public static final String START_SERVE = "/api-order/" + "orders/onWorkingUpgrade";
/**
* 工单详情信息,包含评价,投诉,服务记录.
*/
public static final String ORDER_DETAILS = "/api-order/" + "orders/{orderId}/detail";
/**
* 工单完成,提交验收报告.
*/
public static final String ORDER_FINISH = "/api-order/" + "orders/waitCustomerCheckUpgrade";
/**
* 获取工程师信息.
*/
public static final String PERSONAL_CENTER = "/api-user/" + "engineerInfo/accountId/{accountId}";
/**
* 工程师今日收益.
*/
public static final String PERSONAL_ACOUNT_BALANCE = "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/{accountId}";
/**
* 工程师账户余额.
*/
public static final String PERSONAL_ACCOUT_LIST = "/api-settlement/" + "payStream/queryPayStream/";
/**
* 绑定支付宝账号.
*/
public static final String PERSONAL_ALIPAY_BOUND = "/api-settlement/" + "alipay/save";
/**
* 查询支付宝账号.
*/
public static final String PERSONAL_ALIPAY_QUERY = "/api-settlement/" + "alipay/queryAlipayByAccountId/accountId/{accountId}";
/**
* 修改支付宝账号.
*/
public static final String PERSONAL_ALIPAY_MODIFY = "/api-settlement/" + "alipay/modifyAlipay";
/**
* 单表查询工单记录.
*/
public final static String SELECT_ORDER_LITTLE = "/api-order/" + "orders/{id}";
/**
* 根据工程师id和工程师id获取今日业绩(今日收益).
*/
public final static String USER_ORDER_REVENUE = "/api-count/" + "ordersStatistics/income/siteId/{siteId}/engineerId/{engineerId}";
//服务记录、工程师评价
public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/siteId/{siteId}/engineerId/{engineerId}";
//反馈提交
public final static String SET_IDEA_COMMIT = "/api-base/" + "suggest";
//版本更新检测
public final static String UPDATA_VERSION = "/api-base/" + "appVersion/newestVersion/appId/{packageName}";
//版本更新、获取新版本信息
public final static String UPGRADE_VERSION = "/api-base/" + "appVersion/versionInfo";
public final static String COMMIT_VERSION_INFO = "/api-base/" + "versionUpgrade";
//分页获取工单
public final static String ORDERS = "/api-order/" + "orders/findSimpleOrderVOByPage";
//获取首页tab状态的数量
public final static String TAB_NUM = "/api-order/" + "orders/{userId}/count/siteId/{siteId}";
//环信
public final static String MESSAGE_HX = "/api-message/" + "hXMessage";
public final static String MESSAGE_HX_LIST = "/api-message/hXMessage/hxAccount/{hxAccount}/category/{category}";
//获取消息数量
public final static String MESSAGE_NUM = " /api-message/" + "hXMessage/count/hxAccount/{hxAccount}";
/**
* 获取服务说明.
*/
public final static String ORDER_INSTRUCTION = "/api-ka-base/" + "spuServiceDetail";
/**
* 获取厂商收货地址.
*/
public final static String KA_ADDRESS = "/api-ka-user/" + "companyAddress/default/companyId/{companyId}";
/**
* 申请备件.
*/
public final static String APPLY_ONE_PART = "/api-ka-order/" + "kaOrderSpareParts/saveSpApplyParts";
/**
* 取消申请备件.
*/
public final static String CANCLE_APPLY_PART = "/api-ka-order/" + "kaOrderSpareParts/spCancelApplyParts";
/**
* sp主动寄回备件.
*/
public final static String RETURN_PART_SELF = "/api-ka-order/" + "kaOrderSpareParts/spExpressBack";
/**
* sp按ka要求寄回备件.
*/
public final static String RETURN_PART_BY_KA = "/api-ka-order/" + "kaOrderSpareParts/spExpressBackByka";
/**
* 收到备件.
*/
public final static String RECEIVE_PART = "/api-ka-order/" + "kaOrderSpareParts/spReceivedParts";
/**
* 获取备件列表.
* 反馈.
*/
public final static String QUERY_PART_LIST = "/api-ka-order/" + "kaOrderSpareParts/queryOrderPartList";
public final static String SET_IDEA_COMMIT = "/api-base/" + "suggest";
/**
* 拒绝申请备件.
* 版本更新检测.
*/
public final static String REFUSE_ONE_PART = "/api-ka-order/" + "kaOrderSpareParts/refuse";
public final static String UPDATA_VERSION = "/api-base/" + "appVersion/newestVersion/appId/{packageName}";
//
/**
* 查询物流信息.
* 版本更新、获取新版本信息.
*/
public final static String QUERY_LOGISTICS_INFO = "/api-base/" + "logisticsTraceInfo/queryLogisticsTraceInfo";
public final static String UPGRADE_VERSION = "/api-base/" + "appVersion/versionInfo";
/**
* 查询物流信息.
* 提交版本信息.
*/
public final static String QUERY_SHIPPER_COMPANY = "/api-base/" + "shipperCompany/queryShipperList";
public final static String COMMIT_VERSION_INFO = "/api-base/" + "versionUpgrade";
/**
* 修改备件信息.
* 获取消息数量.
*/
public final static String MODIFY_PART = "/api-ka-order/" + "kaOrderSpareParts";
public final static String MESSAGE_NUM = " /api-message/" + "hXMessage/count/hxAccount/{hxAccount}";
/***********************其他配置**********************************/
......@@ -234,7 +102,6 @@ public class Constants {
public final static String NOT_SHOW = "not_show";
public final static String PICURL = "pic_url";
public final static String URL = "url";
public final static String ENGINEERINFO = "engineer_info";
public final static String TYPE = "type";
......@@ -246,10 +113,6 @@ public class Constants {
public static final String PART = "part";
/**
* 意见反馈.
*/
public final static int FEED_BACK = 0;
/**
* 主动申请备件.
*/
public final static int APPLY_PART = 1;
......
messageCenter/src/main/java/com/dayu/message/api/MessageApiFactory.java
......@@ -16,10 +16,6 @@ public class MessageApiFactory {
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/message/api/MessageService.java
......@@ -3,7 +3,7 @@ package com.dayu.message.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.message.common.MessageConstant;
import com.dayu.message.data.protocol.NewMessage;
import io.reactivex.Observable;
......@@ -27,27 +27,19 @@ public interface MessageService {
* @param pageSize
* @return
*/
@GET(Constants.MESSAGE_HX_LIST)
@GET(MessageConstant.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)
@PUT(MessageConstant.MESSAGE_HX)
Observable<BaseResponse<Boolean>> readMessage(@Body RequestBody body);
}
messageCenter/src/main/java/com/dayu/message/common/MessageConstant.java 0 → 100644
package com.dayu.message.common;
/**
* Created by luofan
* on 2018/2/9.
*/
public class MessageConstant {
/**
* 阅读环信消息.
*/
public final static String MESSAGE_HX = "/api-message/" + "hXMessage";
/**
* 获取环信消息.
*/
public final static String MESSAGE_HX_LIST = "/api-message/hXMessage/hxAccount/{hxAccount}/category/{category}";
}
messageCenter/src/main/java/com/dayu/message/ui/activity/MessageDetailActivity.java
......@@ -10,8 +10,8 @@ import com.dayu.common.Constants;
import com.dayu.message.R;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.message.databinding.ActivityMessageDetailBinding;
import com.dayu.provider.common.ProviderConstant123;
import com.dayu.provider.router.BaseRouterPath;
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;
......@@ -79,8 +79,8 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe
}
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, id);
ARouter.getInstance().build(BaseRouterPath.PATH_ORDER_DETAIL)
.withBundle(ProviderConstant123.BUNDLE, bundle)
ARouter.getInstance().build(RouterPath.PATH_ORDER_DETAIL)
.withBundle(ProviderConstant.BUNDLE, bundle)
.navigation();
MobclickAgent.onEvent(mActivity, "message_check_order");
}
......
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
......@@ -2,7 +2,6 @@ package com.dayu.order.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.api.protocol.KaAddress;
import com.dayu.order.api.protocol.LogsticsInfo;
......@@ -12,6 +11,7 @@ import com.dayu.order.api.protocol.OrderPart;
import com.dayu.order.api.protocol.ServerInstruction;
import com.dayu.order.api.protocol.ShipperCompany;
import com.dayu.order.api.protocol.Tab;
import com.dayu.order.common.OrderConstant;
import java.util.List;
......@@ -36,7 +36,7 @@ import retrofit2.http.Query;
* @param body
* @return
*/
@POST(Constants.START_ORDER)
@POST(OrderConstant.START_ORDER)
Observable<BaseResponse<Integer>> startOrder(@Body RequestBody body);
/**
......@@ -45,7 +45,7 @@ import retrofit2.http.Query;
* @param body
* @return
*/
@POST(Constants.START_SERVE)
@POST(OrderConstant.START_SERVE)
Observable<BaseResponse<Integer>> startServer(@Body RequestBody body);
/**
......@@ -58,7 +58,7 @@ import retrofit2.http.Query;
* @param pageSize
* @return
*/
@GET(Constants.ORDERS)
@GET(OrderConstant.ORDERS)
Observable<BaseResponse<BasePageBean<Order>>> getOrders(@Query("state") int state,
@Query("engineerId") int engineerId,
@Query("siteId") int siteId,
......@@ -71,7 +71,7 @@ import retrofit2.http.Query;
* @param siteId
* @return
*/
@GET(Constants.ERROR_ORDER)
@GET(OrderConstant.ERROR_ORDER)
Observable<BaseResponse<List<ErrorOrder>>> getErrorOrders(@Query("engineerId") int userId, @Query("siteId") int siteId);
/**
......@@ -81,7 +81,7 @@ import retrofit2.http.Query;
* @param engineerId
* @return
*/
@GET(Constants.ORDER_RECEIVING)
@GET(OrderConstant.ORDER_RECEIVING)
Observable<BaseResponse<Boolean>> receiveOrder(@Path("orderId") int orderId,
@Path("engineerId") int engineerId);
......@@ -93,7 +93,7 @@ import retrofit2.http.Query;
* @param doorComment
* @return
*/
@POST(Constants.SUBCRIBE_TIME)
@POST(OrderConstant.API_SUBCRIBE_TIME)
Observable<BaseResponse<Boolean>> subcriceTime(@Query("orderId") int orderId,
@Query("doorTime") String doorTime,
@Query("doorComment") String doorComment);
......@@ -104,7 +104,7 @@ import retrofit2.http.Query;
* @param orderInfo
* @return
*/
@POST(Constants.ORDER_FINISH)
@POST(OrderConstant.API_ORDER_FINISH)
Observable<BaseResponse<Integer>> commitOrder(@Body RequestBody orderInfo);
/**
......@@ -113,7 +113,7 @@ import retrofit2.http.Query;
* @param id
* @return
*/
@GET(Constants.SELECT_ORDER_LITTLE)
@GET(OrderConstant.SELECT_ORDER_LITTLE)
Observable<BaseResponse<OrderDetail>> queryOrderInfo(@Path("id") int id);
/**
......@@ -122,7 +122,7 @@ import retrofit2.http.Query;
* @param userId
* @return
*/
@GET(Constants.TAB_NUM)
@GET(OrderConstant.TAB_NUM)
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId, @Path("siteId") int siteId);
/**
......@@ -131,7 +131,7 @@ import retrofit2.http.Query;
* @param orderId
* @return
*/
@GET(Constants.ORDER_DETAILS)
@GET(OrderConstant.ORDER_DETAILS)
Observable<BaseResponse<OrderDetail>> getOrderInfo(@Path("orderId") int orderId);
/**
......@@ -140,7 +140,7 @@ import retrofit2.http.Query;
* @param id
* @return
*/
@GET(Constants.ORDER_INSTRUCTION)
@GET(OrderConstant.ORDER_INSTRUCTION)
Observable<BaseResponse<BasePageBean<ServerInstruction>>> getInstruction(@Query("kaSpuId") long id, @Query("page") int page,
@Query("pageSize") int pageSize);
......@@ -150,7 +150,7 @@ import retrofit2.http.Query;
* @param companyId
* @return
*/
@GET(Constants.KA_ADDRESS)
@GET(OrderConstant.KA_ADDRESS)
Observable<BaseResponse<KaAddress>> getKaAddress(@Path("companyId") int companyId);
/**
......@@ -161,7 +161,7 @@ import retrofit2.http.Query;
* @param createBy
* @return
*/
@POST(Constants.APPLY_ONE_PART)
@POST(OrderConstant.APPLY_ONE_PART)
Observable<BaseResponse<Boolean>> applyPart(@Query("spOrderId") long spOrderId,
@Query("spComment") String spComment,
@Query("createBy") String createBy,
......@@ -174,7 +174,7 @@ import retrofit2.http.Query;
* @param modifyBy
* @return
*/
@PUT(Constants.CANCLE_APPLY_PART)
@PUT(OrderConstant.CANCLE_APPLY_PART)
Observable<BaseResponse<Boolean>> cancleApply(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
......@@ -184,7 +184,7 @@ import retrofit2.http.Query;
* @param body
* @return
*/
@POST(Constants.RETURN_PART_SELF)
@POST(OrderConstant.RETURN_PART_SELF)
Observable<BaseResponse<Boolean>> returnPartSelf(@Body RequestBody body);
/**
......@@ -193,7 +193,7 @@ import retrofit2.http.Query;
* @param body
* @return
*/
@PUT(Constants.RETURN_PART_BY_KA)
@PUT(OrderConstant.RETURN_PART_BY_KA)
Observable<BaseResponse<Boolean>> returnPartByKA(@Body RequestBody body);
/**
......@@ -203,7 +203,7 @@ import retrofit2.http.Query;
* @param modifyBy
* @return
*/
@PUT(Constants.RECEIVE_PART)
@PUT(OrderConstant.RECEIVE_PART)
Observable<BaseResponse<Boolean>> receivePart(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
......@@ -214,7 +214,7 @@ import retrofit2.http.Query;
* @param reason
* @return
*/
@POST(Constants.REFUSE_ONE_PART)
@POST(OrderConstant.REFUSE_ONE_PART)
Observable<BaseResponse<Boolean>> refusePart(@Query("kaOrderSparePartsId") long kaOrderSparePartsId,
@Query("reason") String reason);
......@@ -225,7 +225,7 @@ import retrofit2.http.Query;
* @param sources
* @return
*/
@GET(Constants.QUERY_PART_LIST)
@GET(OrderConstant.QUERY_PART_LIST)
Observable<BaseResponse<List<OrderPart>>> queryPart(@Query("spOrderId") long spOrderId, @Query("sources") int sources);
/**
......@@ -234,7 +234,7 @@ import retrofit2.http.Query;
* @param body
* @return
*/
@PUT(Constants.MODIFY_PART)
@PUT(OrderConstant.MODIFY_PART)
Observable<BaseResponse<Boolean>> modifyPart(@Body RequestBody body);
/**
......@@ -242,7 +242,7 @@ import retrofit2.http.Query;
*
* @return
*/
@GET(Constants.QUERY_LOGISTICS_INFO)
@GET(OrderConstant.QUERY_LOGISTICS_INFO)
Observable<BaseResponse<LogsticsInfo>> queryLogistics(@Query("com") String com, @Query("num") String num);
/**
......@@ -250,7 +250,7 @@ import retrofit2.http.Query;
*
* @return
*/
@GET(Constants.QUERY_SHIPPER_COMPANY)
@GET(OrderConstant.QUERY_SHIPPER_COMPANY)
Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany();
}
orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java
......@@ -12,4 +12,107 @@ public class OrderConstant {
public final static int ORDER_SOP_FINISH = 5;//SOP已完成
public final static int ORDER_FINISH = 6;//已完成
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
/**
* 异常单获取.
*/
public static final String ERROR_ORDER = "/api-order/" + "orders/findExceptionSimpleOrderVO";
/**
* 工程师接单.
*/
public static final String ORDER_RECEIVING = "/api-order/" + "orders/{orderId}/engineer/{engineerId}";
/**
* 重新预约时间.
*/
public static final String API_SUBCRIBE_TIME = "/api-order/" + "orders/bespeakDoor";
/**
* 开始出发.
*/
public static final String START_ORDER = "/api-order/" + "orders/onWayUpgrade";
/**
* 开始服务.
*/
public static final String START_SERVE = "/api-order/" + "orders/onWorkingUpgrade";
/**
* 工单详情信息,包含评价,投诉,服务记录.
*/
public static final String ORDER_DETAILS = "/api-order/" + "orders/{orderId}/detail";
/**
* 工单完成,提交验收报告.
*/
public static final String API_ORDER_FINISH = "/api-order/" + "orders/waitCustomerCheckUpgrade";
/**
* 单表查询工单记录.
*/
public final static String SELECT_ORDER_LITTLE = "/api-order/" + "orders/{id}";
/**
* 分页获取工单.
*/
public final static String ORDERS = "/api-order/" + "orders/findSimpleOrderVOByPage";
/**
* 获取首页tab状态的数量.
*/
public final static String TAB_NUM = "/api-order/" + "orders/{userId}/count/siteId/{siteId}";
/**
* 获取服务说明.
*/
public final static String ORDER_INSTRUCTION = "/api-ka-base/" + "spuServiceDetail";
/**
* 获取厂商收货地址.
*/
public final static String KA_ADDRESS = "/api-ka-user/" + "companyAddress/default/companyId/{companyId}";
/**
* 申请备件.
*/
public final static String APPLY_ONE_PART = "/api-ka-order/" + "kaOrderSpareParts/saveSpApplyParts";
/**
* 取消申请备件.
*/
public final static String CANCLE_APPLY_PART = "/api-ka-order/" + "kaOrderSpareParts/spCancelApplyParts";
/**
* sp主动寄回备件.
*/
public final static String RETURN_PART_SELF = "/api-ka-order/" + "kaOrderSpareParts/spExpressBack";
/**
* sp按ka要求寄回备件.
*/
public final static String RETURN_PART_BY_KA = "/api-ka-order/" + "kaOrderSpareParts/spExpressBackByka";
/**
* 收到备件.
*/
public final static String RECEIVE_PART = "/api-ka-order/" + "kaOrderSpareParts/spReceivedParts";
/**
* 获取备件列表.
*/
public final static String QUERY_PART_LIST = "/api-ka-order/" + "kaOrderSpareParts/queryOrderPartList";
/**
* 拒绝申请备件.
*/
public final static String REFUSE_ONE_PART = "/api-ka-order/" + "kaOrderSpareParts/refuse";
/**
* 查询物流信息.
*/
public final static String QUERY_LOGISTICS_INFO = "/api-base/" + "logisticsTraceInfo/queryLogisticsTraceInfo";
/**
* 查询物流信息.
*/
public final static String QUERY_SHIPPER_COMPANY = "/api-base/" + "shipperCompany/queryShipperList";
/**
* 修改备件信息.
*/
public final static String MODIFY_PART = "/api-ka-order/" + "kaOrderSpareParts";
}
orderCenter/src/main/java/com/dayu/order/event/OrderState.java deleted 100644 → 0
package com.dayu.order.event;
/**
* 刷新待服务列表条目.
* on 2017/9/20.
*/
public class OrderState {
private int position;
private int state;
private String time;
public OrderState(int state, int position) {
this.position = position;
this.state = state;
}
public OrderState(int state, int position, String time) {
this.position = position;
this.state = state;
this.time = time;
}
public int getPosition() {
return position;
}
public void setPosition(int position) {
this.position = position;
}
public int getState() {
return state;
}
public void setState(int state) {
this.state = state;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
}
orderCenter/src/main/java/com/dayu/order/presenter/commonSubmite/ApplayAndRefusePresenter.java
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.event.RefreshApplyPart;
import com.dayu.provider.event.RefreshApplyPart;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.RefreshTab;
import com.dayu.provider.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.ui.activity.OrderDetailsActivity;
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
......@@ -9,17 +9,17 @@ import android.text.TextUtils;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.event.OrderState;
import com.dayu.order.greendao.GreenDaoManager;
import com.dayu.order.greendao.OrderInfoDao;
import com.dayu.order.sqlbean.OrderInfo;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.provider.event.OrderState;
import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.UserManager;
import com.luck.picture.lib.tools.PictureFileUtils;
import com.umeng.analytics.MobclickAgent;
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -6,14 +6,14 @@ import android.os.Bundle;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.RefreshReceivingNum;
import com.dayu.event.RefreshTab;
import com.dayu.provider.event.RefreshReceivingNum;
import com.dayu.provider.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.event.RefreshApoiment;
import com.dayu.order.event.SwtichFragment;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.provider.event.SwtichFragment;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......
orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartPresenter.java
......@@ -8,7 +8,7 @@ import com.dayu.event.UserInfo;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderPart;
import com.dayu.order.api.protocol.ShipperCompany;
import com.dayu.order.event.RefreshApplyPart;
import com.dayu.provider.event.RefreshApplyPart;
import com.dayu.order.ui.activity.KaAddressActivity;
import com.dayu.utils.UserManager;
......
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
......@@ -6,12 +6,12 @@ import android.text.TextUtils;
import android.view.View;
import com.dayu.common.Constants;
import com.dayu.event.RefreshTab;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.event.OrderState;
import com.dayu.order.event.RefreshApoiment;
import com.dayu.order.event.RefreshServe;
import com.dayu.provider.event.OrderState;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import com.dayu.utils.UtilsUserAccountMatcher;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
......@@ -15,7 +15,7 @@ import com.dayu.order.presenter.orderdetail.OrderDetailPresenter;
import com.dayu.order.ui.fragment.OrderDetaillsFragment;
import com.dayu.order.ui.fragment.OrderDetailsServeFragment;
import com.dayu.order.ui.fragment.OrderPartFragment;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
......@@ -24,7 +24,7 @@ import java.util.ArrayList;
* 工单详情信息页面，包含工单详情、服务记录、备件信息.
* on 2017/9/13.
*/
@Route(path = BaseRouterPath.PATH_ORDER_DETAIL)
@Route(path = RouterPath.PATH_ORDER_DETAIL)
public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding>
implements OrderDetailContract.View {
private OrderDetaillsFragment orderDatailsFragment;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java
......@@ -13,7 +13,7 @@ import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.presenter.worksRecord.OrderRecordContract;
import com.dayu.order.presenter.worksRecord.OrderRecordPresenter;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.analytics.MobclickAgent;
......@@ -21,7 +21,7 @@ import com.umeng.analytics.MobclickAgent;
* 工单记录，展示已完成的订单
* on 2017/9/29.
*/
@Route(path = BaseRouterPath.PATH_ORDER_HISTORY)
@Route(path = RouterPath.PATH_ORDER_HISTORY)
public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, ActivityOrderRecordBinding>
implements OrderRecordContract.View {
private OrderAdapter mAdapter;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
......@@ -17,7 +17,7 @@ import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityWebviewBinding;
import com.dayu.order.event.OrderState;
import com.dayu.provider.event.OrderState;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -9,12 +9,12 @@ import android.view.View;
import com.amap.api.location.AMapLocation;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.common.Constants;
import com.dayu.event.RefreshTab;
import com.dayu.provider.event.RefreshTab;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.event.RefreshServe;
import com.dayu.provider.event.RefreshServe;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.ui.activity.ProcessOrderActivity;
import com.dayu.order.ui.activity.SopWebViewActivity;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/ApplicationOrderPartFragment.java
......@@ -7,7 +7,7 @@ import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentOrderApplicationPartBinding;
import com.dayu.order.event.RefreshApplyPart;
import com.dayu.provider.event.RefreshApplyPart;
import com.dayu.order.presenter.orderpart.OrderPartContract;
import com.dayu.order.presenter.orderpart.OrderPartPresenter;
import com.dayu.order.ui.adapter.OrderPartAdapter;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
......@@ -11,7 +11,7 @@ import android.widget.TextView;
import com.dayu.base.ui.adapter.FragmentAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.event.RefreshTab;
import com.dayu.provider.event.RefreshTab;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Tab;
import com.dayu.order.databinding.FragmentOrderHomeBinding;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFirstTabFragment.java
......@@ -6,7 +6,7 @@ import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentCommomRecycleBinding;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.event.RefreshApoiment;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.presenter.orderdoing.orderDoingContract;
import com.dayu.order.ui.adapter.OrderAdapter;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderSecondTabFragment.java
......@@ -6,11 +6,11 @@ import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentCommomRecycleBinding;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.event.OrderState;
import com.dayu.order.event.RefreshServe;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.presenter.orderdoing.orderDoingContract;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.provider.event.OrderState;
import com.dayu.provider.event.RefreshServe;
import com.dayu.utils.ProgressUtil;
import com.dayu.widgets.listener.OnItemClickListener;
......@@ -54,7 +54,7 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr
mAdapter = new OrderAdapter(true, R.layout.fragment_orderdoing_item);
mAdapter.initPresenter(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderdoingItemBinding>() {
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
mPresenter.dumpDetail(item.getId());
......
provider/src/main/java/com/dayu/provider/common/ProviderConstant123.java → provider/src/main/java/com/dayu/provider/common/ProviderConstant.java
......@@ -5,7 +5,7 @@ package com.dayu.provider.common;
* on 2018/2/7.
*/
public class ProviderConstant123 {
public class ProviderConstant {
/**
* 订单id.
*/
......
app/src/main/java/com/dayu/bigfish/bean/event/OrderState.java → provider/src/main/java/com/dayu/provider/event/OrderState.java 100755 → 100644
package com.dayu.bigfish.bean.event;
package com.dayu.provider.event;
/**
* 刷新待服务列表条目.
......
baseLibrary/src/main/java/com/dayu/event/RefreshTab.java → provider/src/main/java/com/dayu/provider/event/RefreshTab.java
package com.dayu.event;
package com.dayu.provider.event;
/**
* 刷新各tab状态的数量
......
orderCenter/src/main/java/com/dayu/order/event/SwtichFragment.java → provider/src/main/java/com/dayu/provider/event/SwtichFragment.java
package com.dayu.order.event;
package com.dayu.provider.event;
/**
* Created by luofan on 2017/12/1.
......
provider/src/main/java/com/dayu/provider/router/BaseRouterPath.java → provider/src/main/java/com/dayu/provider/router/RouterPath.java
......@@ -5,7 +5,7 @@ package com.dayu.provider.router;
* on 2018/2/7.
*/
public class BaseRouterPath {
public class RouterPath {
/**
* APP.
*/
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService.java
......@@ -3,8 +3,8 @@ package com.dayu.usercenter.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.data.protocol.AccountBalance;
import com.dayu.usercenter.data.protocol.AlipayInfo;
import com.dayu.usercenter.data.protocol.EngineerInfo;
......@@ -30,7 +30,7 @@ public interface UserService {
*
* @return
*/
@POST(Constants.LOGIN_URL)
@POST(UserConstant.LOGIN_URL)
Observable<BaseResponse<UserInfo>> login(@Query("telephone") String phone
, @Query("smsCode") String smsCode);
......@@ -39,7 +39,7 @@ public interface UserService {
*
* @return
*/
@GET(Constants.REGISTER_URL)
@GET(UserConstant.REGISTER_URL)
Observable<BaseResponse<Boolean>> sendCode(@Path("telephone") String telephone, @Path("type") int type);
/**
......@@ -48,7 +48,7 @@ public interface UserService {
* @param accountId
* @return
*/
@GET(Constants.PERSONAL_CENTER)
@GET(UserConstant.PERSONAL_CENTER)
Observable<BaseResponse<EngineerInfo>> getEngineerInfo(@Path("accountId") int accountId);
/**
......@@ -57,7 +57,7 @@ public interface UserService {
* @param body
* @return
*/
@PUT(Constants.MODIFY_USER_INFO)
@PUT(UserConstant.MODIFY_USER_INFO)
Observable<BaseResponse<EngineerInfo>> modifyUserInfo(@Body RequestBody body);
/**
......@@ -67,7 +67,7 @@ public interface UserService {
* @param headURL
* @return
*/
@PUT(Constants.MODIFY_USER_HEADER)
@PUT(UserConstant.MODIFY_USER_HEADER)
Observable<BaseResponse<Boolean>> modifyHead(@Query("accountId") int accoutId, @Query("headURL") String headURL);
/**
......@@ -77,7 +77,7 @@ public interface UserService {
* @param engineerId
* @return
*/
@GET(Constants.USER_ORDER_REVENUE)
@GET(UserConstant.USER_ORDER_REVENUE)
Observable<BaseResponse<TodayAchievement>> getAchievement(@Path("siteId") int siteId,
@Path("engineerId") int engineerId);
......@@ -88,7 +88,7 @@ public interface UserService {
* @param engineerId
* @return
*/
@GET(Constants.USER_REVENUE)
@GET(UserConstant.USER_REVENUE)
Observable<BaseResponse<OrderRecord>> getOrderScore(@Path("siteId") int siteId,
@Path("engineerId") int engineerId);
......@@ -98,7 +98,7 @@ public interface UserService {
* @param accountId
* @return
*/
@GET(Constants.PERSONAL_ACOUNT_BALANCE)
@GET(UserConstant.PERSONAL_ACOUNT_BALANCE)
Observable<BaseResponse<TodayBalance>> getTodayBalance(@Path("accountId") int accountId);
/**
......@@ -107,7 +107,7 @@ public interface UserService {
* @param accountId
* @return
*/
@GET(Constants.PERSONAL_ALIPAY_QUERY)
@GET(UserConstant.PERSONAL_ALIPAY_QUERY)
Observable<BaseResponse<AlipayInfo>> queryAlipay(@Path("accountId") int accountId);
/**
......@@ -118,7 +118,7 @@ public interface UserService {
* @param accountId
* @return
*/
@GET(Constants.PERSONAL_ACCOUT_LIST)
@GET(UserConstant.PERSONAL_ACCOUT_LIST)
Observable<BaseResponse<BasePageBean<AccountBalance>>> getAccountBalanceList(@Query("page") int page,
@Query("pageSize") int pageSize,
@Query("accountId") int accountId);
......@@ -130,7 +130,7 @@ public interface UserService {
* @param body
* @return
*/
@POST(Constants.PERSONAL_ALIPAY_BOUND)
@POST(UserConstant.PERSONAL_ALIPAY_BOUND)
Observable<BaseResponse<Boolean>> boundAlipay(@Body RequestBody body);
/**
......@@ -139,6 +139,6 @@ public interface UserService {
* @param body
* @return
*/
@POST(Constants.PERSONAL_ALIPAY_MODIFY)
@POST(UserConstant.PERSONAL_ALIPAY_MODIFY)
Observable<BaseResponse<Boolean>> modifyAlipay(@Body RequestBody body);
}
userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java 0 → 100644
package com.dayu.usercenter.common;
/**
* Created by luofan
* on 2018/2/9.
*/
public class UserConstant {
/**
* 登录.
*/
public static final String LOGIN_URL = "/check";
/**
* 修改用户信息.
*/
public static final String MODIFY_USER_INFO = "/api-user/" + "auditInfo/accountReAuthenticate";
/**
* 登录时发送验证码
*/
public static final String REGISTER_URL = "/api-user/" + "account/loginSms/{telephone}/type/{type}";
/**
* 修改用户头像.
*/
public static final String MODIFY_USER_HEADER = "/api-user/" + "/account/modifyHeadURL";
/**
* 获取工程师信息.
*/
public static final String PERSONAL_CENTER = "/api-user/" + "engineerInfo/accountId/{accountId}";
/**
* 工程师今日收益.
*/
public static final String PERSONAL_ACOUNT_BALANCE = "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/{accountId}";
/**
* 工程师账户余额.
*/
public static final String PERSONAL_ACCOUT_LIST = "/api-settlement/" + "payStream/queryPayStream/";
/**
* 绑定支付宝账号.
*/
public static final String PERSONAL_ALIPAY_BOUND = "/api-settlement/" + "alipay/save";
/**
* 查询支付宝账号.
*/
public static final String PERSONAL_ALIPAY_QUERY = "/api-settlement/" + "alipay/queryAlipayByAccountId/accountId/{accountId}";
/**
* 修改支付宝账号.
*/
public static final String PERSONAL_ALIPAY_MODIFY = "/api-settlement/" + "alipay/modifyAlipay";
/**
* 根据工程师id和工程师id获取今日业绩(今日收益).
*/
public final static String USER_ORDER_REVENUE = "/api-count/" + "ordersStatistics/income/siteId/{siteId}/engineerId/{engineerId}";
/**
* 服务记录、工程师评价.
*/
public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/siteId/{siteId}/engineerId/{engineerId}";
}
userCenter/src/main/java/com/dayu/usercenter/presenter/login/LoginPresenter.java
......@@ -6,7 +6,7 @@ import android.text.TextUtils;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.common.BaseApplication;
import com.dayu.event.UserInfo;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.ui.activity.AgreementActivity;
......@@ -114,7 +114,7 @@ public class LoginPresenter extends LoginContract.Presenter {
@Override
public void dumpAndSave(UserInfo info) {
UserManager.getInstance().saveUser(info);
ARouter.getInstance().build(BaseRouterPath.PATH_MAIN).navigation();
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// mView.startActivity(TestActivity.class);
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/LoginActivity.java
......@@ -58,6 +58,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> im
.setOneButton(true);
customDialog.show();
}
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
......@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.data.protocol.EngineerInfo;
import com.dayu.usercenter.data.protocol.OrderRecord;
......@@ -153,14 +153,14 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override
public void dumpToSetting() {
ARouter.getInstance().build(BaseRouterPath.PATH_SETTING).navigation();
ARouter.getInstance().build(RouterPath.PATH_SETTING).navigation();
MobclickAgent.onEvent(mActivity, "setting");
}
@Override
public void dumpToOrderRecord() {
Bundle bundle = new Bundle();
ARouter.getInstance().build(BaseRouterPath.PATH_ORDER_HISTORY).navigation();
ARouter.getInstance().build(RouterPath.PATH_ORDER_HISTORY).navigation();
MobclickAgent.onEvent(mActivity, "order_record");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment