Skip to content

android / dayu

Go to a project
Commit ae60479a by 罗翻
Options

增加ordercenter和loctionlib

parent 279c9f45 master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_250414_sop dev_xx_web test v2.7.2 v2.7.1 v2.7.0 v2.6.9 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.5.9 v2.5.7 v2.5.5 v2.5.4 v2.5.3 v2.5.2 v2.5.0 v2.4.6 v2.4.5 v2.4.0 v_2.4.0 v2.3.2 v2.3.1 dev20230405 android_v1.6.0
Inline Side-by-side
Showing with 1506 additions and 1654 deletions
app/build.gradle
apply plugin: 'com.android.application'
apply plugin: 'org.greenrobot.greendao'
android {
......@@ -44,17 +42,18 @@ android {
release {
signingConfig android.signingConfigs.release
minifyEnabled true
shrinkResources true //是否清理无用资源,依赖于minifyEnabled
shrinkResources false //是否清理无用资源,依赖于minifyEnabled
zipAlignEnabled true //是否启用zipAlign压缩
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
signingConfig android.signingConfigs.release
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
main {
//jni库的调用会到资源文件夹下libs里面找so文件
......@@ -63,11 +62,6 @@ android {
}
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
dataBinding {
enabled = true
......@@ -81,36 +75,31 @@ android {
}
}
greendao {
schemaVersion 2
daoPackage 'com.dayu.bigfish.greendao'
targetGenDir 'src/main/java'
}
repositories {
mavenCentral()
maven { url 'https://maven.google.com' }
flatDir{
dirs 'libs'
}
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
//greendao数据库
compile 'org.greenrobot:greendao:3.2.0'
//日期选择器
compile 'com.contrarywind:Android-PickerView:3.2.7'
//jsbridge
compile 'com.github.lzyzsd:jsbridge:1.0.4'
annotationProcessor project(':apt')
compile project(':annotation_lib')
compile project(':provider')
compile project(':messageCenter')
compile project(':userCenter')
compile project(':orderCenter')
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
if (isMessageModule.toBoolean()) {
compile project(':messageCenter')
}
if (isUserModule.toBoolean()) {
compile project(':userCenter')
}
if (isOrderModule.toBoolean()) {
compile project(':orderCenter')
}
// compile(name: 'provider-debug', ext: 'aar')
}
app/proguard-rules.pro
......@@ -113,9 +113,9 @@
#-------------------------------------------定制化区域----------------------------------------------
#---------------------------------1.实体类---------------------------------
-keep class com.dayu.bigfish.bean.** { *; }
-keep class com.dayu.bigfish.base.** { *; }
#TODO
#-keep class com.dayu.bigfish.bean.** { *; }
#-keep class com.dayu.bigfish.base.** { *; }
#-------------------------------------------------------------------------
......@@ -196,7 +196,7 @@ public static java.lang.String TABLENAME;
#环信
-keep class com.hyphenate.** {*;}
-dontwarn com.hyphenate.**
-dontwarn com.hyphenate.**
#高德地图
-keep class com.amap.api.location.**{*;}
......@@ -231,13 +231,19 @@ public static final int *;
-keep public class com.alibaba.android.arouter.routes.**{*;}
-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
-keep class * implements com.alibaba.android.arouter.facade.template.IProvider
#---------------------------------3.与js互相调用的类------------------------
#---------------------------------4.反射相关的类和方法-----------------------
#-dontwarn com.alibaba.**
#-ignorewarnings
......
app/src/main/AndroidManifest.xml
......@@ -119,96 +119,18 @@
android:name=".InitializeActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.LoginActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".ui.ReceivingActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" />
<activity
android:name=".ui.OrderRecordActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" />
<activity
android:name=".ui.SettingActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.SubcribeTimeActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.OrderDetailsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.ProcessOrderActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".ui.PreviewActivty"
android:screenOrientation="portrait" />
<activity
android:name=".ui.AboutUsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.CommonSubmiteActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.AccountBalanceActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.WithdrawalsActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.AgreementActivity"
android:name=".ui.FeedBackActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.message.ui.activity.MessageDetailActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.SopWebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.PersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.ModifyPersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.usercenter.ui.activity.MyHeaderIvActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.ServerInstructionActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.WebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.KaAddressActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.ReturnPartActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.LogisticsInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.QrCodeActivity"
android:screenOrientation="portrait" />
<service android:name="com.dayu.base.api.DownloadService" />
<receiver android:name=".utils.NetworkConnectChangedReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.wifi.STATE_CHANGE" />
</intent-filter>
</receiver>
</application>
......
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
......@@ -15,7 +15,7 @@ import android.widget.Toast;
import com.dayu.usercenter.ui.activity.LoginActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.utils.MPermissionUtils;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
......@@ -8,12 +8,12 @@ import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Handler;
import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.bigfish.utils.NetworkConnectChangedReceiver;
import com.dayu.bigfish.utils.managers.HxManager;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.greendao.GreenDaoManager;
import com.dayu.utils.NetworkConnectChangedReceiver;
import com.umeng.analytics.MobclickAgent;
import com.umeng.analytics.MobclickAgent.EScenarioType;
import com.umeng.commonsdk.UMConfigure;
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -3,15 +3,6 @@ package com.dayu.bigfish.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.KaAddress;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.common.Constants;
import com.dayu.message.data.protocol.NewMessage;
......@@ -26,7 +17,6 @@ import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Multipart;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Part;
import retrofit2.http.Path;
import retrofit2.http.Query;
......@@ -65,85 +55,6 @@ public interface APIService {
@GET(Constants.UPGRADE_VERSION)
Observable<BaseResponse<VersionInfo>> getVersionInfo(@Query("appId") String appId, @Query("versionCode") String versionCode);
/**
* 获取异常订单列表.
*
* @param siteId
* @return
*/
@GET(Constants.ERROR_ORDER)
Observable<BaseResponse<List<ErrorOrder>>> getErrorOrders(@Query("engineerId") int userId, @Query("siteId") int siteId);
/**
* 工程师接单
*
* @param orderId
* @param engineerId
* @return
*/
@GET(Constants.ORDER_RECEIVING)
Observable<BaseResponse<Boolean>> receiveOrder(@Path("orderId") int orderId,
@Path("engineerId") int engineerId);
/**
* 预约上门时间.
*
* @param orderId
* @param doorTime
* @param doorComment
* @return
*/
@POST(Constants.SUBCRIBE_TIME)
Observable<BaseResponse<Boolean>> subcriceTime(@Query("orderId") int orderId,
@Query("doorTime") String doorTime,
@Query("doorComment") String doorComment);
/**
* 我已出发.
*
* @param body
* @return
*/
@POST(Constants.START_ORDER)
Observable<BaseResponse<Integer>> startOrder(@Body RequestBody body);
/**
* 开始服务.
*
* @param body
* @return
*/
@POST(Constants.START_SERVE)
Observable<BaseResponse<Integer>> startServer(@Body RequestBody body);
/**
* 获取工单详情信息.
*
* @param orderId
* @return
*/
@GET(Constants.ORDER_DETAILS)
Observable<BaseResponse<OrderDetail>> getOrderInfo(@Path("orderId") int orderId);
/**
* 提交工单.
*
* @param orderInfo
* @return
*/
@POST(Constants.ORDER_FINISH)
Observable<BaseResponse<Integer>> commitOrder(@Body RequestBody orderInfo);
/**
* 单表查询工单记录.
*
* @param id
* @return
*/
@GET(Constants.SELECT_ORDER_LITTLE)
Observable<BaseResponse<OrderDetail>> queryOrderInfo(@Path("id") int id);
/**
* 意见反馈.
*
......@@ -153,32 +64,6 @@ public interface APIService {
@POST(Constants.SET_IDEA_COMMIT)
Observable<BaseResponse<Boolean>> postFeedBack(@Body RequestBody body);
/**
* 获取工单记录列表.
*
* @param state
* @param engineerId
* @param siteId
* @param page
* @param pageSize
* @return
*/
@GET(Constants.ORDERS)
Observable<BaseResponse<BasePageBean<Order>>> getOrders(@Query("state") int state,
@Query("engineerId") int engineerId,
@Query("siteId") int siteId,
@Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 获取tab数量.
*
* @param userId
* @return
*/
@GET(Constants.TAB_NUM)
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId, @Path("siteId") int siteId);
/**
* 获取环信信息.
......@@ -226,124 +111,6 @@ public interface APIService {
Observable<BaseResponse<List<String>>> uploadPhoto(
@Part MultipartBody.Part part);
/**
* 获取服务说明.
*
* @param id
* @return
*/
@GET(Constants.ORDER_INSTRUCTION)
Observable<BaseResponse<BasePageBean<ServerInstruction>>> getInstruction(@Query("kaSpuId") long id, @Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 获取厂商收货地址.
*
* @param companyId
* @return
*/
@GET(Constants.KA_ADDRESS)
Observable<BaseResponse<KaAddress>> getKaAddress(@Path("companyId") int companyId);
/**
* 申请备件.
*
* @param spOrderId
* @param spComment
* @param createBy
* @return
*/
@POST(Constants.APPLY_ONE_PART)
Observable<BaseResponse<Boolean>> applyPart(@Query("spOrderId") long spOrderId,
@Query("spComment") String spComment,
@Query("createBy") String createBy,
@Query("accountId") long accountId);
/**
* 取消申请备件.
*
* @param partsId
* @param modifyBy
* @return
*/
@PUT(Constants.CANCLE_APPLY_PART)
Observable<BaseResponse<Boolean>> cancleApply(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
/**
* sp主动寄回备件.
*
* @param body
* @return
*/
@POST(Constants.RETURN_PART_SELF)
Observable<BaseResponse<Boolean>> returnPartSelf(@Body RequestBody body);
/**
* sp按ka要求寄回备件.
*
* @param body
* @return
*/
@PUT(Constants.RETURN_PART_BY_KA)
Observable<BaseResponse<Boolean>> returnPartByKA(@Body RequestBody body);
/**
* 收到备件.
*
* @param partsId
* @param modifyBy
* @return
*/
@PUT(Constants.RECEIVE_PART)
Observable<BaseResponse<Boolean>> receivePart(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
/**
* 拒绝申请备件.
*
* @param kaOrderSparePartsId
* @param reason
* @return
*/
@POST(Constants.REFUSE_ONE_PART)
Observable<BaseResponse<Boolean>> refusePart(@Query("kaOrderSparePartsId") long kaOrderSparePartsId,
@Query("reason") String reason);
/**
* 获取备件列表.
*
* @param spOrderId
* @param sources
* @return
*/
@GET(Constants.QUERY_PART_LIST)
Observable<BaseResponse<List<OrderPart>>> queryPart(@Query("spOrderId") long spOrderId, @Query("sources") int sources);
/**
* 修改备件信息.
*
* @param body
* @return
*/
@PUT(Constants.MODIFY_PART)
Observable<BaseResponse<Boolean>> modifyPart(@Body RequestBody body);
/**
* 查询物流信息.
*
* @return
*/
@GET(Constants.QUERY_LOGISTICS_INFO)
Observable<BaseResponse<LogsticsInfo>> queryLogistics(@Query("com") String com, @Query("num") String num);
/**
* 查询物流公司.
*
* @return
*/
@GET(Constants.QUERY_SHIPPER_COMPANY)
Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany();
@Streaming
@GET
......
app/src/main/java/com/dayu/bigfish/api/ApiFactory.java
package com.dayu.bigfish.api;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.KaAddress;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.message.data.protocol.NewMessage;
import java.util.List;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/**
......@@ -40,120 +26,12 @@ public class ApiFactory {
return Api.getService(APIService.class).getVersionInfo(appId, versionCode).compose(Api.applySchedulers());
}
public static Observable<List<ErrorOrder>> getErrorOrders(int userId, int siteId) {
return Api.getService(APIService.class).getErrorOrders(userId, siteId).compose(Api.applySchedulers());
}
public static Observable<Boolean> receiveOrder(int orderId, int engineerId) {
return Api.getService(APIService.class).receiveOrder(orderId, engineerId).compose(Api.applySchedulers());
}
public static Observable<Boolean> subcriceTime(int orderId, String doorTime, String doorComment) {
return Api.getService(APIService.class).subcriceTime(orderId, doorTime, doorComment).compose(Api.applySchedulers());
}
public static Observable<Integer> startOrder(RequestBody body) {
return Api.getService(APIService.class).startOrder(body).compose(Api.applySchedulers());
}
public static Observable<Integer> startServer(RequestBody body) {
return Api.getService(APIService.class).startServer(body).compose(Api.applySchedulers());
}
public static Observable<OrderDetail> getOrderInfo(int orderId) {
return Api.getService(APIService.class).getOrderInfo(orderId).compose(Api.applySchedulers());
}
public static Observable<Integer> commitOrder(RequestBody orderInfo) {
return Api.getService(APIService.class).commitOrder(orderInfo).compose(Api.applySchedulers());
}
public static Observable<OrderDetail> queryOrderInfo(int orderId) {
return Api.getService(APIService.class).queryOrderInfo(orderId).compose(Api.applySchedulers());
}
public static Observable<Boolean> postFeedBack(RequestBody body) {
return Api.getService(APIService.class).postFeedBack(body).compose(Api.applySchedulers());
}
public static Observable<BasePageBean<Order>> getOrders(int state, int engineerId, int siteId, int page, int pageSize) {
return Api.getService(APIService.class).getOrders(state, engineerId, siteId, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<Tab> getTabNum(int userId, int siteId) {
return Api.getService(APIService.class).getTabNum(userId, siteId).compose(Api.applySchedulers());
}
public static Observable<BasePageBean<NewMessage>> getHxMessage(String hxAccount, int category, int page, int pageSize) {
return Api.getService(APIService.class).getHxMessage(hxAccount, category, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<Integer> getHxNum(String hxAccount) {
return Api.getService(APIService.class).getHxNum(hxAccount).compose(Api.applySchedulers());
}
public static Observable<List<String>> uploadPhoto(MultipartBody.Part[] partMap) {
return Api.getService(APIService.class).uploadPhoto(partMap).compose(Api.applySchedulers());
}
public static Observable<List<String>> uploadPhoto(MultipartBody.Part part) {
return Api.getService(APIService.class).uploadPhoto(part).compose(Api.applySchedulers());
}
public static Observable<BasePageBean<ServerInstruction>> getInstruction(long id, int page, int pageSize) {
return Api.getService(APIService.class).getInstruction(id, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<KaAddress> getKaAddress(int companyId) {
return Api.getService(APIService.class).getKaAddress(companyId).compose(Api.applySchedulers());
}
public static Observable<Boolean> applyPart(long spOrderId, String spComment, String createBy, long accountId) {
return Api.getService(APIService.class).applyPart(spOrderId, spComment, createBy, accountId).compose(Api.applySchedulers());
}
public static Observable<Boolean> cancleApply(int partsId, String modifyBy) {
return Api.getService(APIService.class).cancleApply(partsId, modifyBy).compose(Api.applySchedulers());
}
public static Observable<Boolean> returnPartSelf(RequestBody body) {
return Api.getService(APIService.class).returnPartSelf(body).compose(Api.applySchedulers());
}
public static Observable<Boolean> returnPartByKA(RequestBody body) {
return Api.getService(APIService.class).returnPartByKA(body).compose(Api.applySchedulers());
}
public static Observable<Boolean> receivePart(int partsId, String modifyBy) {
return Api.getService(APIService.class).receivePart(partsId, modifyBy).compose(Api.applySchedulers());
}
public static Observable<Boolean> refusePart(long kaOrderSparePartsId, String reason) {
return Api.getService(APIService.class).refusePart(kaOrderSparePartsId, reason).compose(Api.applySchedulers());
}
public static Observable<List<OrderPart>> queryPart(long spOrderId, int sources) {
return Api.getService(APIService.class).queryPart(spOrderId, sources).compose(Api.applySchedulers());
}
public static Observable<Boolean> modifyPart(RequestBody body) {
return Api.getService(APIService.class).modifyPart(body).compose(Api.applySchedulers());
}
public static Observable<LogsticsInfo> queryLogistics(String com, String num) {
return Api.getService(APIService.class).queryLogistics(com, num).compose(Api.applySchedulers());
}
public static Observable<List<ShipperCompany>> queryShipperCompany() {
return Api.getService(APIService.class).queryShipperCompany().compose(Api.applySchedulers());
}
}
app/src/main/java/com/dayu/bigfish/bean/AlipayInfo.java deleted 100644 → 0
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class AlipayInfo {
/**
* id : 2
* accountId : 454
* alipayAccount : guj
* alipayName : chj
* alipayMobile : 13567810832
* createTime : 2017-11-02 10:06:36
* updateTime : 2017-11-02 11:02:19
*/
private int id;
private int accountId;
private String alipayAccount;
private String alipayName;
private String alipayMobile;
private String createTime;
private String updateTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getAlipayAccount() {
return alipayAccount;
}
public void setAlipayAccount(String alipayAccount) {
this.alipayAccount = alipayAccount;
}
public String getAlipayName() {
return alipayName;
}
public void setAlipayName(String alipayName) {
this.alipayName = alipayName;
}
public String getAlipayMobile() {
return alipayMobile;
}
public void setAlipayMobile(String alipayMobile) {
this.alipayMobile = alipayMobile;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
}
app/src/main/java/com/dayu/bigfish/presenter/feedBack/FeedBackContract.java 0 → 100755
package com.dayu.bigfish.presenter.feedBack;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.common.BaseView;
/**
* Created by luo
* on 2016/8/4.
*/
public interface FeedBackContract {
interface View extends BaseView {
}
abstract class Presenter extends BasePresenter<View> {
public abstract void commite();
/**
* 提交反馈意见.
*/
public abstract void comFirmSuggist();
}
}
app/src/main/java/com/dayu/bigfish/presenter/feedBack/FeedBackPresenter.java 0 → 100644
package com.dayu.bigfish.presenter.feedBack;
import android.databinding.ObservableField;
import android.text.TextUtils;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsUserAccountMatcher;
import org.json.JSONObject;
import java.util.HashMap;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* Created by luofan
* on 2017/11/8.
*/
public class FeedBackPresenter extends FeedBackContract.Presenter {
private String mUserName;
private String mUserMobile;
public ObservableField<String> mComment = new ObservableField<>();
public ObservableField<String> mTitle = new ObservableField<>();
public ObservableField<String> mHint = new ObservableField<>();
@Override
public void onAttached() {
mUserName = UserManager.getInstance().getUser().getAccountName();
mUserMobile = UserManager.getInstance().getUserPhone();
mHint.set(UIUtils.getString(R.string.tv_idea_text_hint));
mTitle.set(UIUtils.getString(R.string.tv_idea));
}
@Override
public void commite() {
if (TextUtils.isEmpty(mComment.get())) {
mView.showToast(R.string.input_content);
return;
}
if (UtilsUserAccountMatcher.containsEmoji(mComment.get())) {
ToastUtils.showShortToast(R.string.no_emoij);
return;
}
comFirmSuggist();
}
@Override
public void comFirmSuggist() {
HashMap<String, Object> params = new HashMap<>();
params.put("comment", mComment.get());
params.put("created", mUserName);
params.put("deal", 2);
params.put("mobile", mUserMobile);
params.put("platform", 1);
params.put("status", 1);
params.put("suggestName", mUserName);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.postFeedBack(body).subscribe(baseObserver(aBoolean -> {
mView.showToast(R.string.commite_success);
mView.dumpBack();
}));
}
}
app/src/main/java/com/dayu/bigfish/presenter/homefirsttab/HomeFirstPresenter.java
package com.dayu.bigfish.presenter.homefirsttab;
import com.app.annotation.apt.InstanceFactory;
/**
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class HomeFirstPresenter extends HomeFirstContract.Presenter {
@Override
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
......@@ -2,12 +2,12 @@ package com.dayu.bigfish.presenter.main;
import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.utils.AppUtils;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.utils.AppUtils;
import com.dayu.utils.SPUtils;
import com.dayu.utils.UserManager;
......@@ -21,7 +21,6 @@ import okhttp3.RequestBody;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class MainPresenter extends MainContract.Presenter {
/**
* 待接单数目.
......@@ -83,14 +82,14 @@ public class MainPresenter extends MainContract.Presenter {
@Override
public void getReceiveOrder(int state, int userId, int siteId, int pagerId, int pagerSize) {
ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(
OrderApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(
orders -> tabRecive.set(orders.getTotalRows() + "")));
}
@Override
public void getHxNum(String accountId) {
ApiFactory.getHxNum(accountId).subscribe(baseObserver(integer -> {
if (integer.intValue() > 0) {
if (integer > 0) {
mView.isShowRedIcon(true);
}
}));
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
......@@ -7,17 +7,17 @@ import android.os.Bundle;
import android.os.Environment;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.AboutUsActivity;
import com.dayu.bigfish.ui.CommonSubmiteActivity;
import com.dayu.bigfish.ui.FeedBackActivity;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.usercenter.ui.activity.LoginActivity;
import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.utils.AppManager;
import com.dayu.utils.AppUtils;
import com.dayu.utils.DataCleanManager;
import com.dayu.utils.SPUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
......@@ -33,7 +33,6 @@ import io.reactivex.Observable;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class SettingPresenter extends SettingContract.Presenter {
public ObservableBoolean buttonState = new ObservableBoolean();
private String mHxAccount;
......@@ -92,7 +91,7 @@ public class SettingPresenter extends SettingContract.Presenter {
public void exite() {
EMClient.getInstance().logout(true);
UserManager.getInstance().clearUserInfo();
MyApplication.getAppContext().exiteAllActivity();
AppManager.getInstance().finishAllActivity();
mView.startActivity(LoginActivity.class);
MobclickAgent.onEvent(MyApplication.getContext(), "login_out");
}
......@@ -138,7 +137,7 @@ public class SettingPresenter extends SettingContract.Presenter {
public void dumpToFeed() {
Bundle bundle = new Bundle();
bundle.putInt(Constants.TYPE, Constants.FEED_BACK);
mView.startActivity(CommonSubmiteActivity.class, bundle);
mView.startActivity(FeedBackActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "feed_back");
}
......
app/src/main/java/com/dayu/bigfish/ui/CommonSubmiteActivity.java → app/src/main/java/com/dayu/bigfish/ui/FeedBackActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.databinding.ActivityFeedbackBinding;
import com.dayu.bigfish.presenter.commonSubmite.CommonSubmiteContract;
import com.dayu.bigfish.presenter.commonSubmite.CommonSubmitePresenter;
import com.dayu.bigfish.presenter.feedBack.FeedBackContract;
import com.dayu.bigfish.presenter.feedBack.FeedBackPresenter;
/**
* Created by luofan
* on 2017/11/8.
*/
public class CommonSubmiteActivity extends BaseActivity<CommonSubmitePresenter, ActivityFeedbackBinding>
implements CommonSubmiteContract.View {
public class FeedBackActivity extends BaseActivity<FeedBackPresenter, ActivityFeedbackBinding>
implements FeedBackContract.View {
@Override
public int getLayoutId() {
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -16,28 +16,29 @@ import android.view.View;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.api.DownloadService;
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.base.api.DownloadService;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.event.DownloadBean;
import com.dayu.bigfish.bean.event.RefreshReceivingNum;
import com.dayu.bigfish.bean.event.SwtichFragment;
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.location.base.LocationUtils;
import com.dayu.message.ui.fragment.HomeMessageFragment;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.order.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.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.provider.router.RouterPath;
import com.dayu.widgets.listener.onDownloadListener;
import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.common.Constants;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.onDownloadListener;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......@@ -50,7 +51,7 @@ import java.io.File;
* Created by luofan
* on 2017/11/20.
*/
@Route(path = RouterPath.PATH_MAIN)
@Route(path = BaseRouterPath.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.RouterPath;
import com.dayu.provider.router.BaseRouterPath;
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 = RouterPath.PATH_SETTING)
@Route(path = BaseRouterPath.PATH_SETTING)
public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySettingBinding>
implements SettingContract.View {
......
app/src/main/java/com/dayu/bigfish/utils/AESTool.java deleted 100755 → 0
package com.dayu.bigfish.utils;
import android.util.Base64;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
/**
* AES加解密的工具，主要用来解密导航文件
*/
public class AESTool {
public final String KEY_ALGORITHM = "AES";
public final String CIPHER_ALGORITHM = "AES/ECB/PKCS5Padding";
public AESTool() {
}
private Key toKey(byte[] key) throws Exception {
SecretKey secretKey = new SecretKeySpec(key, KEY_ALGORITHM);
return secretKey;
}
public byte[] encrypt(byte[] data, byte[] key) throws Exception {
Key k = toKey(key);
Cipher cipher;
try {
cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.ENCRYPT_MODE, k);
byte[] cryptograph = cipher.doFinal(data);
return Base64.encode(data, Base64.DEFAULT);
} catch (NoSuchAlgorithmException e) {
throw new Exception("15", e);
} catch (NoSuchPaddingException e) {
throw new Exception("15", e);
} catch (InvalidKeyException e) {
throw new Exception("15", e);
} catch (IllegalBlockSizeException e) {
throw new Exception("15", e);
} catch (BadPaddingException e) {
throw new Exception("15", e);
}
}
public byte[] decrypt(byte[] data, byte[] key) throws Exception {
Key k = toKey(key);
Cipher cipher = null;
try {
cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.DECRYPT_MODE, k);
return cipher.doFinal(Base64.decode(data, Base64.DEFAULT));
} catch (NoSuchAlgorithmException e) {
throw new Exception("5", e);
} catch (NoSuchPaddingException e) {
throw new Exception("5", e);
} catch (InvalidKeyException e) {
throw new Exception("5", e);
} catch (IllegalBlockSizeException e) {
throw new Exception("5", e);
} catch (BadPaddingException e) {
throw new Exception("5", e);
}
}
/**
* 输入流进行加密并保存到输出流
*
* @param salt (密钥),需要通过MD5Tool.getMD5Str("字符密钥")转换为字节数组
* @param is 输入流
* @param out 输出流
* @throws Exception
*/
public void encryptFile(byte[] salt, InputStream is, OutputStream out)
throws Exception {
CipherInputStream cis = null;
try {
Key k = toKey(salt);
Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.ENCRYPT_MODE, k);
cis = new CipherInputStream(is, cipher);
byte[] buffer = new byte[1024];
int r;
while ((r = cis.read(buffer)) > 0) {
out.write(buffer, 0, r);
}
} catch (Exception e) {
throw e;
} finally {
if (cis != null) {
cis.close();
}
}
}
/**
* 输入流进行解密并保存到输出流
*
* @param salt(密钥),需要通过MD5Tool.getMD5Str("字符密钥")转换为字节数组
* @param is 输入流
* @param out 输出流
* @throws Exception
*/
public void decryptFile(byte[] salt, InputStream is, OutputStream out) throws Exception {
CipherOutputStream cos = null;
try {
Key k = toKey(salt);
Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.DECRYPT_MODE, k);
cos = new CipherOutputStream(out, cipher);
byte[] buffer = new byte[1024];
int r;
while ((r = is.read(buffer)) >= 0) {
cos.write(buffer, 0, r);
}
} catch (Exception e) {
throw e;
} finally {
if (cos != null) {
cos.close();
}
}
}
/**
* 文件file进行加密并保存目标文件destFile中
*
* @param salt(密钥),需要通过MD5Tool.getMD5Str("字符密钥")转换为字节数组
* @param file 待转换文件路径
* @param destFile 转换后文件路径
* @throws Exception
*/
public void encryptFile(byte[] salt, String file, String destFile)
throws Exception {
InputStream is = null;
OutputStream out = null;
CipherInputStream cis = null;
try {
Key k = toKey(salt);
Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.ENCRYPT_MODE, k);
is = new FileInputStream(file);
out = new FileOutputStream(destFile);
cis = new CipherInputStream(is, cipher);
byte[] buffer = new byte[1024];
//全部加密
int r;
while ((r = cis.read(buffer)) > 0) {
out.write(buffer, 0, r);
}
} catch (Exception e) {
throw e;
} finally {
if (cis != null) {
cis.close();
}
if (is != null) {
is.close();
}
if (out != null) {
out.close();
}
}
}
/**
* 文件采用AES算法解密文件
*
* @param salt(密钥),需要通过MD5Tool.getMD5Str("字符密钥")转换为字节数组
* @param file 待解密文件路径
* @param dest 解密后文件路径
* @throws Exception
*/
public void decryptFile(byte[] salt, String file, String dest) throws Exception {
InputStream is = null;
OutputStream out = null;
CipherOutputStream cos = null;
try {
Key k = toKey(salt);
Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
cipher.init(Cipher.DECRYPT_MODE, k);
is = new FileInputStream(file);
out = new FileOutputStream(dest);
cos = new CipherOutputStream(out, cipher);
byte[] buffer = new byte[1024];
int r;
while ((r = is.read(buffer)) >= 0) {
cos.write(buffer, 0, r);
}
} catch (Exception e) {
throw e;
} finally {
if (cos != null) {
cos.close();
}
if (out != null) {
out.close();
}
if (is != null) {
is.close();
}
}
}
public static void main(String[] args) {
AESTool t = new AESTool();
byte[] b = new byte[0];
try {
b = t.encrypt
("{\"searchText\":\"广告\"}".getBytes(),
"dyfewfwefwefwefewfweffwessssssss".getBytes());
} catch (Exception e) {
e.printStackTrace();
}
String s = new String(b);
System.out.println(s);
/*byte[] b2=t.decrypt(s.getBytes(), "dyfewfwefwefwefewfweffwe".getBytes());
String s2 = new String(b2);
System.out.println(s2);
s="LZvVzaoZ55wP6jwLWhGF6N9vAQ1Aak4Dm4zdeXXjVkk=";
b2=t.decrypt(s.getBytes(), "dyfewfwefwefwefewfweffwe".getBytes());
s2 = new String(b2);
System.out.println(s2);*/
}
}
app/src/main/java/com/dayu/bigfish/utils/DiffCallBack.java deleted 100644 → 0
package com.dayu.bigfish.utils;
import android.support.v7.util.DiffUtil;
import com.dayu.bigfish.bean.Order;
import java.util.List;
/**
* Created by luofan on 2017/12/24.
*/
public class DiffCallBack<M> extends DiffUtil.Callback {
private List<M> mOldDatas;
private List<M> mNewDatas;
public DiffCallBack(List<M> olddatas, List<M> newDatas) {
this.mOldDatas = olddatas;
this.mNewDatas = newDatas;
}
@Override
public int getOldListSize() {
return mOldDatas != null ? mOldDatas.size() : 0;
}
@Override
public int getNewListSize() {
return mNewDatas != null ? mNewDatas.size() : 0;
}
@Override
public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
if (mNewDatas.get(0) instanceof Order) {
return ((Order) mOldDatas.get(oldItemPosition)).getId() == ((Order) mNewDatas.get(oldItemPosition)).getId();
} else {
return false;
}
}
@Override
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
if (mNewDatas.get(0) instanceof Order) {
return ((Order) mOldDatas.get(oldItemPosition)).getId() == ((Order) mNewDatas.get(oldItemPosition)).getId();
} else {
return false;
}
}
}
app/src/main/java/com/dayu/bigfish/utils/JSONDateZip.java deleted 100755 → 0
package com.dayu.bigfish.utils;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
/**
* 解压缩的工具类，主要解压被服务器压缩过的资源
*/
public class JSONDateZip {
public static byte[] unzip(byte[] buf) throws Exception {
ByteArrayOutputStream output = null;
try {
Inflater inflater = new Inflater();
inflater.setInput(buf, 0, buf.length);
output = new ByteArrayOutputStream();
byte[] result = new byte[1024];
int size = -1;
while (size != 0) {
size = inflater.inflate(result, 0, result.length);
output.write(result, 0, size);
}
inflater.end();
result = output.toByteArray();
return result;
} catch (Exception e) {
throw new Exception(e);
} finally {
try {
if (output != null) {
output.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
public static byte[] zip(byte[] input) throws Exception {
ByteArrayOutputStream output = null;
try {
Deflater deflater = new Deflater();
deflater.setInput(input);
deflater.finish();
output = new ByteArrayOutputStream();
byte[] buf = new byte[1024];
while (!deflater.finished()) {
int byteCount = deflater.deflate(buf);
output.write(buf, 0, byteCount);
}
deflater.end();
return output.toByteArray();
} catch (Exception e) {
throw new Exception(e);
} finally {
try {
if (output != null) {
output.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
public static void main(String args[]) {
}
}
app/src/main/java/com/dayu/bigfish/utils/managers/MemoryCacheManager.java deleted 100755 → 0
package com.dayu.bigfish.utils.managers;
import android.util.LruCache;
/**
* Created by luofan on 2017/11/24.
*/
public class MemoryCacheManager {
private static class Holder {
public static final MemoryCacheManager instance = new MemoryCacheManager();
}
public static MemoryCacheManager getInstance() {
return Holder.instance;
}
private MemoryCacheManager() {
}
final static int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 1024) / 8;
static LruCache<String, Object> mMemoryCache = new LruCache<String, Object>(
cacheSize);
public static void add(String key, Object mObject) {
mMemoryCache.put(key, mObject);
}
public static Object get(String key) {
return mMemoryCache.get(key);
}
}
app/src/main/res/anim/progress_round.xml deleted 100755 → 0
<?xml version="1.0" encoding="utf-8"?>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="360">
<shape
android:innerRadiusRatio="2.5"
android:shape="ring"
android:thicknessRatio="10"
android:useLevel="false">
<gradient
android:centerColor="?attr/colorPrimary"
android:centerY="0.50"
android:endColor="?attr/colorWhite"
android:startColor="?attr/colorPrimaryDark"
android:type="sweep"
android:useLevel="false" />
</shape>
</rotate>
\ No newline at end of file
app/src/main/res/layout/activity_feedback.xml
......@@ -6,7 +6,7 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.commonSubmite.CommonSubmitePresenter" />
type="com.dayu.bigfish.presenter.feedBack.FeedBackPresenter" />
</data>
<LinearLayout
......
app/src/main/res/values/styles.xml
......@@ -7,11 +7,6 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Transparent" parent="AppTheme">
<item name="android:windowIsTranslucent">true</item>
</style>
<declare-styleable name="CircleHead">
<attr name="circleBorderHeadWidth" format="dimension"/>
<attr name="ringHeadColor" format="color"/>
......
baseLibrary/build.gradle
......@@ -17,7 +17,7 @@ android {
buildTypes {
release {
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
......@@ -52,5 +52,13 @@ dependencies {
compile 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
//ARouter
compile "com.alibaba:arouter-api:$arouter_api_version"
implementation files('libs/hyphenatechat_3.3.4.jar')
//greendao数据库
compile 'org.greenrobot:greendao:3.2.0'
//选择器
compile 'com.contrarywind:Android-PickerView:3.2.7'
//jsbridge
compile 'com.github.lzyzsd:jsbridge:1.0.4'
compile project(':locationLibrary')
}
baseLibrary/src/main/AndroidManifest.xml
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.baselibrary">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<service android:name="com.dayu.base.api.DownloadService" />
<receiver android:name="com.dayu.utils.NetworkConnectChangedReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.wifi.STATE_CHANGE" />
</intent-filter>
</receiver>
</application>
</manifest>
baseLibrary/src/main/java/com/dayu/base/api/Api.java
......@@ -105,7 +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";
token="8eff783de36e4d2a8b7bc66709edfc42";
if (!TextUtils.isEmpty(token) && !request.url().toString().contains(Constants.BASE_URL + Constants.LOGIN_URL)) {
request = request.newBuilder()
.header(BaseConstant.TOKEN, token)
......
baseLibrary/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
......@@ -7,21 +7,24 @@ import android.os.Bundle;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
import com.dayu.common.BaseConstant;
import com.dayu.common.BaseView;
import com.dayu.common.Constants;
import com.dayu.utils.AppManager;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.TUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.hyphenate.chat.EMClient;
import java.lang.reflect.ParameterizedType;
;
/**
* Created by luofan on 17/11/02.
* Created by luofan
* on 17/11/02.
*/
public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingActivity<B>
implements BaseView {
......@@ -141,9 +144,10 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
CustomDialog mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
, (dialog, confirm) -> {
if (confirm) {
// EMClient.getInstance().logout(true);
// UserManager.getInstance().clearUserInfo();
BaseApplication.getBaseApp().exiteAllActivity();
EMClient.getInstance().logout(true);
UserManager.getInstance().clearUserInfo();
AppManager.getInstance().finishAllActivity();
AppManager.getInstance().finishAllActivity();
ARouter.getInstance().build(BaseConstant.PATH_LOGIN).navigation();
}
dialog.dismiss();
......
baseLibrary/src/main/java/com/dayu/base/ui/fragment/BaseFragment.java
......@@ -7,14 +7,16 @@ import android.os.Bundle;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
import com.dayu.common.BaseConstant;
import com.dayu.common.BaseView;
import com.dayu.common.Constants;
import com.dayu.utils.AppManager;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.TUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.hyphenate.chat.EMClient;
import java.lang.reflect.ParameterizedType;
......@@ -134,10 +136,9 @@ public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBi
CustomDialog mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
, (dialog, confirm) -> {
if (confirm) {
// UserManager.getInstance().clearUserInfo();
// EMClient.getInstance().logout(true);
// UserManager.getInstance().clearUserInfo();
BaseApplication.getBaseApp().exiteAllActivity();
EMClient.getInstance().logout(true);
UserManager.getInstance().clearUserInfo();
AppManager.getInstance().finishAllActivity();
ARouter.getInstance().build(BaseConstant.PATH_LOGIN).navigation();
}
dialog.dismiss();
......
baseLibrary/src/main/java/com/dayu/common/BaseApplication.java
......@@ -8,8 +8,7 @@ import android.support.multidex.MultiDex;
import android.support.multidex.MultiDexApplication;
import com.alibaba.android.arouter.launcher.ARouter;
import java.util.Stack;
import com.dayu.utils.AppManager;
/**
* Created by luofan
......@@ -18,7 +17,6 @@ import java.util.Stack;
public class BaseApplication extends MultiDexApplication {
private static Context mContext;
private Stack<Activity> store;
private static BaseApplication myApplication;
@Override
......@@ -27,7 +25,6 @@ public class BaseApplication extends MultiDexApplication {
MultiDex.install(this);
myApplication = this;
mContext = this.getApplicationContext();
store = new Stack<>();
registerActivityLifecycleCallbacks(new SwitchBackgroundCallbacks());
//ARouter初始化
ARouter.openLog(); // 打印日志
......@@ -35,23 +32,6 @@ public class BaseApplication extends MultiDexApplication {
ARouter.init(this);
}
/**
* 退出所有activity.
*/
public void exiteAllActivity() {
for (Activity activity : store) {
activity.finish();
}
}
/**
* 获取当前的Activity
*
* @return
*/
public Activity getCurActivity() {
return store.lastElement();
}
public static Context getContext() {
return mContext;
......@@ -65,7 +45,7 @@ public class BaseApplication extends MultiDexApplication {
@Override
public void onActivityCreated(Activity activity, Bundle bundle) {
store.add(activity);
AppManager.getInstance().addActivity(activity);
}
@Override
......@@ -95,7 +75,7 @@ public class BaseApplication extends MultiDexApplication {
@Override
public void onActivityDestroyed(Activity activity) {
store.remove(activity);
AppManager.getInstance().remove(activity);
}
}
}
app/src/main/java/com/dayu/bigfish/bean/event/RefreshReceivingNum.java → baseLibrary/src/main/java/com/dayu/event/RefreshReceivingNum.java
package com.dayu.bigfish.bean.event;
package com.dayu.event;
import java.io.Serializable;
......
app/src/main/java/com/dayu/bigfish/bean/event/RefreshTab.java → baseLibrary/src/main/java/com/dayu/event/RefreshTab.java
package com.dayu.bigfish.bean.event;
package com.dayu.event;
/**
* 刷新各tab状态的数量
......
app/src/main/java/com/dayu/bigfish/utils/managers/AppManager.java → baseLibrary/src/main/java/com/dayu/utils/AppManager.java
package com.dayu.bigfish.utils.managers;
package com.dayu.utils;
import android.app.Activity;
import android.app.ActivityManager;
......@@ -7,7 +7,7 @@ import android.content.Context;
import java.util.Stack;
public class AppManager {
private static Stack<Activity> activityStack = new Stack<Activity>();
private static Stack<Activity> activityStack = new Stack<>();
private static AppManager instance;
private AppManager() {
......@@ -16,7 +16,7 @@ public class AppManager {
/**
* 单一实例
*/
public static AppManager getAppManager() {
public static AppManager getInstance() {
if (instance == null) {
instance = new AppManager();
}
......@@ -28,12 +28,22 @@ public class AppManager {
*/
public void addActivity(Activity activity) {
if (activityStack == null) {
activityStack = new Stack<Activity>();
activityStack = new Stack<>();
}
activityStack.add(activity);
}
/**
* 移除activity
*/
public void remove(Activity activity) {
if (activityStack == null) {
activityStack = new Stack<>();
}
activityStack.remove(activity);
}
/**
* 获取当前Activity（堆栈中最后一个压入的）
*/
public Activity currentActivity() {
......@@ -91,7 +101,7 @@ public class AppManager {
finishAllActivity();
ActivityManager activityMgr = (ActivityManager) context
.getSystemService(Context.ACTIVITY_SERVICE);
// activityMgr.
// activityMgr.
activityMgr.restartPackage(context.getPackageName());
System.exit(0);
} catch (Exception e) {
......
app/src/main/java/com/dayu/bigfish/utils/AppUtils.java → baseLibrary/src/main/java/com/dayu/utils/AppUtils.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.telephony.TelephonyManager;
import com.dayu.bigfish.MyApplication;
import com.dayu.common.BaseApplication;
/**
* Created by luofan on 2017/11/7.
......@@ -16,7 +17,7 @@ public class AppUtils {
*/
public static String getIMEI() {
TelephonyManager telephonyManager = (TelephonyManager) MyApplication.getAppContext().getSystemService(MyApplication.getAppContext().TELEPHONY_SERVICE);
TelephonyManager telephonyManager = (TelephonyManager) BaseApplication.getBaseApp().getSystemService(BaseApplication.getContext().TELEPHONY_SERVICE);
String imei = telephonyManager.getDeviceId();
return imei;
......@@ -29,7 +30,7 @@ public class AppUtils {
*/
public static String getPackageNum() {
try {
PackageInfo packageInfo = MyApplication.getAppContext().getPackageManager().getPackageInfo(MyApplication.getAppContext().getPackageName(), 0);
PackageInfo packageInfo = BaseApplication.getContext().getPackageManager().getPackageInfo(BaseApplication.getContext().getPackageName(), 0);
String packageName = packageInfo.versionName;
return packageName;
} catch (PackageManager.NameNotFoundException e) {
......
app/src/main/java/com/dayu/bigfish/utils/DataCleanManager.java → baseLibrary/src/main/java/com/dayu/utils/DataCleanManager.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.content.Context;
import android.os.Environment;
......
app/src/main/java/com/dayu/bigfish/utils/GlideImageLoader.java → baseLibrary/src/main/java/com/dayu/utils/GlideImageLoader.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.content.Context;
import android.support.annotation.DrawableRes;
......@@ -7,7 +7,7 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.R;
import com.dayu.baselibrary.R;
import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
......@@ -26,7 +26,7 @@ public class GlideImageLoader {
public static void load(Context context, String imageRes, ImageView view) {
RequestOptions options = new RequestOptions()
.centerCrop()
.placeholder(R.mipmap.camera)
.placeholder(R.drawable.camera)
.diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(context)
.load(imageRes)
......
app/src/main/java/com/dayu/bigfish/utils/InstanceUtil.java → baseLibrary/src/main/java/com/dayu/utils/InstanceUtil.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
/**
* Created by luofan on 2017/11/24.
......
baseLibrary/src/main/java/com/dayu/utils/LogUtils.java
......@@ -11,7 +11,6 @@ import java.util.List;
* @author itheima
* @time 2017-8-20 上午11:33:49
* @des 日志级别是LEVEL_ALL显示所有信息,包括System.out.println信息
* @des 日志级别是LEVEL_OFF关闭所有信息,包括System.out.println信息
*/
public class LogUtils {
/** 日志输出时的TAG */
......
app/src/main/java/com/dayu/bigfish/utils/MPermissionUtils.java → baseLibrary/src/main/java/com/dayu/utils/MPermissionUtils.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.annotation.TargetApi;
import android.app.Activity;
......
app/src/main/java/com/dayu/bigfish/utils/NetworkConnectChangedReceiver.java → baseLibrary/src/main/java/com/dayu/utils/NetworkConnectChangedReceiver.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
/**
* Created by yu on 2017/10/24.
......@@ -13,8 +13,6 @@ import android.net.wifi.WifiManager;
import android.os.Parcelable;
import android.util.Log;
import com.dayu.utils.ToastUtils;
/**
* 网络改变监控广播
* <p>
......
app/src/main/java/com/dayu/bigfish/utils/PictrueUtils.java → baseLibrary/src/main/java/com/dayu/utils/PictrueUtils.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
......
app/src/main/java/com/dayu/bigfish/utils/StringUtils.java → baseLibrary/src/main/java/com/dayu/utils/StringUtils.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.text.Html;
import android.text.Spannable;
......@@ -8,8 +8,6 @@ import android.text.TextUtils;
import android.text.style.CharacterStyle;
import android.text.style.ForegroundColorSpan;
import com.dayu.utils.UIUtils;
import java.text.DecimalFormat;
public class StringUtils {
......
baseLibrary/src/main/java/com/dayu/utils/UserManager.java
......@@ -32,6 +32,10 @@ public class UserManager {
}
}
public void saveUserForJson(String json){
SPUtils.put("USER_INFO",json);
}
public UserInfo getUser() {
return new Gson().fromJson((String) SPUtils.get("big_fish", "USER_INFO", ""), UserInfo.class);
}
......
app/src/main/java/com/dayu/bigfish/utils/UtilsScreen.java → baseLibrary/src/main/java/com/dayu/utils/UtilsScreen.java
package com.dayu.bigfish.utils;
package com.dayu.utils;
import android.annotation.SuppressLint;
import android.app.Activity;
......
app/src/main/java/com/dayu/bigfish/ui/views/DottdeLineView.java → baseLibrary/src/main/java/com/dayu/widgets/DottdeLineView.java
package com.dayu.bigfish.ui.views;
package com.dayu.widgets;
import android.content.Context;
import android.graphics.Canvas;
......@@ -9,7 +9,8 @@ import android.graphics.PathEffect;
import android.util.AttributeSet;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.baselibrary.R;
/**
* Created by luofan on 2018/1/23.
......
baseLibrary/src/main/res/values/styles.xml
......@@ -8,6 +8,11 @@
<item name="colorAccent">@color/cl_accent</item>
</style>
<style name="Transparent" parent="AppTheme">
<item name="android:windowIsTranslucent">true</item>
</style>
<style name="title">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/size_main_title</item>
......
gradle.properties
......@@ -10,11 +10,13 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
##模块化开关，单独调试时 false，作为模块 true
##用户模块
isUserModule=false
isUserModule=true
##消息模块
isMessageModule=true
##工单模块
isOrderModule=false
isOrderModule=true
##maven依赖
mavenMode=false
locationLibrary/build.gradle 0 → 100644
apply plugin: 'com.android.library'
android {
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
defaultConfig {
minSdkVersion min_sdk_version
targetSdkVersion target_sdk_version
versionCode version_code
versionName verson_name
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}
locationLibrary/proguard-rules.pro 0 → 100644
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
locationLibrary/src/androidTest/java/com/dayu/location/ExampleInstrumentedTest.java 0 → 100644
package com.dayu.location;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.dayu.location.test", appContext.getPackageName());
}
}
locationLibrary/src/main/AndroidManifest.xml 0 → 100644
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.location">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"/>
</manifest>
app/src/main/java/com/dayu/bigfish/utils/LocationUtils.java → locationLibrary/src/main/java/com/dayu/location/base/LocationUtils.java
package com.dayu.bigfish.utils;
package com.dayu.location.base;
import android.content.Context;
import android.os.Handler;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.dayu.utils.LogUtils;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* Created by luofan on 2017/11/21.
......@@ -22,9 +18,10 @@ public class LocationUtils {
public static AMapLocationClientOption mLocationOption = null;
public static AMapLocation sLocation = null;
private static boolean flag = true;
private static Disposable mDisposable;
// private static Disposable mDisposable;
private static long time;
private static MyLocationListener mListener;
private static Handler mHandler;
/**
* @param context
......@@ -73,21 +70,24 @@ public class LocationUtils {
* @Description: 获取位置，重新发起获取位置请求
*/
public static void getCurrentLocation(MyLocationListener listener) {
mListener = listener;
mListener = listener;
if (mlocationClient == null) {
return;
}
flag = true;
// 刷新有时不回调.
mDisposable = Observable.timer(8000, TimeUnit.MILLISECONDS)
.subscribe(aLong -> {
if (flag) {
// ToastUtils.showShortToast("获取定位失败");
mListener.result(null);
flag = false;
mlocationClient.stopLocation();
}
});
mHandler = new Handler();
//刷新有时不回调.
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
if (flag) {
mListener.result(null);
flag = false;
mlocationClient.stopLocation();
}
}
}, 8000);
time = System.currentTimeMillis();
mlocationClient.setLocationListener(new AMapLocationListener() {
......@@ -99,13 +99,10 @@ public class LocationUtils {
mlocationClient.stopLocation();
sLocation = location;
mListener.result(location);
LogUtils.d(System.currentTimeMillis() - time + " " +location.toString());
} else if ((location == null && flag)) {
LogUtils.d("location:" + location.getErrorCode());
flag = false;
mlocationClient.stopLocation();
mListener.result(location);
// ToastUtils.showShortToast("定位失败了");
}
}
});
......@@ -118,9 +115,7 @@ public class LocationUtils {
* @Description: 销毁定位，必须在退出程序时调用，否则定位会发生异常
*/
public static void destroy() {
if (mDisposable != null) {
mDisposable.dispose();
}
mHandler = null;
mlocationClient.onDestroy();
}
......
locationLibrary/src/main/res/values/strings.xml 0 → 100644
<resources>
<string name="app_name">LocationLibrary</string>
</resources>
locationLibrary/src/test/java/com/dayu/location/ExampleUnitTest.java 0 → 100644
package com.dayu.location;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() throws Exception {
assertEquals(4, 2 + 2);
}
}
\ No newline at end of file
messageCenter/build.gradle
......@@ -58,10 +58,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
......
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.ProviderConstant;
import com.dayu.provider.router.RouterPath;
import com.dayu.provider.common.ProviderConstant123;
import com.dayu.provider.router.BaseRouterPath;
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(RouterPath.PATH_ORDER_DETAIL)
.withBundle(ProviderConstant.BUNDLE, bundle)
ARouter.getInstance().build(BaseRouterPath.PATH_ORDER_DETAIL)
.withBundle(ProviderConstant123.BUNDLE, bundle)
.navigation();
MobclickAgent.onEvent(mActivity, "message_check_order");
}
......
messageCenter/src/main/release/AndroidManifest.xml
......@@ -6,6 +6,7 @@
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name="com.dayu.message.ui.activity.TestActivity" />
<activity android:name=".ui.activity.MessageDetailActivity"/>
</application>
</manifest>
orderCenter/build.gradle
......@@ -3,6 +3,7 @@ if (isOrderModule.toBoolean()) {
} else {
apply plugin: 'com.android.application'
}
apply plugin: 'org.greenrobot.greendao'
android {
compileSdkVersion compile_sdk_version
......@@ -55,13 +56,15 @@ android {
}
}
greendao {
schemaVersion 2
daoPackage 'com.dayu.order.greendao'
targetGenDir 'src/main/java'
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
......
orderCenter/src/main/debug/AndroidManifest.xml
......@@ -7,12 +7,56 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.activity.TestActivity">
<activity
android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.activity.applyAndRefuseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SopWebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SubcribeTimeActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReceivingActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ProcessOrderActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.PreviewActivty"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.OrderRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.KaAddressActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.LogisticsInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.QrCodeActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.OrderDetailsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInstructionActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.WebViewActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
orderCenter/src/main/java/com/dayu/order/api/OrderApiFactory.java
package com.dayu.order.api;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.api.protocol.KaAddress;
import com.dayu.order.api.protocol.LogsticsInfo;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.OrderDetail;
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 java.util.List;
import io.reactivex.Observable;
import okhttp3.RequestBody;
/**
* Created by luofan
* on 2018/2/8.
*/
public class OrderApiFactory {
public static Observable<Integer> startOrder(RequestBody body) {
return Api.getService(OrderService.class).startOrder(body).compose(Api.applySchedulers());
}
public static Observable<Integer> startServer(RequestBody body) {
return Api.getService(OrderService.class).startServer(body).compose(Api.applySchedulers());
}
public static Observable<List<ErrorOrder>> getErrorOrders(int userId, int siteId) {
return Api.getService(OrderService.class).getErrorOrders(userId, siteId).compose(Api.applySchedulers());
}
public static Observable<BasePageBean<Order>> getOrders(int state, int engineerId, int siteId, int page, int pageSize) {
return Api.getService(OrderService.class).getOrders(state, engineerId, siteId, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<Boolean> receiveOrder(int orderId, int engineerId) {
return Api.getService(OrderService.class).receiveOrder(orderId, engineerId).compose(Api.applySchedulers());
}
public static Observable<Boolean> subcriceTime(int orderId, String doorTime, String doorComment) {
return Api.getService(OrderService.class).subcriceTime(orderId, doorTime, doorComment).compose(Api.applySchedulers());
}
public static Observable<Integer> commitOrder(RequestBody orderInfo) {
return Api.getService(OrderService.class).commitOrder(orderInfo).compose(Api.applySchedulers());
}
public static Observable<OrderDetail> queryOrderInfo(int orderId) {
return Api.getService(OrderService.class).queryOrderInfo(orderId).compose(Api.applySchedulers());
}
public static Observable<Tab> getTabNum(int userId, int siteId) {
return Api.getService(OrderService.class).getTabNum(userId, siteId).compose(Api.applySchedulers());
}
public static Observable<OrderDetail> getOrderInfo(int orderId) {
return Api.getService(OrderService.class).getOrderInfo(orderId).compose(Api.applySchedulers());
}
public static Observable<BasePageBean<ServerInstruction>> getInstruction(long id, int page, int pageSize) {
return Api.getService(OrderService.class).getInstruction(id, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<KaAddress> getKaAddress(int companyId) {
return Api.getService(OrderService.class).getKaAddress(companyId).compose(Api.applySchedulers());
}
public static Observable<Boolean> applyPart(long spOrderId, String spComment, String createBy, long accountId) {
return Api.getService(OrderService.class).applyPart(spOrderId, spComment, createBy, accountId).compose(Api.applySchedulers());
}
public static Observable<Boolean> cancleApply(int partsId, String modifyBy) {
return Api.getService(OrderService.class).cancleApply(partsId, modifyBy).compose(Api.applySchedulers());
}
public static Observable<Boolean> returnPartSelf(RequestBody body) {
return Api.getService(OrderService.class).returnPartSelf(body).compose(Api.applySchedulers());
}
public static Observable<Boolean> returnPartByKA(RequestBody body) {
return Api.getService(OrderService.class).returnPartByKA(body).compose(Api.applySchedulers());
}
public static Observable<Boolean> receivePart(int partsId, String modifyBy) {
return Api.getService(OrderService.class).receivePart(partsId, modifyBy).compose(Api.applySchedulers());
}
public static Observable<Boolean> refusePart(long kaOrderSparePartsId, String reason) {
return Api.getService(OrderService.class).refusePart(kaOrderSparePartsId, reason).compose(Api.applySchedulers());
}
public static Observable<List<OrderPart>> queryPart(long spOrderId, int sources) {
return Api.getService(OrderService.class).queryPart(spOrderId, sources).compose(Api.applySchedulers());
}
public static Observable<Boolean> modifyPart(RequestBody body) {
return Api.getService(OrderService.class).modifyPart(body).compose(Api.applySchedulers());
}
public static Observable<LogsticsInfo> queryLogistics(String com, String num) {
return Api.getService(OrderService.class).queryLogistics(com, num).compose(Api.applySchedulers());
}
public static Observable<List<ShipperCompany>> queryShipperCompany() {
return Api.getService(OrderService.class).queryShipperCompany().compose(Api.applySchedulers());
}
}
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
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;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.OrderDetail;
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 java.util.List;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path;
import retrofit2.http.Query;
/**
* Created by luofan
* on 2018/2/8.
*/
public class OrderService {
interface OrderService {
/**
* 我已出发.
*
* @param body
* @return
*/
@POST(Constants.START_ORDER)
Observable<BaseResponse<Integer>> startOrder(@Body RequestBody body);
/**
* 开始服务.
*
* @param body
* @return
*/
@POST(Constants.START_SERVE)
Observable<BaseResponse<Integer>> startServer(@Body RequestBody body);
/**
* 获取工单记录列表.
*
* @param state
* @param engineerId
* @param siteId
* @param page
* @param pageSize
* @return
*/
@GET(Constants.ORDERS)
Observable<BaseResponse<BasePageBean<Order>>> getOrders(@Query("state") int state,
@Query("engineerId") int engineerId,
@Query("siteId") int siteId,
@Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 获取异常订单列表.
*
* @param siteId
* @return
*/
@GET(Constants.ERROR_ORDER)
Observable<BaseResponse<List<ErrorOrder>>> getErrorOrders(@Query("engineerId") int userId, @Query("siteId") int siteId);
/**
* 工程师接单
*
* @param orderId
* @param engineerId
* @return
*/
@GET(Constants.ORDER_RECEIVING)
Observable<BaseResponse<Boolean>> receiveOrder(@Path("orderId") int orderId,
@Path("engineerId") int engineerId);
/**
* 预约上门时间.
*
* @param orderId
* @param doorTime
* @param doorComment
* @return
*/
@POST(Constants.SUBCRIBE_TIME)
Observable<BaseResponse<Boolean>> subcriceTime(@Query("orderId") int orderId,
@Query("doorTime") String doorTime,
@Query("doorComment") String doorComment);
/**
* 提交工单.
*
* @param orderInfo
* @return
*/
@POST(Constants.ORDER_FINISH)
Observable<BaseResponse<Integer>> commitOrder(@Body RequestBody orderInfo);
/**
* 单表查询工单记录.
*
* @param id
* @return
*/
@GET(Constants.SELECT_ORDER_LITTLE)
Observable<BaseResponse<OrderDetail>> queryOrderInfo(@Path("id") int id);
/**
* 获取tab数量.
*
* @param userId
* @return
*/
@GET(Constants.TAB_NUM)
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId, @Path("siteId") int siteId);
/**
* 获取工单详情信息.
*
* @param orderId
* @return
*/
@GET(Constants.ORDER_DETAILS)
Observable<BaseResponse<OrderDetail>> getOrderInfo(@Path("orderId") int orderId);
/**
* 获取服务说明.
*
* @param id
* @return
*/
@GET(Constants.ORDER_INSTRUCTION)
Observable<BaseResponse<BasePageBean<ServerInstruction>>> getInstruction(@Query("kaSpuId") long id, @Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 获取厂商收货地址.
*
* @param companyId
* @return
*/
@GET(Constants.KA_ADDRESS)
Observable<BaseResponse<KaAddress>> getKaAddress(@Path("companyId") int companyId);
/**
* 申请备件.
*
* @param spOrderId
* @param spComment
* @param createBy
* @return
*/
@POST(Constants.APPLY_ONE_PART)
Observable<BaseResponse<Boolean>> applyPart(@Query("spOrderId") long spOrderId,
@Query("spComment") String spComment,
@Query("createBy") String createBy,
@Query("accountId") long accountId);
/**
* 取消申请备件.
*
* @param partsId
* @param modifyBy
* @return
*/
@PUT(Constants.CANCLE_APPLY_PART)
Observable<BaseResponse<Boolean>> cancleApply(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
/**
* sp主动寄回备件.
*
* @param body
* @return
*/
@POST(Constants.RETURN_PART_SELF)
Observable<BaseResponse<Boolean>> returnPartSelf(@Body RequestBody body);
/**
* sp按ka要求寄回备件.
*
* @param body
* @return
*/
@PUT(Constants.RETURN_PART_BY_KA)
Observable<BaseResponse<Boolean>> returnPartByKA(@Body RequestBody body);
/**
* 收到备件.
*
* @param partsId
* @param modifyBy
* @return
*/
@PUT(Constants.RECEIVE_PART)
Observable<BaseResponse<Boolean>> receivePart(@Query("partsId") int partsId,
@Query("modifyBy") String modifyBy);
/**
* 拒绝申请备件.
*
* @param kaOrderSparePartsId
* @param reason
* @return
*/
@POST(Constants.REFUSE_ONE_PART)
Observable<BaseResponse<Boolean>> refusePart(@Query("kaOrderSparePartsId") long kaOrderSparePartsId,
@Query("reason") String reason);
/**
* 获取备件列表.
*
* @param spOrderId
* @param sources
* @return
*/
@GET(Constants.QUERY_PART_LIST)
Observable<BaseResponse<List<OrderPart>>> queryPart(@Query("spOrderId") long spOrderId, @Query("sources") int sources);
/**
* 修改备件信息.
*
* @param body
* @return
*/
@PUT(Constants.MODIFY_PART)
Observable<BaseResponse<Boolean>> modifyPart(@Body RequestBody body);
/**
* 查询物流信息.
*
* @return
*/
@GET(Constants.QUERY_LOGISTICS_INFO)
Observable<BaseResponse<LogsticsInfo>> queryLogistics(@Query("com") String com, @Query("num") String num);
/**
* 查询物流公司.
*
* @return
*/
@GET(Constants.QUERY_SHIPPER_COMPANY)
Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany();
}
app/src/main/java/com/dayu/bigfish/bean/ErrorOrder.java → orderCenter/src/main/java/com/dayu/order/api/protocol/ErrorOrder.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* Created by luofan on 2017/11/19.
*/
public class ErrorOrder {
private int id;
private String orderNum;
......
app/src/main/java/com/dayu/bigfish/bean/KaAddress.java → orderCenter/src/main/java/com/dayu/order/api/protocol/KaAddress.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* Created by luofan on 2018/1/19.
......
app/src/main/java/com/dayu/bigfish/bean/LogsticsInfo.java → orderCenter/src/main/java/com/dayu/order/api/protocol/LogsticsInfo.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/bean/Order.java → orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* 工单列表，异常单列表,工单记录列表的bean
* Created by luofan on 2017/11/14.
*/
public class Order {
/**
* id : 20
......
app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java → orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
import java.io.Serializable;
import java.util.List;
......@@ -6,7 +6,6 @@ import java.util.List;
/**
* Created by luofan on 2017/11/14.
*/
public class OrderDetail implements Serializable {
private int id;
private String orderNum;
......
app/src/main/java/com/dayu/bigfish/bean/OrderPart.java → orderCenter/src/main/java/com/dayu/order/api/protocol/OrderPart.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
import java.io.Serializable;
/**
* Created by luofan on 2018/1/20.
*/
public class OrderPart implements Serializable {
private Integer id;
private String partName;
......
app/src/main/java/com/dayu/bigfish/bean/ServerInstruction.java → orderCenter/src/main/java/com/dayu/order/api/protocol/ServerInstruction.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* Created by luofan
......
app/src/main/java/com/dayu/bigfish/bean/ShipperCompany.java → orderCenter/src/main/java/com/dayu/order/api/protocol/ShipperCompany.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* Created by luofan on 2018/1/24.
......
app/src/main/java/com/dayu/bigfish/bean/Tab.java → orderCenter/src/main/java/com/dayu/order/api/protocol/Tab.java
package com.dayu.bigfish.bean;
package com.dayu.order.api.protocol;
/**
* Created by luofan on 2017/11/14.
......
orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java 0 → 100644
package com.dayu.order.common;
/**
* Created by luofan
* on 2018/2/8.
*/
public class OrderConstant {
public final static int SUBCRIBE_TIME = 2;//预约上门时间
public final static int ORDER_YUYUE = 3;//修改预约时间
public final static int ORDER_DOING = 4;//再次上门时间
public final static int ORDER_SOP_FINISH = 5;//SOP已完成
public final static int ORDER_FINISH = 6;//已完成
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
}
orderCenter/src/main/java/com/dayu/order/event/OrderState.java 0 → 100644
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;
}
}
app/src/main/java/com/dayu/bigfish/bean/event/RefreshApoiment.java → orderCenter/src/main/java/com/dayu/order/event/RefreshApoiment.java
package com.dayu.bigfish.bean.event;
package com.dayu.order.event;
/**
* 刷新待预约列表.
* on 2017/10/11.
*/
public class RefreshApoiment {
private int tabNum;
......
app/src/main/java/com/dayu/bigfish/bean/event/RefreshApplyPart.java → orderCenter/src/main/java/com/dayu/order/event/RefreshApplyPart.java
package com.dayu.bigfish.bean.event;
package com.dayu.order.event;
/**
* 刷新带服务列表
......
app/src/main/java/com/dayu/bigfish/bean/event/RefreshServe.java → orderCenter/src/main/java/com/dayu/order/event/RefreshServe.java
package com.dayu.bigfish.bean.event;
package com.dayu.order.event;
/**
* 刷新带服务列表
* on 2017/10/11.
*/
public class RefreshServe {
private int tabNum;
......
app/src/main/java/com/dayu/bigfish/bean/event/SwtichFragment.java → orderCenter/src/main/java/com/dayu/order/event/SwtichFragment.java
package com.dayu.bigfish.bean.event;
package com.dayu.order.event;
/**
* Created by luofan on 2017/12/1.
......
app/src/main/java/com/dayu/bigfish/greendao/DaoMaster.java → orderCenter/src/main/java/com/dayu/order/greendao/DaoMaster.java 100755 → 100644
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
......
app/src/main/java/com/dayu/bigfish/greendao/DaoSession.java → orderCenter/src/main/java/com/dayu/order/greendao/DaoSession.java 100755 → 100644
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import java.util.Map;
......@@ -8,9 +8,9 @@ import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
import com.dayu.bigfish.bean.sqlbean.OrderInfo;
import com.dayu.order.sqlbean.OrderInfo;
import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.order.greendao.OrderInfoDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
......
app/src/main/java/com/dayu/bigfish/greendao/GreenDaoManager.java → orderCenter/src/main/java/com/dayu/order/greendao/GreenDaoManager.java
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import com.dayu.bigfish.MyApplication;
import com.dayu.common.BaseApplication;
/**
* Created by luofan on 2017/11/4.
......@@ -34,7 +35,7 @@ public class GreenDaoManager {
* 初始化数据
*/
private void init() {
MyOpenHelper devOpenHelper = new MyOpenHelper(MyApplication.getContext(),
MyOpenHelper devOpenHelper = new MyOpenHelper(BaseApplication.getContext(),
"tell", null);
mDaoMaster = new DaoMaster(devOpenHelper.getWritableDatabase());
mDaoSession = mDaoMaster.newSession();
......
app/src/main/java/com/dayu/bigfish/greendao/MigrationHelper.java → orderCenter/src/main/java/com/dayu/order/greendao/MigrationHelper.java
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import android.database.Cursor;
import android.text.TextUtils;
......
app/src/main/java/com/dayu/bigfish/greendao/MyOpenHelper.java → orderCenter/src/main/java/com/dayu/order/greendao/MyOpenHelper.java
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
......
app/src/main/java/com/dayu/bigfish/greendao/OrderInfoDao.java → orderCenter/src/main/java/com/dayu/order/greendao/OrderInfoDao.java 100755 → 100644
package com.dayu.bigfish.greendao;
package com.dayu.order.greendao;
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
......@@ -9,10 +9,10 @@ import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
import com.dayu.bigfish.bean.sqlbean.StringConverter;
import com.dayu.order.sqlbean.StringConverter;
import java.util.List;
import com.dayu.bigfish.bean.sqlbean.OrderInfo;
import com.dayu.order.sqlbean.OrderInfo;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
......
app/src/main/java/com/dayu/bigfish/presenter/BaseOrderPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/BaseOrderPresenter.java
package com.dayu.bigfish.presenter;
package com.dayu.order.presenter;
import com.dayu.base.ui.presenter.BaseListPresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/commonSubmite/ApplayAndRefusePresenter.java
package com.dayu.bigfish.presenter.commonSubmite;
package com.dayu.order.presenter.commonSubmite;
import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.event.RefreshApplyPart;
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.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsUserAccountMatcher;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.util.HashMap;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
public class ApplayAndRefusePresenter extends ApplyAndRefuseContract.Presenter {
private String mUserName;
private String mUserMobile;
public ObservableField<String> mComment = new ObservableField<>();
public ObservableField<String> mTitle = new ObservableField<>();
public ObservableField<String> mHint = new ObservableField<>();
......@@ -41,17 +32,12 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
@Override
public void onAttached() {
mUserName = UserManager.getInstance().getUser().getAccountName();
mUserMobile = UserManager.getInstance().getUserPhone();
mAccountId = Integer.parseInt(UserManager.getInstance().getUser().getAccountId());
Bundle bundle = mView.getBundle();
mType = bundle.getInt(Constants.TYPE, 0);
mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
mPartId = bundle.getInt(Constants.PART_ID);
switch (mType) {
case Constants.FEED_BACK:
mHint.set(UIUtils.getString(R.string.tv_idea_text_hint));
mTitle.set(UIUtils.getString(R.string.tv_idea));
break;
case Constants.APPLY_PART:
mHint.set(UIUtils.getString(R.string.tv_apply_reson_hint));
mTitle.set(UIUtils.getString(R.string.tv_apply_order_title));
......@@ -77,9 +63,6 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
return;
}
switch (mType) {
case Constants.FEED_BACK:
comFirmSuggist();
break;
case Constants.APPLY_PART:
applyPart();
break;
......@@ -92,26 +75,8 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
}
@Override
public void comFirmSuggist() {
HashMap<String, Object> params = new HashMap<>();
params.put("comment", mComment.get());
params.put("created", mUserName);
params.put("deal", 2);
params.put("mobile", mUserMobile);
params.put("platform", 1);
params.put("status", 1);
params.put("suggestName", mUserName);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.postFeedBack(body).subscribe(baseObserver(aBoolean -> {
mView.showToast(R.string.commite_success);
mView.dumpBack();
}));
}
@Override
public void applyPart() {
ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
OrderApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1));
......@@ -120,7 +85,7 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
@Override
public void refusePart() {
ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver(
OrderApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver(
aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1));
......
app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmiteContract.java → orderCenter/src/main/java/com/dayu/order/presenter/commonSubmite/ApplyAndRefuseContract.java
package com.dayu.bigfish.presenter.commonSubmite;
package com.dayu.order.presenter.commonSubmite;
import com.dayu.base.ui.presenter.BasePresenter;
......@@ -9,7 +9,7 @@ import com.dayu.common.BaseView;
* Created by luo
* on 2016/8/4.
*/
public interface CommonSubmiteContract {
public interface ApplyAndRefuseContract {
interface View extends BaseView {
}
......@@ -19,11 +19,6 @@ public interface CommonSubmiteContract {
public abstract void commite();
/**
* 提交反馈意见.
*/
public abstract void comFirmSuggist();
/**
* 申请备件.
*/
public abstract void applyPart();
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java → orderCenter/src/main/java/com/dayu/order/presenter/homeorder/HomeOrderContract.java
package com.dayu.bigfish.presenter.homeorder;
package com.dayu.order.presenter.homeorder;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.bigfish.bean.Tab;
import com.dayu.common.BaseView;
import com.dayu.order.api.protocol.Tab;
/**
* Created by luo on 2016/8/4.
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/homeorder/HomeOrderPresenter.java
package com.dayu.bigfish.presenter.homeorder;
package com.dayu.order.presenter.homeorder;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.Tab;
import com.dayu.common.BaseApplication;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Tab;
import com.dayu.order.ui.activity.OrderRecordActivity;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......@@ -13,7 +12,6 @@ import com.umeng.analytics.MobclickAgent;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class HomeOrderPresenter extends HomeOrderContract.Presenter {
private int mUserId;
......@@ -22,6 +20,8 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override
public void onAttached() {
String json ="{\"accessToken\":\"40f0f4fd1d52472093055433a38d4a3f\",\"accountId\":\"692\",\"accountName\":\"罗凡\",\"headerImg\":\"http://dayuoss.oss-cn-beijing.aliyuncs.com/test/sp/mobile/android/business/checkApply/3b7165643f19bbf1c1f7ca2fa69f0d6b.png?x-oss-process\\u003dstyle/pic\",\"hxAccount\":\"0915e6394a254c51b6742e04a6c6ca3f\",\"hxPwd\":\"7583t45u\",\"siteId\":\"432\",\"status\":1,\"token\":\"8eff783de36e4d2a8b7bc66709edfc42\"}";
UserManager.getInstance().saveUserForJson(json);
UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = Integer.parseInt(userInfo.getSiteId());
......@@ -35,7 +35,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override
public void getTabNum(int userId, int siteId) {
ApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(
OrderApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(
tab -> mView.setTabNum(tab, mIndex),
responeThrowable -> {
Tab tab = new Tab();
......@@ -50,7 +50,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override
public void dumpToOrderRecordActivity() {
mView.startActivity(OrderRecordActivity.class);
MobclickAgent.onEvent(MyApplication.getContext(), "order_history");
MobclickAgent.onEvent(BaseApplication.getContext(), "order_history");
}
......
app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressContract.java → orderCenter/src/main/java/com/dayu/order/presenter/kaaddress/KaAddressContract.java
package com.dayu.bigfish.presenter.kaaddress;
package com.dayu.order.presenter.kaaddress;
import com.dayu.base.ui.presenter.BasePresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/kaaddress/KaAddressPresenter.java
package com.dayu.bigfish.presenter.kaaddress;
package com.dayu.order.presenter.kaaddress;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.KaAddress;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.KaAddress;
/**
* Created by luofan on 2017/11/8.
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class KaAddressPresenter extends KaAddressContract.Presenter {
public ObservableField<KaAddress> data = new ObservableField<>();
private int mId;
......@@ -26,6 +25,6 @@ public class KaAddressPresenter extends KaAddressContract.Presenter {
@Override
public void getKaAddress() {
ApiFactory.getKaAddress(mId).subscribe(baseObserver(kaAddress -> data.set(kaAddress)));
OrderApiFactory.getKaAddress(mId).subscribe(baseObserver(kaAddress -> data.set(kaAddress)));
}
}
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoContract.java → orderCenter/src/main/java/com/dayu/order/presenter/logisticsinfo/LogisticsInfoContract.java
package com.dayu.bigfish.presenter.logisticsinfo;
package com.dayu.order.presenter.logisticsinfo;
import com.dayu.base.ui.presenter.BaseListPresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/logisticsinfo/LogisticsInfoPresenter.java
package com.dayu.bigfish.presenter.logisticsinfo;
package com.dayu.order.presenter.logisticsinfo;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.order.api.OrderApiFactory;
/**
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
private ObservableField<Object> datas = new ObservableField<>();
private ObservableField<Object> headData = new ObservableField<>();
......@@ -46,7 +44,7 @@ public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
@Override
public void queryLogisticsInfo() {
ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver(
OrderApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver(
logsticsInfo -> {
datas.set(logsticsInfo.getLogistics());
headData.set(logsticsInfo);
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailContract.java → orderCenter/src/main/java/com/dayu/order/presenter/orderdetail/OrderDetailContract.java
package com.dayu.bigfish.presenter.orderdetail;
package com.dayu.order.presenter.orderdetail;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.common.BaseView;
import com.dayu.order.api.protocol.OrderDetail;
/**
* Created by luo
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/orderdetail/OrderDetailPresenter.java
package com.dayu.bigfish.presenter.orderdetail;
package com.dayu.order.presenter.orderdetail;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.order.api.OrderApiFactory;
/**
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class OrderDetailPresenter extends OrderDetailContract.Presenter {
private int mOrderId;
......@@ -25,7 +23,7 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter {
@Override
public void getOrderDetailInfo(int orderId) {
ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(
OrderApiFactory.getOrderInfo(orderId).subscribe(baseObserver(
detail -> mView.init(detail), responeThrowable -> mView.init(null)));
}
......
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
package com.dayu.bigfish.presenter.orderdoing;
package com.dayu.order.presenter.orderdoing;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.fragment.OrderThreeTabFragment;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.order.ui.fragment.OrderThreeTabFragment;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......@@ -27,7 +26,6 @@ import okhttp3.RequestBody;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class OrderDoingPresenter extends orderDoingContract.Presenter {
public ObservableField<Object> datas = new ObservableField();
private int mUserId;
......@@ -66,7 +64,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override
public void getOrders(int state, int userId, int siteId, int page, int pageSize) {
ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
orderBasePageBean -> {
datas.set(orderBasePageBean);
mPage++;
......@@ -76,7 +74,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override
public void getErrorOrder() {
ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(
OrderApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(
baseObserver( errorOrder -> {
datas.set(errorOrder);
EventBus.getDefault().post(new RefreshTab(-1));
......@@ -91,7 +89,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
params.put("orderId", orderId);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
return ApiFactory.startOrder(body);
return OrderApiFactory.startOrder(body);
}
@Override
......@@ -102,7 +100,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
params.put("orderId", orderId);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
return ApiFactory.startServer(body);
return OrderApiFactory.startServer(body);
}
@Override
......@@ -110,6 +108,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID,orderId);
mView.startActivity(OrderDetailsActivity.class,bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "check_order_detail");
MobclickAgent.onEvent(BaseApplication.getContext(), "check_order_detail");
}
}
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/orderDoingContract.java → orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/orderDoingContract.java
package com.dayu.bigfish.presenter.orderdoing;
package com.dayu.order.presenter.orderdoing;
import com.dayu.common.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
import com.dayu.order.presenter.BaseOrderPresenter;
import io.reactivex.Observable;
......
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartContract.java → orderCenter/src/main/java/com/dayu/order/presenter/orderpart/OrderPartContract.java
package com.dayu.bigfish.presenter.orderpart;
package com.dayu.order.presenter.orderpart;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.order.api.protocol.OrderPart;
import io.reactivex.Observable;
......
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/orderpart/OrderPartPresenter.java
package com.dayu.bigfish.presenter.orderpart;
package com.dayu.order.presenter.orderpart;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.ui.CommonSubmiteActivity;
import com.dayu.bigfish.ui.LogisticsInfoActivity;
import com.dayu.bigfish.ui.ReturnPartActivity;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.OrderPart;
import com.dayu.order.ui.activity.applyAndRefuseActivity;
import com.dayu.order.ui.activity.LogisticsInfoActivity;
import com.dayu.order.ui.activity.ReturnPartActivity;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......@@ -23,7 +22,6 @@ import io.reactivex.Observable;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class OrderPartPresenter extends OrderPartContract.Presenter {
private ObservableField<Object> datas = new ObservableField<>();
public ObservableField<String> title = new ObservableField<>(UIUtils.getString(R.string.apply_one_order_part));
......@@ -59,7 +57,7 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
@Override
public void queryPartList() {
ApiFactory.queryPart(mOrderId, mType).subscribe(baseObserver(
OrderApiFactory.queryPart(mOrderId, mType).subscribe(baseObserver(
orderPart -> datas.set(orderPart)
, responeThrowable -> datas.set(Constants.FAILED)));
}
......@@ -70,8 +68,8 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, mOrderId);
bundle.putInt(Constants.TYPE, Constants.APPLY_PART);
mView.startActivity(CommonSubmiteActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "applyApply");
mView.startActivity(applyAndRefuseActivity.class, bundle);
MobclickAgent.onEvent(BaseApplication.getContext(), "applyApply");
} else if (mType == 2) {
dumpToReturnPart(Constants.BYMYSELF, null);
}
......@@ -83,8 +81,8 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
bundle.putInt(Constants.ORDER_ID, mOrderId);
bundle.putInt(Constants.PART_ID, partId);
bundle.putInt(Constants.TYPE, Constants.REFUSE_PART);
mView.startActivity(CommonSubmiteActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "refuseApply");
mView.startActivity(applyAndRefuseActivity.class, bundle);
MobclickAgent.onEvent(BaseApplication.getContext(), "refuseApply");
}
@Override
......@@ -99,7 +97,7 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
}
bundle.putInt(Constants.TYPE, type);
mView.startActivity(ReturnPartActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "returnApply");
MobclickAgent.onEvent(BaseApplication.getContext(), "returnApply");
}
@Override
......@@ -108,19 +106,19 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
bundle.putString(Constants.COURIER_NUM, courierNum);
bundle.putString(Constants.SHIPPER_CODE, shipperCode);
mView.startActivity(LogisticsInfoActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "queryLogistics");
MobclickAgent.onEvent(BaseApplication.getContext(), "queryLogistics");
}
public Observable<Boolean> cancleApply(int partId) {
mView.showDialog();
MobclickAgent.onEvent(MyApplication.getContext(), "cancleApply");
return ApiFactory.cancleApply(partId, mUserName);
MobclickAgent.onEvent(BaseApplication.getContext(), "cancleApply");
return OrderApiFactory.cancleApply(partId, mUserName);
}
@Override
public Observable receivePart(int partId) {
mView.showDialog();
MobclickAgent.onEvent(MyApplication.getContext(), "receiveApply");
return ApiFactory.receivePart(partId, mUserName);
MobclickAgent.onEvent(BaseApplication.getContext(), "receiveApply");
return OrderApiFactory.receivePart(partId, mUserName);
}
}
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java → orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderContract.java
package com.dayu.bigfish.presenter.processorder;
package com.dayu.order.presenter.processorder;
import com.dayu.base.ui.presenter.BasePresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
package com.dayu.bigfish.presenter.processorder;
package com.dayu.order.presenter.processorder;
import android.databinding.ObservableBoolean;
......@@ -6,20 +6,20 @@ import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.sqlbean.OrderInfo;
import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.bigfish.ui.ServerInstructionActivity;
import com.dayu.bigfish.ui.SopWebViewActivity;
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.utils.UserManager;
import com.luck.picture.lib.tools.PictureFileUtils;
import com.umeng.analytics.MobclickAgent;
......@@ -37,14 +37,14 @@ import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH;
/**
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
private int mOrderId;
private int mPosition;
......@@ -103,12 +103,12 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderField.get().setOtherPrice("");
mOrderField.get().setOtherInfo("");
}
MobclickAgent.onEvent(MyApplication.getContext(), "get_customer_money");
MobclickAgent.onEvent(BaseApplication.getContext(), "get_customer_money");
}
@Override
public void getOrderInfo(int orderId) {
ApiFactory.queryOrderInfo(orderId).subscribe(baseObserver(detail -> {
OrderApiFactory.queryOrderInfo(orderId).subscribe(baseObserver(detail -> {
mDetail.set(detail);
mAnyContacts = detail.getAnyContacts();
}));
......@@ -146,7 +146,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
}
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
OrderApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
mView.showToast(R.string.order_commite_success);
int status = 0;
if (mAnyContacts == 0) {
......@@ -157,7 +157,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
}
EventBus.getDefault().post(new OrderState(status, mPosition));
mOrderInfoDao.deleteByKey((long) orderId);
PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
mView.dumpBack();
}));
}
......@@ -178,13 +178,13 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
part[i] = body;
}
ApiFactory.uploadPhoto(part).subscribe(baseObserver(list -> {
BaseApiFactory.uploadPhoto(part).subscribe(baseObserver(list -> {
OrderInfo info = mOrderField.get();
commitOrder(list, mOrderId, info.getServerRecord(),
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
mImages.clear();
PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
}));
}
......@@ -196,7 +196,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderInfoDao.insertOrReplace(mOrderField.get());
mView.showToast(R.string.order_save_success);
mView.dumpBack();
MobclickAgent.onEvent(MyApplication.getContext(), "save_order");
MobclickAgent.onEvent(BaseApplication.getContext(), "save_order");
}
@Override
......@@ -216,7 +216,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
}
MobclickAgent.onEvent(MyApplication.getContext(), "commite_order");
MobclickAgent.onEvent(BaseApplication.getContext(), "commite_order");
}
@Override
......@@ -225,7 +225,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
bundle.putInt(Constants.ORDER_ID, mOrderId);
bundle.putInt(Constants.ORDER_POSTION, mPosition);
mView.startActivity(SopWebViewActivity.class, bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "modify_sop");
MobclickAgent.onEvent(BaseApplication.getContext(), "modify_sop");
}
@Override
......
app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingContract.java → orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingContract.java
package com.dayu.bigfish.presenter.receivingorder;
package com.dayu.order.presenter.receivingorder;
import com.dayu.common.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
import com.dayu.order.presenter.BaseOrderPresenter;
/**
......
app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
package com.dayu.bigfish.presenter.receivingorder;
package com.dayu.order.presenter.receivingorder;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.RefreshReceivingNum;
import com.dayu.event.RefreshTab;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshReceivingNum;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.event.SwtichFragment;
import com.dayu.bigfish.ui.OrderDetailsActivity;
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.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......@@ -30,7 +29,6 @@ import io.reactivex.disposables.Disposable;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class ReceivingPresenter extends ReceivingContract.Presenter {
public ObservableField datas = new ObservableField<>();
private int mTotalRows;
......@@ -50,14 +48,14 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
@Override
public void getOrders(int state, int page, int pageSize, int siteId, int userId) {
ApiFactory.getOrders(state, page, pageSize, siteId, userId).subscribe(baseObserver(
OrderApiFactory.getOrders(state, page, pageSize, siteId, userId).subscribe(baseObserver(
orderBasePageBean -> getOrderSuccess(orderBasePageBean),
throwable -> datas.set(Constants.FAILED)));
}
@Override
public void receiveOrder(int orders, int engineer) {
ApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
OrderApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
aBoolean -> receiveOrderSuccess(), responeThrowable -> {
if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
refresh();
......@@ -106,7 +104,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID,orderId);
mView.startActivity(OrderDetailsActivity.class,bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "check_order_detail");
MobclickAgent.onEvent(BaseApplication.getContext(), "check_order_detail");
}
public int getmUserId() {
......
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartContract.java → orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartContract.java
package com.dayu.bigfish.presenter.returnpart;
package com.dayu.order.presenter.returnpart;
import com.bigkoo.pickerview.OptionsPickerView;
......@@ -8,7 +8,8 @@ import com.dayu.common.BaseView;
import java.util.List;
/**
* Created by luo on 2016/8/4.
* Created by luo
* on 2016/8/4.
*/
public interface ReturnPartContract {
......
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartPresenter.java
package com.dayu.bigfish.presenter.returnpart;
package com.dayu.order.presenter.returnpart;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.bigfish.ui.KaAddressActivity;
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.order.ui.activity.KaAddressActivity;
import com.dayu.utils.UserManager;
import org.greenrobot.eventbus.EventBus;
......@@ -27,7 +26,6 @@ import okhttp3.RequestBody;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class ReturnPartPresenter extends ReturnPartContract.Presenter {
public ObservableField<String> kaComent = new ObservableField<>();
public ObservableField<String> spComent = new ObservableField<>();
......@@ -85,17 +83,17 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
if (mType == Constants.BYKA) {
ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver(aBoolean -> {
OrderApiFactory.returnPartByKA(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1));
}));
} else if (mType == Constants.BYMYSELF) {
ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver(aBoolean -> {
OrderApiFactory.returnPartSelf(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1));
}));
} else if (mType == Constants.BY_MODIFY_PART) {
ApiFactory.modifyPart(requestBody).subscribe(baseObserver(aBoolean -> {
OrderApiFactory.modifyPart(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1));
}));
......@@ -114,7 +112,7 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
public void getCourier() {
mView.showDialog();
mView.hideInput();
ApiFactory.queryShipperCompany().subscribe(baseObserver(this::showCouriesDialog));
OrderApiFactory.queryShipperCompany().subscribe(baseObserver(this::showCouriesDialog));
}
private void showCouriesDialog(List<ShipperCompany> shipperCompany) {
......
app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionContract.java → orderCenter/src/main/java/com/dayu/order/presenter/serverinstruction/ServerInstructionContract.java
package com.dayu.bigfish.presenter.serverinstruction;
package com.dayu.order.presenter.serverinstruction;
import com.dayu.base.ui.presenter.BaseListPresenter;
......
app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/serverinstruction/ServerInstructionPresenter.java
package com.dayu.bigfish.presenter.serverinstruction;
package com.dayu.order.presenter.serverinstruction;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.ui.WebViewActivity;
import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.ServerInstruction;
import com.dayu.order.ui.activity.WebViewActivity;
/**
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class ServerInstructionPresenter extends ServerInstructionContract.Presenter {
public ObservableField<Object> mDatas = new ObservableField<>();
private int mSpuId;
......@@ -34,7 +32,7 @@ public class ServerInstructionPresenter extends ServerInstructionContract.Presen
@Override
public void getInstructs() {
ApiFactory.getInstruction(mSpuId, mPage, Constants.PAGESIZE).subscribe(baseObserver(
OrderApiFactory.getInstruction(mSpuId, mPage, Constants.PAGESIZE).subscribe(baseObserver(
(BasePageBean<ServerInstruction> datas) -> {
mPage++;
mDatas.set(datas);
......
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeContract.java → orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeContract.java
package com.dayu.bigfish.presenter.subcribeTime;
package com.dayu.order.presenter.subcribeTime;
import com.bigkoo.pickerview.TimePickerView;
......
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
package com.dayu.bigfish.presenter.subcribeTime;
package com.dayu.order.presenter.subcribeTime;
import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.bean.event.RefreshTab;
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.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import com.dayu.utils.UtilsUserAccountMatcher;
......@@ -26,9 +25,9 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
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.order.common.OrderConstant.ORDER_DOING;
import static com.dayu.order.common.OrderConstant.ORDER_YUYUE;
import static com.dayu.order.common.OrderConstant.SUBCRIBE_TIME;
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;
......@@ -37,7 +36,6 @@ import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
* Created by luofan
* on 2017/11/16.
*/
@InstanceFactory
public class SubcribeTimePresenter extends SubcribeContract.Presenter {
public ObservableField<String> mInfo = new ObservableField<>("");
public ObservableField<String> mDay = new ObservableField<>();
......@@ -90,7 +88,7 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
@Override
public void subcribeTime(int orderId, String doorTime, String doorComment) {
ApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(aBoolean -> {
OrderApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(aBoolean -> {
mView.showToast(R.string.order_commite_success);
if (mState == SUBCRIBE_TIME) {
mView.showToast(R.string.subcribe_time_success);
......
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordContract.java → orderCenter/src/main/java/com/dayu/order/presenter/worksRecord/OrderRecordContract.java
package com.dayu.bigfish.presenter.worksRecord;
package com.dayu.order.presenter.worksRecord;
import com.dayu.common.BaseView;
import com.dayu.bigfish.presenter.BaseOrderPresenter;
import com.dayu.order.presenter.BaseOrderPresenter;
import com.dayu.order.ui.adapter.OrderAdapter;
/**
* Created by luo on 2016/8/4.
......@@ -19,6 +20,8 @@ public interface OrderRecordContract {
* 开启搜索.
*/
void showSearch();
OrderAdapter getAdapter();
}
abstract class Presenter extends BaseOrderPresenter<View> {
......
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java → orderCenter/src/main/java/com/dayu/order/presenter/worksRecord/OrderRecordPresenter.java
package com.dayu.bigfish.presenter.worksRecord;
package com.dayu.order.presenter.worksRecord;
import android.databinding.Observable;
import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.Order;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......@@ -23,7 +21,6 @@ import java.util.List;
* Created by luofan
* on 2017/11/8.
*/
@InstanceFactory
public class OrderRecordPresenter extends OrderRecordContract.Presenter {
public ObservableField datas = new ObservableField();
public ObservableField<String> serchStr = new ObservableField();
......@@ -48,11 +45,11 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
@Override
public void getOrders(int state, int engineerId, int siteId, int page, int pageSize) {
ApiFactory.getOrders(state, engineerId, siteId, page, pageSize).subscribe(baseObserver(
OrderApiFactory.getOrders(state, engineerId, siteId, page, pageSize).subscribe(baseObserver(
orderBasePageBean -> {
datas.set(orderBasePageBean);
mPage++;
}, throwable -> datas.set(Constants.FAILED)));
datas.set(orderBasePageBean);
mPage++;
}, throwable -> datas.set(Constants.FAILED)));
}
@Override
......@@ -62,7 +59,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
@Override
public void showSearch() {
mList = ((OrderRecordActivity) mView).getmAdapter().getDatas();
mList = mView.getAdapter().getDatas();
mView.showSearch();
}
......@@ -88,7 +85,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID,orderId);
mView.startActivity(OrderDetailsActivity.class,bundle);
MobclickAgent.onEvent(MyApplication.getContext(), "check_order_detail");
MobclickAgent.onEvent(BaseApplication.getContext(), "check_order_detail");
}
public void doSearch(String str) {
......@@ -102,7 +99,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
}
}
datas.set(list);
((OrderRecordActivity) mView).getmAdapter().setLoadMore(false);
mView.getAdapter().setLoadMore(false);
}
}
app/src/main/java/com/dayu/bigfish/bean/sqlbean/OrderInfo.java → orderCenter/src/main/java/com/dayu/order/sqlbean/OrderInfo.java
package com.dayu.bigfish.bean.sqlbean;
package com.dayu.order.sqlbean;
import android.databinding.BaseObservable;
import android.databinding.Bindable;
import com.dayu.bigfish.BR;
import com.dayu.order.BR;
import org.greenrobot.greendao.annotation.Convert;
import org.greenrobot.greendao.annotation.Entity;
......@@ -75,7 +75,7 @@ public class OrderInfo extends BaseObservable {
this.engineerId = engineerId;
}
@Bindable
@Bindable
public String getServerRecord() {
return this.serverRecord;
}
......
app/src/main/java/com/dayu/bigfish/bean/sqlbean/StringConverter.java → orderCenter/src/main/java/com/dayu/order/sqlbean/StringConverter.java
package com.dayu.bigfish.bean.sqlbean;
package com.dayu.order.sqlbean;
import org.greenrobot.greendao.converter.PropertyConverter;
......
app/src/main/java/com/dayu/bigfish/ui/KaAddressActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/KaAddressActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityKaAddressLayoutBinding;
import com.dayu.bigfish.presenter.kaaddress.KaAddressContract;
import com.dayu.bigfish.presenter.kaaddress.KaAddressPresenter;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityKaAddressLayoutBinding;
import com.dayu.order.presenter.kaaddress.KaAddressContract;
import com.dayu.order.presenter.kaaddress.KaAddressPresenter;
/**
* Created by luofan on 2018/1/19.
......
app/src/main/java/com/dayu/bigfish/ui/LogisticsInfoActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/LogisticsInfoActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityLogisticsInfoBinding;
import com.dayu.bigfish.presenter.logisticsinfo.LogisticsInfoContract;
import com.dayu.bigfish.presenter.logisticsinfo.LogisticsInfoPresenter;
import com.dayu.bigfish.ui.adapter.LogisticsAdapter;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityLogisticsInfoBinding;
import com.dayu.order.presenter.logisticsinfo.LogisticsInfoContract;
import com.dayu.order.presenter.logisticsinfo.LogisticsInfoPresenter;
import com.dayu.order.ui.adapter.LogisticsAdapter;
/**
* Created by luofan on 2018/1/23.
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
......@@ -7,15 +7,15 @@ import android.view.View;
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;
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.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.ActivityOrderDetailsBinding;
import com.dayu.order.presenter.orderdetail.OrderDetailContract;
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.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
......@@ -24,7 +24,7 @@ import java.util.ArrayList;
* 工单详情信息页面，包含工单详情、服务记录、备件信息.
* on 2017/9/13.
*/
@Route(path = RouterPath.PATH_ORDER_DETAIL)
@Route(path = BaseRouterPath.PATH_ORDER_DETAIL)
public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, ActivityOrderDetailsBinding>
implements OrderDetailContract.View {
private OrderDetaillsFragment orderDatailsFragment;
......
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.content.Context;
import android.view.View;
......@@ -6,14 +6,14 @@ import android.view.inputmethod.InputMethodManager;
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.Order;
import com.dayu.bigfish.databinding.ActivityOrderRecordBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordContract;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.provider.router.RouterPath;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.ActivityOrderRecordBinding;
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.widgets.listener.OnItemClickListener;
import com.umeng.analytics.MobclickAgent;
......@@ -21,7 +21,7 @@ import com.umeng.analytics.MobclickAgent;
* 工单记录，展示已完成的订单
* on 2017/9/29.
*/
@Route(path = RouterPath.PATH_ORDER_HISTORY)
@Route(path = BaseRouterPath.PATH_ORDER_HISTORY)
public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, ActivityOrderRecordBinding>
implements OrderRecordContract.View {
private OrderAdapter mAdapter;
......@@ -71,7 +71,8 @@ public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, Acti
MobclickAgent.onEvent(mActivity, "search_order");
}
public OrderAdapter getmAdapter() {
@Override
public OrderAdapter getAdapter() {
return mAdapter;
}
}
app/src/main/java/com/dayu/bigfish/ui/PreviewActivty.java → orderCenter/src/main/java/com/dayu/order/ui/activity/PreviewActivty.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.content.Context;
import android.support.v4.view.PagerAdapter;
......@@ -6,11 +6,11 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivtyPreviewBinding;
import com.dayu.bigfish.utils.GlideImageLoader;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivtyPreviewBinding;
import com.dayu.utils.GlideImageLoader;
import java.util.ArrayList;
......
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.content.Intent;
import android.os.Environment;
......@@ -8,14 +8,14 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityProcessOrderBinding;
import com.dayu.bigfish.presenter.processorder.ProcessOrderContract;
import com.dayu.bigfish.presenter.processorder.ProcessOrderPresenter;
import com.dayu.bigfish.utils.GlideImageLoader;
import com.dayu.bigfish.utils.UtilsScreen;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityProcessOrderBinding;
import com.dayu.order.presenter.processorder.ProcessOrderContract;
import com.dayu.order.presenter.processorder.ProcessOrderPresenter;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.UtilsScreen;
import com.luck.picture.lib.PictureSelectionModel;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
......@@ -36,9 +36,9 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
implements ProcessOrderContract.View {
private int mIvWeight;
private ImageView mAddIV;
private static final int DELETECODE = 100;
private List<LocalMedia> mSelectList;
private ArrayList<String> mImages = new ArrayList<>();
private final int DELETECODE = 0;
@Override
public int getLayoutId() {
......@@ -62,7 +62,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
mIvWeight = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5;
mAddIV = new ImageView(mActivity);
mAddIV.setLayoutParams(new ViewGroup.LayoutParams(mIvWeight, mIvWeight));
mAddIV.setImageResource(R.mipmap.settopic_pictrue);
mAddIV.setImageResource(R.drawable.settopic_pictrue);
}
public void showPicDialog() {
......
app/src/main/java/com/dayu/bigfish/ui/QrCodeActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/QrCodeActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.databinding.QrCodeLayoutBinding;
import com.dayu.order.R;
import com.dayu.order.databinding.QrCodeLayoutBinding;
/**
* Created by luofan
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/ReceivingActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.databinding.ActivityCommomRecycleBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.receivingorder.ReceivingContract;
import com.dayu.bigfish.presenter.receivingorder.ReceivingPresenter;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.baselibrary.databinding.ActivityCommomRecycleBinding;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.presenter.receivingorder.ReceivingContract;
import com.dayu.order.presenter.receivingorder.ReceivingPresenter;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/ReturnPartActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/ReturnPartActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.bigkoo.pickerview.OptionsPickerView;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivityReturnPartBinding;
import com.dayu.bigfish.presenter.returnpart.ReturnPartContract;
import com.dayu.bigfish.presenter.returnpart.ReturnPartPresenter;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityReturnPartBinding;
import com.dayu.order.presenter.returnpart.ReturnPartContract;
import com.dayu.order.presenter.returnpart.ReturnPartPresenter;
import com.dayu.utils.UIUtils;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/ui/ServerInstructionActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInstructionActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.databinding.ActivityInstrcutionLayoutBinding;
import com.dayu.bigfish.databinding.ItemOrderInstructionBinding;
import com.dayu.bigfish.presenter.serverinstruction.ServerInstructionContract;
import com.dayu.bigfish.presenter.serverinstruction.ServerInstructionPresenter;
import com.dayu.order.R;
import com.dayu.order.api.protocol.ServerInstruction;
import com.dayu.order.databinding.ActivityInstrcutionLayoutBinding;
import com.dayu.order.databinding.ItemOrderInstructionBinding;
import com.dayu.order.presenter.serverinstruction.ServerInstructionContract;
import com.dayu.order.presenter.serverinstruction.ServerInstructionPresenter;
import com.dayu.widgets.listener.OnItemClickListener;
/**
......
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.content.Intent;
import android.net.Uri;
......@@ -12,12 +12,12 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityWebviewBinding;
import com.dayu.order.event.OrderState;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
......@@ -31,7 +31,8 @@ import org.json.JSONObject;
import java.io.File;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
/**
* Created by luofan on 2017/11/27.
......
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/SubcribeTimeActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.graphics.Color;
import com.bigkoo.pickerview.TimePickerView;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.databinding.ActivitySubscribeTimeBinding;
import com.dayu.bigfish.presenter.subcribeTime.SubcribeContract;
import com.dayu.bigfish.presenter.subcribeTime.SubcribeTimePresenter;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivitySubscribeTimeBinding;
import com.dayu.order.presenter.subcribeTime.SubcribeContract;
import com.dayu.order.presenter.subcribeTime.SubcribeTimePresenter;
import java.util.Calendar;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/TestActivity.java
......@@ -6,6 +6,7 @@ import android.view.Window;
import android.view.WindowManager;
import com.dayu.order.R;
import com.dayu.order.ui.fragment.HomeOrderFragment;
/**
......@@ -26,8 +27,8 @@ public class TestActivity extends AppCompatActivity {
}
public void initView() {
// getSupportFragmentManager().beginTransaction()
// .add(R.id.fl_content, HomeMessageFragment.newInstance())
// .commit();
getSupportFragmentManager().beginTransaction()
.add(R.id.fl_content, HomeOrderFragment.newInstance())
.commit();
}
}
app/src/main/java/com/dayu/bigfish/ui/WebViewActivity.java → orderCenter/src/main/java/com/dayu/order/ui/activity/WebViewActivity.java
package com.dayu.bigfish.ui;
package com.dayu.order.ui.activity;
import android.annotation.SuppressLint;
import android.content.Intent;
......@@ -15,9 +15,9 @@ import android.widget.LinearLayout;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityWebviewBinding;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/applyAndRefuseActivity.java 0 → 100755
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityApplyRefuseLayoutBinding;
import com.dayu.order.presenter.commonSubmite.ApplayAndRefusePresenter;
import com.dayu.order.presenter.commonSubmite.ApplyAndRefuseContract;
/**
* Created by luofan
* on 2017/11/8.
*/
public class applyAndRefuseActivity extends BaseActivity<ApplayAndRefusePresenter, ActivityApplyRefuseLayoutBinding>
implements ApplyAndRefuseContract.View {
@Override
public int getLayoutId() {
return R.layout.activity_apply_refuse_layout;
}
@Override
public void initView() {
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
}
app/src/main/java/com/dayu/bigfish/ui/adapter/LogisticsAdapter.java → orderCenter/src/main/java/com/dayu/order/ui/adapter/LogisticsAdapter.java
package com.dayu.bigfish.ui.adapter;
package com.dayu.order.ui.adapter;
import com.dayu.bigfish.R;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.bigfish.databinding.ItemLogisticsLayoutBinding;
import com.dayu.order.R;
import com.dayu.order.api.protocol.LogsticsInfo;
import com.dayu.order.databinding.ItemLogisticsLayoutBinding;
import com.dayu.utils.UIUtils;
/**
......@@ -19,11 +19,11 @@ public class LogisticsAdapter extends CoreAdapter<LogsticsInfo.Logistics, ItemLo
protected void onBind(ItemLogisticsLayoutBinding holder, LogsticsInfo.Logistics item, int position) {
super.onBind(holder, item, position);
if (position == 1) {
holder.ivCircle.setImageResource(R.mipmap.icon_circle_blue);
holder.ivCircle.setImageResource(R.drawable.icon_circle_blue);
holder.logisticsAddress.setTextColor(UIUtils.getColor(R.color.default_text_color));
holder.tvTime.setTextColor(UIUtils.getColor(R.color.default_text_color));
} else {
holder.ivCircle.setImageResource(R.mipmap.icon_circle_gray);
holder.ivCircle.setImageResource(R.drawable.icon_circle_gray);
holder.logisticsAddress.setTextColor(UIUtils.getColor(R.color.text_color));
holder.tvTime.setTextColor(UIUtils.getColor(R.color.text_color));
}
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java → orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
package com.dayu.bigfish.ui.adapter;
package com.dayu.order.ui.adapter;
import android.content.Intent;
import android.net.Uri;
......@@ -8,19 +8,19 @@ import android.view.View;
import com.amap.api.location.AMapLocation;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
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.utils.UtilsDate;
import com.dayu.common.Constants;
import com.dayu.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.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.ui.activity.ProcessOrderActivity;
import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.order.ui.activity.SubcribeTimeActivity;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFourTabAdapter.java → orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderFourTabAdapter.java
package com.dayu.bigfish.ui.adapter;
package com.dayu.order.ui.adapter;
import android.text.TextUtils;
import android.view.View;
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.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentOrderCancleItemBinding;
import com.dayu.utils.UtilsDate;
import static com.dayu.utils.UtilsDate.FORMAT_ONE;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java → orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderPartAdapter.java
package com.dayu.bigfish.ui.adapter;
package com.dayu.order.ui.adapter;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.databinding.ItemApplyPartLayoutBinding;
import com.dayu.bigfish.presenter.orderpart.OrderPartPresenter;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderPart;
import com.dayu.order.databinding.ItemApplyPartLayoutBinding;
import com.dayu.order.presenter.orderpart.OrderPartPresenter;
import com.dayu.utils.UIUtils;
import com.dayu.widgets.CustomDialog;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderThreeTabAdapter.java → orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
package com.dayu.bigfish.ui.adapter;
package com.dayu.order.ui.adapter;
import android.text.TextUtils;
import android.view.View;
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.order.R;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.databinding.FragmentOrderErrorItemBinding;
import com.dayu.utils.UtilsDate;
import static com.dayu.utils.UtilsDate.FORMAT_ONE;
......@@ -26,7 +26,7 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
@Override
protected void onBind(FragmentOrderErrorItemBinding holder, ErrorOrder item,int position) {
protected void onBind(FragmentOrderErrorItemBinding holder, ErrorOrder item, int position) {
super.onBind(holder, item,position);
initData(holder, item);
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/ApplicationOrderPartFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/ApplicationOrderPartFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import android.os.Bundle;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.bigfish.databinding.FragmentOrderApplicationPartBinding;
import com.dayu.bigfish.presenter.orderpart.OrderPartContract;
import com.dayu.bigfish.presenter.orderpart.OrderPartPresenter;
import com.dayu.bigfish.ui.adapter.OrderPartAdapter;
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.order.presenter.orderpart.OrderPartContract;
import com.dayu.order.presenter.orderpart.OrderPartPresenter;
import com.dayu.order.ui.adapter.OrderPartAdapter;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import android.content.res.AssetManager;
import android.graphics.Typeface;
......@@ -9,14 +9,14 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.bean.Tab;
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.base.ui.adapter.FragmentAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.event.RefreshTab;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Tab;
import com.dayu.order.databinding.FragmentOrderHomeBinding;
import com.dayu.order.presenter.homeorder.HomeOrderContract;
import com.dayu.order.presenter.homeorder.HomeOrderPresenter;
import com.dayu.utils.TabLayoutUtils;
import com.umeng.analytics.MobclickAgent;
......@@ -27,7 +27,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import static com.dayu.bigfish.R.id.tabicon;
/**
* Created by luofan on 2017/11/20.
......@@ -40,12 +39,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
private TextView mTabNumTv;
private TextView mTabTextTv;
private boolean isFirstAddTab = true;
public final static int SUBCRIBE_TIME = 2;//预约上门时间
public final static int ORDER_YUYUE = 3;//修改预约时间
public final static int ORDER_DOING = 4;//再次上门时间
public final static int ORDER_SOP_FINISH = 5;//SOP已完成
public final static int ORDER_FINISH = 6;//已完成
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
private String[] tabDesc;
private String mUmTag = "OrderFirstTabFragment";
......@@ -207,7 +200,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");
textView_number.setTypeface(tf);
textView_number.setText(number);
TextView textView = (TextView) newtab.findViewById(tabicon);
TextView textView = (TextView) newtab.findViewById(R.id.tabicon);
textView.setText(iconID);
return newtab;
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
import com.dayu.bigfish.ui.QrCodeActivity;
import com.dayu.bigfish.ui.ServerInstructionActivity;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.utils.UIUtils;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetailsServeFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetailsServeFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import android.os.Bundle;
import com.dayu.common.Constants;
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.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentOrderServeBinding;
import com.dayu.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFirstTabFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.common.Constants;
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.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.presenter.orderdoing.orderDoingContract;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.utils.ProgressUtil;
import com.dayu.widgets.listener.OnItemClickListener;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFourTabFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderFourTabAdapter;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentCommomRecycleBinding;
import com.dayu.order.databinding.FragmentOrderCancleItemBinding;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.presenter.orderdoing.orderDoingContract;
import com.dayu.order.ui.adapter.OrderFourTabAdapter;
import com.dayu.widgets.listener.OnItemClickListener;
......@@ -33,9 +33,9 @@ public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, Frag
mAdapter = new OrderFourTabAdapter(true);
mAdapter.setViewType(R.layout.fragment_order_cancle_item);
mBind.recyclerView.setAdapter(mAdapter);
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderdoingItemBinding>() {
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderCancleItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
public void OnItemClick(Order item, FragmentOrderCancleItemBinding bind) {
mPresenter.dumpDetail(item.getId());
}
});
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderPartFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderPartFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import com.dayu.common.Constants;
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.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentOrderPartBinding;
import com.dayu.utils.TabLayoutUtils;
import java.util.ArrayList;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderSecondTabFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshServe;
import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.dayu.common.Constants;
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.utils.ProgressUtil;
import com.dayu.widgets.listener.OnItemClickListener;
......@@ -20,10 +20,10 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_SOP_FINISH;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
import static com.dayu.order.common.OrderConstant.ORDER_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_YUYUE;
/**
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderThreeTabFragment.java → orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderThreeTabFragment.java
package com.dayu.bigfish.ui.fragment;
package com.dayu.order.ui.fragment;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.databinding.FragmentCommomRecycleBinding;
import com.dayu.bigfish.databinding.FragmentOrderdoingItemBinding;
import com.dayu.bigfish.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.bigfish.presenter.orderdoing.orderDoingContract;
import com.dayu.bigfish.ui.adapter.OrderThreeTabAdapter;
import com.dayu.order.R;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.databinding.FragmentCommomRecycleBinding;
import com.dayu.order.databinding.FragmentOrderErrorItemBinding;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.presenter.orderdoing.orderDoingContract;
import com.dayu.order.ui.adapter.OrderThreeTabAdapter;
import com.dayu.widgets.listener.OnItemClickListener;
......@@ -31,9 +31,9 @@ public class OrderThreeTabFragment extends BaseFragment<OrderDoingPresenter, Fra
OrderThreeTabAdapter adapter = new OrderThreeTabAdapter(false);
adapter.setViewType(R.layout.fragment_order_error_item);
mBind.recyclerView.setAdapter(adapter);
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderdoingItemBinding>() {
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<ErrorOrder,FragmentOrderErrorItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
public void OnItemClick(ErrorOrder item, FragmentOrderErrorItemBinding bind) {
mPresenter.dumpDetail(item.getId());
}
});
......
orderCenter/src/main/release/AndroidManifest.xml
......@@ -5,7 +5,52 @@
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".ui.activity.TestActivity" />
<activity
android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.applyAndRefuseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SopWebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SubcribeTimeActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.order.ui.activity.ReceivingActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" />
<activity
android:name="com.dayu.order.ui.activity.OrderRecordActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" />
<activity
android:name=".ui.activity.ProcessOrderActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.PreviewActivty"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.KaAddressActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.LogisticsInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.QrCodeActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.OrderDetailsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInstructionActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.WebViewActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
orderCenter/src/main/res/layout/activity_apply_refuse_layout.xml 0 → 100755
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.dayu.order.presenter.commonSubmite.ApplayAndRefusePresenter" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@={presenter.mTitle}" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}"
/>
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:onClick="@{()->presenter.commite()}"
android:text="@string/submit"
android:textColor="@color/cl_home_button"
android:textSize="15sp" />
</RelativeLayout>
<ImageView style="@style/card_line" />
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_163"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="top"
android:hint="@{presenter.mHint}"
android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_17"
android:text="@={presenter.mComment}"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_ka_address_layout.xml → orderCenter/src/main/res/layout/activity_ka_address_layout.xml
......@@ -5,7 +5,7 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.kaaddress.KaAddressPresenter" />
type="com.dayu.order.presenter.kaaddress.KaAddressPresenter" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/activity_logistics_info.xml → orderCenter/src/main/res/layout/activity_logistics_info.xml
......@@ -5,8 +5,9 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.logisticsinfo.LogisticsInfoPresenter" />
<import type="android.view.View"/>
type="com.dayu.order.presenter.logisticsinfo.LogisticsInfoPresenter" />
<import type="android.view.View" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......@@ -37,14 +38,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.dayu.bigfish.ui.views.DottdeLineView
<com.dayu.widgets.DottdeLineView
android:id="@+id/dl_line"
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginLeft="34.5dp"
android:layout_marginTop="80dp"
android:visibility="@{presenter.isShowLine?View.VISIBLE:View.GONE}"
android:layerType="software"/>
android:layerType="software"
android:visibility="@{presenter.isShowLine?View.VISIBLE:View.GONE}" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/lv_part"
......
app/src/main/res/layout/activity_order_record.xml → orderCenter/src/main/res/layout/activity_order_record.xml
......@@ -3,11 +3,10 @@
<data>
<import type="com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter" />
<variable
name="presenter"
type="com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter" />
type="com.dayu.order.presenter.worksRecord.OrderRecordPresenter" />
</data>
<LinearLayout
......@@ -47,7 +46,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:onClick="@{()->presenter.showSearch()}"
android:src="@mipmap/seacher" />
android:src="@drawable/seacher" />
</RelativeLayout>
<RelativeLayout
......@@ -69,7 +68,7 @@
<ImageView
android:id="@+id/iv"
style="@style/title_image_back"
android:src="@mipmap/seacher" />
android:src="@drawable/seacher" />
<TextView
android:id="@+id/tv_cancel"
......
app/src/main/res/layout/activity_process_order.xml → orderCenter/src/main/res/layout/activity_process_order.xml
......@@ -3,13 +3,12 @@
<data>
<import type="com.dayu.bigfish.presenter.processorder.ProcessOrderPresenter" />
<import type="android.view.View" />
<variable
name="presenter"
type="ProcessOrderPresenter" />
type="com.dayu.order.presenter.processorder.ProcessOrderPresenter" />
</data>
......@@ -529,7 +528,7 @@
android:layout_below="@id/ll_all_money"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_33"
android:background="@mipmap/save_back"
android:background="@drawable/save_back"
android:gravity="center"
android:onClick="@{()->presenter.saveOrder()}"
android:text="@string/tv_save_back"
......@@ -543,7 +542,7 @@
android:layout_below="@id/ll_all_money"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_33"
android:background="@mipmap/save_submit"
android:background="@drawable/save_submit"
android:onClick="@{()->presenter.submitOrder()}"
android:text="@string/submit_order"
android:textColor="@color/cl_white"
......@@ -567,7 +566,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_order_server" />
android:src="@drawable/icon_order_server" />
<TextView
android:layout_width="wrap_content"
......
app/src/main/res/layout/activity_return_part.xml → orderCenter/src/main/res/layout/activity_return_part.xml
......@@ -5,7 +5,7 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.returnpart.ReturnPartPresenter" />
type="com.dayu.order.presenter.returnpart.ReturnPartPresenter" />
<import type="android.text.TextUtils" />
</data>
......@@ -184,7 +184,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:drawableLeft="@mipmap/icon_ka_address"
android:drawableLeft="@drawable/icon_ka_address"
android:drawablePadding="4dp"
android:onClick="@{()->presenter.dumpToKaInfo()}"
android:paddingRight="@dimen/dp_15"
......
app/src/main/res/layout/activity_subscribe_time.xml → orderCenter/src/main/res/layout/activity_subscribe_time.xml
......@@ -3,11 +3,10 @@
<data>
<import type="com.dayu.bigfish.presenter.subcribeTime.SubcribeTimePresenter" />
<variable
name="presenter"
type="SubcribeTimePresenter" />
type="com.dayu.order.presenter.subcribeTime.SubcribeTimePresenter" />
</data>
<RelativeLayout
......
orderCenter/src/main/res/layout/fragment_commom_recycle.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.dayu.base.ui.presenter.BaseListPresenter" />
</data>
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_application_part.xml → orderCenter/src/main/res/layout/fragment_order_application_part.xml
......@@ -5,7 +5,7 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.orderpart.OrderPartPresenter" />
type="com.dayu.order.presenter.orderpart.OrderPartPresenter" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/fragment_order_cancle_item.xml → orderCenter/src/main/res/layout/fragment_order_cancle_item.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.Order" />
type="com.dayu.order.api.protocol.Order" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/fragment_order_datails.xml → orderCenter/src/main/res/layout/fragment_order_datails.xml
......@@ -9,7 +9,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.OrderDetail" />
type="com.dayu.order.api.protocol.OrderDetail" />
</data>
<RelativeLayout
......@@ -720,7 +720,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_order_server" />
android:src="@drawable/icon_order_server" />
<TextView
android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_order_error_item.xml → orderCenter/src/main/res/layout/fragment_order_error_item.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.ErrorOrder" />
type="com.dayu.order.api.protocol.ErrorOrder" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/fragment_order_home.xml → orderCenter/src/main/res/layout/fragment_order_home.xml
......@@ -6,7 +6,7 @@
<variable
name="presenter"
type="com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter" />
type="com.dayu.order.presenter.homeorder.HomeOrderPresenter" />
</data>
<LinearLayout
......
app/src/main/res/layout/fragment_orderdoing_item.xml → orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.Order" />
type="com.dayu.order.api.protocol.Order" />
</data>
......
app/src/main/res/layout/item_accessories_layout.xml → orderCenter/src/main/res/layout/item_accessories_layout.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.OrderDetail.accessories"/>
type="com.dayu.order.api.protocol.OrderDetail.accessories"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/item_logistics_info_header.xml → orderCenter/src/main/res/layout/item_logistics_info_header.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.LogsticsInfo" />
type="com.dayu.order.api.protocol.LogsticsInfo" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/item_logistics_layout.xml → orderCenter/src/main/res/layout/item_logistics_layout.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.LogsticsInfo.Logistics" />
type="com.dayu.order.api.protocol.LogsticsInfo.Logistics" />
<variable
name="position"
......@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_12"
android:layout_marginTop="3dp"
android:src="@mipmap/icon_circle_blue" />
android:src="@drawable/icon_circle_blue" />
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/item_order_instruction.xml → orderCenter/src/main/res/layout/item_order_instruction.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.ServerInstruction" />
type="com.dayu.order.api.protocol.ServerInstruction" />
</data>
<LinearLayout
......
app/src/main/res/layout/qr_code_layout.xml → orderCenter/src/main/res/layout/qr_code_layout.xml
......@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@mipmap/icon_appointment_code" />
android:src="@drawable/icon_appointment_code" />
<TextView
android:layout_width="wrap_content"
......
app/src/main/res/layout/serve_datails_item.xml → orderCenter/src/main/res/layout/serve_datails_item.xml
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.bigfish.bean.OrderDetail.RecordBean" />
type="com.dayu.order.api.protocol.OrderDetail.RecordBean" />
</data>
......
provider/build.gradle
......@@ -15,10 +15,10 @@ android {
}
buildTypes {
release {
useProguard true
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
......@@ -26,11 +26,7 @@ android {
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':baseLibrary')
}
provider/src/main/java/com/dayu/provider/common/ProviderConstant.java → provider/src/main/java/com/dayu/provider/common/ProviderConstant123.java
......@@ -5,7 +5,7 @@ package com.dayu.provider.common;
* on 2018/2/7.
*/
public class ProviderConstant {
public class ProviderConstant123 {
/**
* 订单id.
*/
......
provider/src/main/java/com/dayu/provider/router/RouterPath.java → provider/src/main/java/com/dayu/provider/router/BaseRouterPath.java
......@@ -5,16 +5,13 @@ package com.dayu.provider.router;
* on 2018/2/7.
*/
public class RouterPath {
public class BaseRouterPath {
/**
* APP.
*/
public final static String PATH_MAIN ="/app/main";
public final static String PATH_SETTING ="/app/setting";
/**
* 用户模块.
*/
public final static String PATH_LOGIN = "/user/login";
/**
* 工单模块.
......
settings.gradle
include ':app',':apt', ':annotation_lib', ':provider', ':baseLibrary', ':baseLibrary', ':messageCenter', ':userCenter', ':orderCenter'
include ':app', ':provider', ':baseLibrary', ':baseLibrary', ':messageCenter', ':userCenter', ':orderCenter', ':locationLibrary'
userCenter/build.gradle
......@@ -58,10 +58,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
......
userCenter/src/main/debug/AndroidManifest.xml
......@@ -7,19 +7,36 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.activity.LoginActivity">
<activity
android:name=".ui.activity.LoginActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.activity.AccountBalanceActivity" />
<activity android:name=".ui.activity.AgreementActivity" />
<activity android:name=".ui.activity.ModifyPersonInfoActivity" />
<activity android:name=".ui.activity.MyHeaderIvActivity" />
<activity android:name=".ui.activity.PersonInfoActivity" />
<activity android:name=".ui.activity.TestActivity" />
<activity android:name=".ui.activity.WithdrawalsActivity" />
<activity
android:name=".ui.activity.AccountBalanceActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.AgreementActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ModifyPersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MyHeaderIvActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.PersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.WithdrawalsActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
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.RouterPath;
import com.dayu.provider.router.BaseRouterPath;
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(RouterPath.PATH_MAIN).navigation();
ARouter.getInstance().build(BaseRouterPath.PATH_MAIN).navigation();
// mView.startActivity(TestActivity.class);
}
......
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.RouterPath;
import com.dayu.provider.router.BaseRouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.data.protocol.EngineerInfo;
import com.dayu.usercenter.data.protocol.OrderRecord;
......@@ -58,8 +58,8 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
userId = Integer.parseInt(userInfo.getAccountId());
siteId = Integer.parseInt(userInfo.getSiteId());
ProgressUtil.startLoad(mActivity);
mPresenter.getAllData(userId, siteId);
mPresenter.getAlipayAccount(userId);
// mPresenter.getAllData(userId, siteId);
// mPresenter.getAlipayAccount(userId);
}
@Override
......@@ -153,13 +153,14 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override
public void dumpToSetting() {
ARouter.getInstance().build(RouterPath.PATH_SETTING).navigation();
ARouter.getInstance().build(BaseRouterPath.PATH_SETTING).navigation();
MobclickAgent.onEvent(mActivity, "setting");
}
@Override
public void dumpToOrderRecord() {
ARouter.getInstance().build(RouterPath.PATH_SETTING).navigation();
Bundle bundle = new Bundle();
ARouter.getInstance().build(BaseRouterPath.PATH_ORDER_HISTORY).navigation();
MobclickAgent.onEvent(mActivity, "order_record");
}
......
userCenter/src/main/release/AndroidManifest.xml
......@@ -5,7 +5,31 @@
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".ui.activity.TestActivity" />
<activity
android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.AccountBalanceActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.AgreementActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ModifyPersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MyHeaderIvActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.PersonInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.WithdrawalsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.LoginActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
</application>
</manifest>
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