Skip to content

android / dayu

Go to a project
Commit f23e256c by mReturn
Options

工单sop改造-添加version

parent 9dcd6e29
Inline Side-by-side
Showing with 66 additions and 48 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -42,35 +42,35 @@ public class Constants {
/**
* dev环境配置.
*/
public static String ENVIROMENT = "debug";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static final boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static String ENVIROMENT = "debug";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static final boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
/**
* uat测试环境配置.
*/
// public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// 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_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// 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 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_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// 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 ENVIROMENT = "uat";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
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_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
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 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_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
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)
......@@ -202,9 +202,9 @@ public class Constants {
public final static String UMENG_DEVICE_TOKEN = "umeng_device_token";
public final static String ORDER_POSTION = "order_position";
public final static String SOP_RID = "sop_rid";
public final static String SOP_ORDER_VERSION = "sop_order_version";
public final static String IS_SOP_VIDEO = "is_sop_video";
public final static String SOP_CAN_EDIT = "sop_can_edit";
public final static String SOP_OLD = "sop_old";
//是否显示去设置alipay账户de对话框
public final static String IS_SHOW_ALIPAY_DILAOG = "is_show_alipay_dialog";
//上个版本号
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 263
ext.verson_name = "2.6.3"
ext.version_code = 264
ext.verson_name = "2.6.4"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
......@@ -60,6 +60,15 @@ public class Order implements Serializable{
private int settlementType;
private double settlementPrice;
private String settlementDate;
private int version;
public int getVersion() {
return version;
}
public void setVersion(int version) {
this.version = version;
}
public int getSettlementType() {
return settlementType;
......
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
......@@ -56,6 +56,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
private int mState;
private String mPhone;
private int mKaId;
private int sopOrderVersion;
@Override
public void onAttached() {
......@@ -64,6 +65,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
mSpus = bundle.getParcelableArrayList(OrderConstant.SPUS);
mState = bundle.getInt(Constants.STATE);
mKaId = mView.getBundle().getInt(OrderConstant.KAADDRESSID, -1);
sopOrderVersion = bundle.getInt(Constants.SOP_ORDER_VERSION);
if (mKaId != -1) {
getPhone();
}
......@@ -220,7 +222,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
bundle.putSerializable(OrderConstant.SPU, mSpu);
bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus);
bundle.putInt(Constants.STATE, mState);
bundle.putInt(Constants.SOP_RID, mSpu.getOrdersRelationSpuId());
bundle.putInt(Constants.SOP_ORDER_VERSION, sopOrderVersion);
mView.startActivityAndFinish(SopWebViewActivity.class, bundle);
MobclickAgent.onEvent(BaseApplication.getContext(), "modify_sop");
}
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
......@@ -54,6 +54,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
private int mState;
private int mPage;
UserInfo userInfo;
public int sopOrderVersion;
@Override
public void onAttached() {
......@@ -175,7 +176,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);
bundle.putInt(Constants.ORDER_POSTION, 0);
bundle.putInt(OrderConstant.KAADDRESSID, kaId);
bundle.putInt(Constants.SOP_RID, spu.getOrdersRelationSpuId());
bundle.putInt(Constants.SOP_ORDER_VERSION, sopOrderVersion);
if (spu.getSopStatus() == 1 && spu.getStatus() == 1) {
mView.startActivity(SopWebViewActivity.class, bundle);
} else {
......
orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessPresenter.java
......@@ -89,6 +89,7 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
}
if (mOrder.getSpus().size() > 1) {
bundle.putInt(Constants.ID, mOrder.getId());
bundle.putInt(Constants.SOP_ORDER_VERSION, mOrder.getVersion());
mView.startActivity(ServerInfoActivity.class, bundle);
} else if (mOrder.getSpus().size() == 1) {
Spu spu = mOrder.getSpus().get(0);
......@@ -96,6 +97,7 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
getServerList(spu.getId(), mOrder.getKaCompanyId());
} else {
bundle.putInt(Constants.ID, mOrder.getSpus().get(0).getId());
bundle.putInt(Constants.SOP_ORDER_VERSION, mOrder.getVersion());
mView.startActivity(ServerListActivity.class, bundle);
}
}
......@@ -153,7 +155,7 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);
bundle.putInt(Constants.ORDER_POSTION, 0);
bundle.putInt(OrderConstant.KAADDRESSID, kaId);
bundle.putInt(Constants.SOP_RID, spu.getOrdersRelationSpuId());
bundle.putInt(Constants.SOP_ORDER_VERSION, mOrder.getVersion());
if (spu.getSopStatus() == 1 && spu.getStatus() == 1) {
mView.startActivity(SopWebViewActivity.class, bundle);
} else {
......
orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
......@@ -64,13 +64,7 @@ public class OrderServerPresenter extends OrderServerContract.Presenter {
}
bundle.putInt(OrderConstant.CREATEDSOURCE, mDetails.getCreatedSource());
bundle.putInt(ORDER_STATE, ORDER_SOP_FINISH);
if (mDetails.getVersion()>1 && mDetails.getSpus()!=null && mDetails.getSpus().size()>0){
bundle.putInt(Constants.SOP_RID, mDetails.getSpus().get(0).getId());
bundle.putBoolean(Constants.SOP_OLD, false);
}else {
bundle.putInt(Constants.SOP_RID, 0);
bundle.putBoolean(Constants.SOP_OLD, true);
}
bundle.putInt(Constants.SOP_ORDER_VERSION, mDetails.getVersion());
bundle.putBoolean(Constants.SOP_CAN_EDIT, false);
mView.startActivity(SopWebViewActivity.class, bundle);
}
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
......@@ -328,7 +328,8 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, mOrderId);
bundle.putInt(Constants.ORDER_POSTION, mPosition);
bundle.putInt(Constants.SOP_RID, 0);
if (mOrderDetail != null)
bundle.putInt(Constants.SOP_ORDER_VERSION, mOrderDetail.getVersion());
mView.startActivity(SopWebViewActivity.class, bundle);
MobclickAgent.onEvent(BaseApplication.getContext(), "modify_sop");
}
......
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
......@@ -27,11 +27,13 @@ public class ServerInfoPresenter extends ServerInfoContract.Presenter {
public ObservableField<Boolean> mIsShowPhone = new ObservableField<>(false);
private int mId;
private Integer mKaId;
private Integer sopOrderVersion;
private String mPhone;
@Override
public void onAttached() {
mId = mView.getBundle().getInt(Constants.ID);
sopOrderVersion = mView.getBundle().getInt(Constants.SOP_ORDER_VERSION);
mKaId = mView.getBundle().getInt(OrderConstant.KAADDRESSID, -1);
if (mKaId != -1) {
getPhone();
......@@ -87,7 +89,7 @@ public class ServerInfoPresenter extends ServerInfoContract.Presenter {
bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);
bundle.putInt(Constants.ORDER_POSTION, 0);
bundle.putInt(OrderConstant.KAADDRESSID, mKaId);
bundle.putInt(Constants.SOP_RID, spu.getOrdersRelationSpuId());
bundle.putInt(Constants.SOP_ORDER_VERSION, sopOrderVersion);
if (spu.getSopStatus() == 1 && spu.getStatus() == 1) {
mView.startActivity(SopWebViewActivity.class, bundle);
} else {
......
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListPresenter.java
......@@ -26,6 +26,7 @@ public class ServerListPresenter extends ServerListContract.Presenter {
private Integer mKaId;
private String mPhone;
private int mOrderType;
public Integer sopOrderVersion;
@Override
public ObservableField<Object> getSourceDatas() {
......@@ -37,6 +38,7 @@ public class ServerListPresenter extends ServerListContract.Presenter {
mId = mView.getBundle().getInt(Constants.ID);
String type = mView.getBundle().getString(OrderConstant.SPUS);
mKaId = mView.getBundle().getInt(OrderConstant.KAADDRESSID, -1);
sopOrderVersion = mView.getBundle().getInt(Constants.SOP_ORDER_VERSION);
if (mKaId != -1) {
getPhone();
}
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
......@@ -64,7 +64,7 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi
bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);
bundle.putInt(Constants.ORDER_POSTION, 0);
intent.putExtra(Constants.BUNDLE, bundle);
bundle.putInt(Constants.SOP_RID, item.getOrdersRelationSpuId());
bundle.putInt(Constants.SOP_ORDER_VERSION, mPresenter.sopOrderVersion);
startActivity(intent);
});
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
......@@ -63,15 +63,15 @@ public class SopWebViewActivity extends BaseActivity<SopPresenter, ActivitySopWe
private ArrayList<Spu> mSpus;
private int mCreatedSource;
private int mSpuState;
// private int sopRid;
private int version;
private boolean isOld;
@Override
public void onCreate(Bundle savedInstanceState) {
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
// sopRid = bundle.getInt(Constants.SOP_RID, 0);
isOld = bundle.getBoolean(Constants.SOP_CAN_EDIT,false);
version = bundle.getInt(Constants.SOP_ORDER_VERSION, 2);
isOld = version <= 1;
if (!isOld) {
SopLocalActivity.launch(this, mOrderId,bundle);
finish();
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -32,6 +32,7 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.SPUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsDate;
......@@ -368,7 +369,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
dumpProcessActivity(mItem, posiiton);
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 4) {
if (mItem.getSopStatus() == 1) {//sop启用
dumpSOPActivity(mItem.getId(), posiiton);
dumpSOPActivity(mItem, posiiton);
} else if (mItem.getSopStatus() == 0) {
dumpProcessActivity(mItem, posiiton);
}
......@@ -470,11 +471,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (order.getSpus().size() > 1) {
intent = new Intent(mContext, ServerInfoActivity.class);
bundle.putInt(Constants.ID, order.getId());
bundle.putInt(Constants.SOP_ORDER_VERSION, order.getVersion());
intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent);
} else if (order.getSpus().size() == 1) {
Spu spu = order.getSpus().get(0);
if (spu.getGoodNum() == 1) {
mPresenter.sopOrderVersion = order.getVersion();
if (order.getKaCompanyId() == null){
mPresenter.getServerList(spu.getId(), -1);
}else{
......@@ -483,6 +486,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else {
intent = new Intent(mContext, ServerListActivity.class);
bundle.putInt(Constants.ID, order.getSpus().get(0).getId());
bundle.putInt(Constants.SOP_ORDER_VERSION, order.getVersion());
intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent);
}
......@@ -490,13 +494,14 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
}
}
private void dumpSOPActivity(int id, int adapterPosition) {
Constants.serveOrderId = id;
private void dumpSOPActivity(Order mItem, int adapterPosition) {
ToastUtils.showShortToast("version: "+mItem.getVersion());
Constants.serveOrderId = mItem.getId();
Intent intent = new Intent(mContext, SopWebViewActivity.class);
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, id);
bundle.putInt(Constants.ORDER_ID, mItem.getId());
bundle.putInt(Constants.ORDER_POSTION, adapterPosition);
bundle.putInt(Constants.SOP_RID, 0);
bundle.putInt(Constants.SOP_ORDER_VERSION, mItem.getVersion());
intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent);
MobclickAgent.onEvent(mContext, "process_sop");
......
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