Skip to content

android / dayu

Go to a project
Commit d61a1969 by 罗翻
Options

工单详情增加跳转到服务说明

parent 320deecd
Expand all
Inline Side-by-side
Showing with 16 additions and 8 deletions
app/build.gradle
...@@ -24,8 +24,8 @@ android { ...@@ -24,8 +24,8 @@ android {
applicationId "com.dayu.bigfish" applicationId "com.dayu.bigfish"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 6 versionCode 7
versionName "1.2.0" versionName "1.3.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
......
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -25,7 +25,7 @@ public class Constants { ...@@ -25,7 +25,7 @@ public class Constants {
public static final String BASE_URL = "http://47.94.101.239:3112"; public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean UM_DEBUG = true; public static final boolean UM_DEBUG = true;
/**************************正式环境*******************************/ /**************************正式环境*******************************/
...@@ -33,6 +33,7 @@ public class Constants { ...@@ -33,6 +33,7 @@ public class Constants {
// public static final String BASE_URL = "https://mobile.dayu.ai"; // public static final String BASE_URL = "https://mobile.dayu.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop"; // public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static final boolean UM_DEBUG = false; // public static final boolean UM_DEBUG = false;
/*****************/ /*****************/
/** /**
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
...@@ -57,14 +57,12 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -57,14 +57,12 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
private OrderInfo mOrderInfo; private OrderInfo mOrderInfo;
private int isPay;//是否支付费用,默认=1 不支付费用 private int isPay;//是否支付费用,默认=1 不支付费用
private int mAnyContacts; private int mAnyContacts;
private int mSpuId;
@Override @Override
public void onAttached() { public void onAttached() {
Bundle bundle = mView.getBundle(); Bundle bundle = mView.getBundle();
mOrderId = bundle.getInt(Constants.ORDER_ID, 0); mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
mPosition = bundle.getInt(Constants.ORDER_POSTION, 0); mPosition = bundle.getInt(Constants.ORDER_POSTION, 0);
mSpuId = bundle.getInt(Constants.ID, 0);
UserInfo userInfo = UserManager.getInstance().getUser(); UserInfo userInfo = UserManager.getInstance().getUser();
mAccountId = Integer.parseInt(userInfo.getAccountId()); mAccountId = Integer.parseInt(userInfo.getAccountId());
mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao(); mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
...@@ -242,7 +240,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -242,7 +240,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@Override @Override
public void dumpToServerInstruction() { public void dumpToServerInstruction() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, mSpuId); bundle.putInt(Constants.ID, mDetail.get().getSpuId());
mView.startActivity(ServerInstructionActivity.class, bundle); mView.startActivity(ServerInstructionActivity.class, bundle);
} }
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java
...@@ -329,7 +329,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -329,7 +329,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
Intent intent = new Intent(mContext, ProcessOrderActivity.class); Intent intent = new Intent(mContext, ProcessOrderActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, detail.getId()); bundle.putInt(Constants.ORDER_ID, detail.getId());
bundle.putInt(Constants.ID, detail.getSpuId());
bundle.putInt(Constants.ORDER_POSTION, adapterPosition); bundle.putInt(Constants.ORDER_POSTION, adapterPosition);
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent); mContext.startActivity(intent);
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java
...@@ -12,6 +12,7 @@ import com.dayu.bigfish.base.DataBindingFragment; ...@@ -12,6 +12,7 @@ import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding; import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
import com.dayu.bigfish.ui.QrCodeActivity; import com.dayu.bigfish.ui.QrCodeActivity;
import com.dayu.bigfish.ui.ServerInstructionActivity;
import com.dayu.bigfish.utils.UIUtils; import com.dayu.bigfish.utils.UIUtils;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
...@@ -52,6 +53,7 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -52,6 +53,7 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
public void initDataView(OrderDetail dataBean) { public void initDataView(OrderDetail dataBean) {
mBind.tvOrderState.setText(getStaus(dataBean.getStatus())); mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
mBind.tvLookMore.setOnClickListener(o -> lookMore()); mBind.tvLookMore.setOnClickListener(o -> lookMore());
mBind.llServerInstruction.setOnClickListener(v -> dumpToServerInstruction());
if (dataBean.getStatus() == 4 && dataBean.getSubStatus() == 6) { if (dataBean.getStatus() == 4 && dataBean.getSubStatus() == 6) {
mBind.customerAcceptance.setVisibility(View.VISIBLE); mBind.customerAcceptance.setVisibility(View.VISIBLE);
} else { } else {
...@@ -125,4 +127,12 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -125,4 +127,12 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
MobclickAgent.onPageStart(TAG); MobclickAgent.onPageStart(TAG);
} }
} }
public void dumpToServerInstruction() {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, mDetail.getSpuId());
Intent intent = new Intent(mActivity, ServerInstructionActivity.class);
intent.putExtra(Constants.BUNDLE,bundle);
startActivity(intent);
}
} }
app/src/main/res/layout/fragment_order_home.xml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:id="@+id/tv_right_title" android:id="@+id/tv_right_title"
style="@style/title_right_text" style="@style/title_right_text"
android:onClick="@{()->presenter.dumpToOrderRecordActivity()}" android:onClick="@{()->presenter.dumpToOrderRecordActivity()}"
android:text="@string/order_history" android:text="@string/history_order"
android:textColor="#3faafc" android:textColor="#3faafc"
android:textSize="@dimen/dp_13.3" /> android:textSize="@dimen/dp_13.3" />
</RelativeLayout> </RelativeLayout>
......
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