Skip to content

android / dayu

Go to a project
Commit 2a3414fc by mReturn
Options

fix bug

parent 1f943508
Inline Side-by-side
Showing with 36 additions and 31 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -60,19 +60,19 @@ public class Constants { ...@@ -60,19 +60,19 @@ public class Constants {
/** /**
* uat测试环境配置. * uat测试环境配置.
*/ */
// public static String ENVIROMENT = "uat"; public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL; public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112"; public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 14; //小绿人商家id public static int XLR_PID = 14; //小绿人商家id
...@@ -80,19 +80,19 @@ public class Constants { ...@@ -80,19 +80,19 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
public static String ENVIROMENT = "release"; // public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF; // public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai"; // public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop"; // public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; // public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; // public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; // public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false; // public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id // public static int XLR_PID = 1936; //小绿人商家id
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17 ext.min_sdk_version = 17
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 272 ext.version_code = 273
ext.verson_name = "2.7.2" ext.verson_name = "2.7.3"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
...@@ -455,7 +455,8 @@ public interface OrderService { ...@@ -455,7 +455,8 @@ public interface OrderService {
* 工单sop列表项 * 工单sop列表项
*/ */
@GET(Constants.API_7200 + "/ordersRelationSpuItemSop") @GET(Constants.API_7200 + "/ordersRelationSpuItemSop")
Observable<BaseResponse<BasePageBean<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId); Observable<BaseResponse<BasePageBean<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId
, @Query("pageSize") int pageSize);
/** /**
* 工单sop列表项 * 工单sop列表项
...@@ -480,6 +481,7 @@ public interface OrderService { ...@@ -480,6 +481,7 @@ public interface OrderService {
@Query("sendType") int sendType, @Query("sendType") int sendType,
@Query("page") int page, @Query("page") int page,
@Query("pageSize") int pageSize); @Query("pageSize") int pageSize);
/** /**
* 备件物流列表 * 备件物流列表
* *
...@@ -538,6 +540,7 @@ public interface OrderService { ...@@ -538,6 +540,7 @@ public interface OrderService {
*/ */
@POST(Constants.API_7700 + "/spSendOutGoods/confirmReceive") @POST(Constants.API_7700 + "/spSendOutGoods/confirmReceive")
Observable<BaseResponse<Boolean>> receivePart(@Body PartReceiveData data); Observable<BaseResponse<Boolean>> receivePart(@Body PartReceiveData data);
/** /**
* 备件收货(旧版) * 备件收货(旧版)
*/ */
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
...@@ -48,6 +48,7 @@ import io.reactivex.Observable; ...@@ -48,6 +48,7 @@ import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH; import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.sopListData;
public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopLocalBinding> { public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopLocalBinding> {
int mSopRid; int mSopRid;
...@@ -136,7 +137,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL ...@@ -136,7 +137,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
private void initData() { private void initData() {
if (OrderConstant.sopListData == null) { if (OrderConstant.sopListData == null) {
showDialog(); showDialog();
Api.getService(OrderService.class).getSopList(mSopRid).compose(Api.applySchedulers()) Api.getService(OrderService.class).getSopList(mSopRid,100).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(datas -> { .subscribe(mPresenter.baseObserver(datas -> {
if (datas != null && datas.getData() != null) { if (datas != null && datas.getData() != null) {
OrderConstant.sopListData = datas.getData(); OrderConstant.sopListData = datas.getData();
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
...@@ -81,7 +81,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -81,7 +81,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
, responeThrowable -> mView.requestError())); , responeThrowable -> mView.requestError()));
} }
private void getIncomData() { public void getIncomData() {
Api.getService(UserService2.class).getIncoms(mUid).compose(Api.applySchedulers()) Api.getService(UserService2.class).getIncoms(mUid).compose(Api.applySchedulers())
.subscribe(baseObserver(data -> mView.setIncomData(data))); .subscribe(baseObserver(data -> mView.setIncomData(data)));
} }
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
...@@ -372,6 +372,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -372,6 +372,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
"申请提现成功，您的资金将于下月初打到您的银行卡上" "申请提现成功，您的资金将于下月初打到您的银行卡上"
, (dialog1, confirm) -> { , (dialog1, confirm) -> {
dialog1.dismiss(); dialog1.dismiss();
mPresenter.getIncomData();
}); });
dialog.setOneButton(true).show(); dialog.setOneButton(true).show();
} }
......
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