Skip to content

android / dayu

Go to a project
Commit 01383107 by wukun
Options

Merge remote-tracking branch 'origin/dev' into dev

parents c731c043 281b439a
Inline Side-by-side
Showing with 2 additions and 2 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -88,7 +88,7 @@ public class Constants { ...@@ -88,7 +88,7 @@ public class Constants {
// public static String ENVIROMENT = "release"; // public static String ENVIROMENT = "release";
// public static String PHOTO = "online"; // public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF; // public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.serviceupup.com"; // public static String BASE_URL = "https://mobile.dayuspm.com";
// 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";
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -475,7 +475,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -475,7 +475,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (item.getIsCheck() == 2) { } else if (item.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收"); ToastUtils.showShortToast("请等待商家验收");
} else { } else {
ToastUtils.showShortToast("等待验收"); // ToastUtils.showShortToast("等待验收");
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() + bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
......
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