From 9e8f1f3f25f9efbfb465eea747a92d4f69bab33d Mon Sep 17 00:00:00 2001
From: luofan <lf@dayu.ai>
Date: Mon, 24 Dec 2018 16:02:15 +0800
Subject: [PATCH] android1.9.9
---
app/build.gradle | 2 ++
app/src/main/java/com/dayu/bigfish/InitializeActivity.java | 2 +-
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java | 2 +-
app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerContract.java | 8 +-------
app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java | 7 ++++---
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java | 6 +++---
app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java | 44 ++++++++++++++++++++++++++++++++++++++++----
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java | 3 ++-
app/src/main/java/com/dayu/bigfish/utils/HxManager.java | 5 +++--
baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java | 24 ++++++++++++++++++++++++
baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java | 1 -
baseSDK/src/main/java/com/dayu/common/Constants.java | 40 ++++++++++++++++++++--------------------
baseSDK/src/main/res/drawable-hdpi/seacher.png | Bin 0 -> 1350 bytes
baseSDK/src/main/res/drawable-xhdpi/seacher.png | Bin 0 -> 1350 bytes
baseSDK/src/main/res/drawable-xxhdpi/seacher.png | Bin 0 -> 1350 bytes
baseSDK/src/main/res/drawable-xxxhdpi/seacher.png | Bin 0 -> 1350 bytes
baseSDK/src/main/res/values/strings.xml | 6 ++++++
build.gradle | 6 ++++--
managercenter/src/main/java/com/dayu/managercenter/api/ManagerApiFactory.java | 4 ++++
managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java | 17 +++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java | 23 +++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/presenter/base/BaseManagerPresenter.java | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java | 30 ++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java | 12 ++++++------
managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java | 43 +++++++++++++++++++++----------------------
managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java | 10 ++++++----
managercenter/src/main/java/com/dayu/managercenter/ui/adapter/AllOrderAdapter.java | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/java/com/dayu/managercenter/ui/fragment/AllOrderFragment.java | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/release/AndroidManifest.xml | 4 ++++
managercenter/src/main/res/layout/activity_all_order.xml | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
managercenter/src/main/res/layout/fragment_recycle.xml | 2 +-
managercenter/src/main/res/layout/item_manager_order.xml | 1 +
orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java | 5 +++++
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java | 24 ++++++++++++------------
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java | 18 +++++++++---------
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java | 5 ++++-
orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java | 8 ++++++--
orderCenter/src/main/res/drawable-hdpi/seacher.png | Bin 1350 -> 0 bytes
orderCenter/src/main/res/drawable-xhdpi/seacher.png | Bin 1350 -> 0 bytes
orderCenter/src/main/res/drawable-xxhdpi/seacher.png | Bin 1350 -> 0 bytes
orderCenter/src/main/res/drawable-xxxhdpi/seacher.png | Bin 1350 -> 0 bytes
orderCenter/src/main/res/layout/fragment_order_datails.xml | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------
orderCenter/src/main/res/layout/item_multi_process_foot.xml | 3 +++
provider/src/main/java/com/dayu/provider/event/SwtichAllOrderEvent.java | 21 +++++++++++++++++++++
userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java | 2 +-
48 files changed, 1151 insertions(+), 165 deletions(-)
create mode 100755 baseSDK/src/main/res/drawable-hdpi/seacher.png
create mode 100755 baseSDK/src/main/res/drawable-xhdpi/seacher.png
create mode 100755 baseSDK/src/main/res/drawable-xxhdpi/seacher.png
create mode 100755 baseSDK/src/main/res/drawable-xxxhdpi/seacher.png
create mode 100755 managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/presenter/base/BaseManagerPresenter.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/ui/adapter/AllOrderAdapter.java
create mode 100644 managercenter/src/main/java/com/dayu/managercenter/ui/fragment/AllOrderFragment.java
create mode 100644 managercenter/src/main/res/layout/activity_all_order.xml
delete mode 100755 orderCenter/src/main/res/drawable-hdpi/seacher.png
delete mode 100755 orderCenter/src/main/res/drawable-xhdpi/seacher.png
delete mode 100755 orderCenter/src/main/res/drawable-xxhdpi/seacher.png
delete mode 100755 orderCenter/src/main/res/drawable-xxxhdpi/seacher.png
create mode 100755 provider/src/main/java/com/dayu/provider/event/SwtichAllOrderEvent.java
diff --git a/app/build.gradle b/app/build.gradle
index 0ecaa15..d5718c4 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
apply plugin: 'com.android.application'
+//apply plugin: 'kotlin-android'
+
android {
diff --git a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
index 58513a6..1fb69ba 100755
--- a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
@@ -14,9 +14,9 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivityInitializeMainBinding;
import com.dayu.bigfish.ui.MainActivity;
+import com.dayu.bigfish.ui.ManagerActivity;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
-import com.dayu.bigfish.ui.ManagerActivity;
import com.dayu.managercenter.ui.activity.ServiceStationActivity;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.activity.SmsLoginActivity;
diff --git a/app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java b/app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
index 7ad33ff..b993811 100644
--- a/app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
@@ -85,7 +85,7 @@ public class MainPresenter extends MainContract.Presenter {
@Override
public void upgradeVersion(String appId, String versionCode) {
- ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(
+ ApiFactory.getVersionInfo(appId, versionCode).subscribe(baseObserver(
info -> mView.showUpdateDialog(info)));
}
diff --git a/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerContract.java b/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerContract.java
index 2cbe285..8ef77f9 100755
--- a/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerContract.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerContract.java
@@ -11,13 +11,7 @@ public interface ManagerContract {
interface View extends BaseView {
- /**
- * 是否显示小红点.
- *
- * @param flag
- */
- void isShowRedIcon(boolean flag);
-
+ void isShowRedIcon(int num);
}
abstract class Presenter extends BasePresenter<View> {
diff --git a/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java b/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java
index 78771df..bc44b10 100644
--- a/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java
@@ -1,7 +1,9 @@
package com.dayu.bigfish.presenter.manager;
import com.dayu.bigfish.api.ApiFactory;
+import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
+import com.dayu.utils.SPUtils;
import com.dayu.utils.UserManager;
/**
@@ -20,9 +22,8 @@ public class ManagerPresenter extends ManagerContract.Presenter {
public void getHxNum(String accountId) {
mView.showDialog();
ApiFactory.getHxNum(accountId).subscribe(baseObserver(integer -> {
- if (integer > 0) {
- mView.isShowRedIcon(true);
- }
+ SPUtils.put(Constants.HX_NUM, integer);
+ mView.isShowRedIcon(integer);
}));
}
}
diff --git a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
index d36c368..cebbab2 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
@@ -179,15 +179,15 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
num = (int) SPUtils.get(Constants.HX_NUM, 0);
if (mBadgeView == null) {
mBadgeView = new BadgeView(this);
+ mBadgeView.setTargetView(mBind.tabThird);
+ mBadgeView.setBadgeGravity(Gravity.CENTER);
+ mBadgeView.setBadgeMargin(12, 0, 0, 12);
}
if (num < 100) {
mBadgeView.setText(num + "", TextView.BufferType.NORMAL);
} else {
mBadgeView.setText("99+");
}
- mBadgeView.setTargetView(mBind.tabThird);
- mBadgeView.setBadgeGravity(Gravity.CENTER);
- mBadgeView.setBadgeMargin(12, 0, 0, 12);
thirdFragment.getNum(num);
}
diff --git a/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java b/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
index acc68e4..c57a294 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
+import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
@@ -17,8 +18,15 @@ import com.dayu.bigfish.presenter.manager.ManagerPresenter;
import com.dayu.common.Constants;
import com.dayu.managercenter.ui.fragment.ManagerFragment;
import com.dayu.message.ui.fragment.HomeMessageFragment;
+import com.dayu.provider.event.RefreshHxNum;
import com.dayu.provider.router.RouterPath;
+import com.dayu.utils.SPUtils;
import com.dayu.utils.UserManager;
+import com.dayu.widgets.BadgeView;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
/**
* Created by luofan
@@ -32,6 +40,7 @@ public class ManagerActivity extends BaseActivity<ManagerPresenter, ActivityMana
private ManagerFragment mManagerFragment;
private HomeMessageFragment mMessageFragment;
private int mShowPosition;
+ private BadgeView mBadgeView;
@Override
public int getLayoutId() {
@@ -50,9 +59,9 @@ public class ManagerActivity extends BaseActivity<ManagerPresenter, ActivityMana
}
mBind.msg.setOnClickListener(v -> {
showHideFragment(1, 0);
- mBind.msg.setImageResource(R.mipmap.icon_news);
});
doAction(getIntent());
+ EventBus.getDefault().register(this);
}
private void addFragment() {
@@ -80,6 +89,9 @@ public class ManagerActivity extends BaseActivity<ManagerPresenter, ActivityMana
mShowPosition = showPosition;
if (showPosition == 1) {
mBind.msg.setVisibility(View.GONE);
+ if (mBadgeView != null) {
+ mBadgeView.setVisibility(View.GONE);
+ }
} else {
mBind.msg.setVisibility(View.VISIBLE);
}
@@ -95,7 +107,6 @@ public class ManagerActivity extends BaseActivity<ManagerPresenter, ActivityMana
secondIndex = 1;//大鱼通知
}
showHideFragment(1, 0);
- mBind.msg.setImageResource(R.mipmap.icon_news);
if (mMessageFragment != null) {
mMessageFragment.setIndex(secondIndex);
mMessageFragment.swtichFragment(secondIndex);
@@ -127,7 +138,32 @@ public class ManagerActivity extends BaseActivity<ManagerPresenter, ActivityMana
}
@Override
- public void isShowRedIcon(boolean flag) {
- mBind.msg.setImageResource(R.mipmap.icon_red_news);
+ public void isShowRedIcon(int num) {
+ num = (int) SPUtils.get(Constants.HX_NUM, 0);
+ if (mBadgeView == null) {
+ mBadgeView = new BadgeView(this);
+ mBadgeView.setTargetView(mBind.msg);
+ mBadgeView.setBadgeGravity(Gravity.CENTER);
+ mBadgeView.setBadgeMargin(12, 0, 0, 12);
+ }
+ if (num == 0) {
+ mBadgeView.setVisibility(View.GONE);
+ } else if (num < 100) {
+ mBadgeView.setBadgeCount(num);
+ mBadgeView.setVisibility(View.VISIBLE);
+ } else {
+ mBadgeView.setBadgeCount(99);
+ mBadgeView.setVisibility(View.VISIBLE);
+ }
+ if (mShowPosition == 1) {
+ mBadgeView.setVisibility(View.GONE);
+ }
+ mMessageFragment.getNum(num);
+ }
+
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void setHxNum(RefreshHxNum event) {
+ mPresenter.getHxNum(UserManager.getInstance().getUser().getHxAccount());
}
}
diff --git a/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java b/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
index aeb38ae..4a2e777 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
@@ -18,6 +18,7 @@ import org.json.JSONObject;
import java.util.Timer;
import java.util.TimerTask;
+import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
@@ -55,7 +56,7 @@ public class LocationService extends Service {
e.printStackTrace();
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
- ApiFactory.commiteLocation(requestBody).subscribe(aBoolean -> {
+ Disposable disposable = ApiFactory.commiteLocation(requestBody).subscribe(aBoolean -> {
}, throwable -> {
});
}
diff --git a/app/src/main/java/com/dayu/bigfish/utils/HxManager.java b/app/src/main/java/com/dayu/bigfish/utils/HxManager.java
index dfcd5cd..1126460 100644
--- a/app/src/main/java/com/dayu/bigfish/utils/HxManager.java
+++ b/app/src/main/java/com/dayu/bigfish/utils/HxManager.java
@@ -228,8 +228,9 @@ public class HxManager {
//注册环信消息监听
EMClient.getInstance().chatManager().addMessageListener(msgListener);
//注册一个监听连接状态的listener
-// TODO hx
-// EMClient.getInstance().addConnectionListener(new MyConnectionListener());
+ if ("release".equals(Constants.ENVIROMENT)) {
+ EMClient.getInstance().addConnectionListener(new MyConnectionListener());
+ }
}
//实现ConnectionListener接口
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java b/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
index a7d7792..572a7eb 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
@@ -105,6 +105,7 @@ public abstract class DataBindingFragment<B extends ViewDataBinding> extends Fra
}
protected void onVisible() {
+ doInit2();
doInit();
}
@@ -119,6 +120,29 @@ public abstract class DataBindingFragment<B extends ViewDataBinding> extends Fra
lazyLoad();
}
+ /**
+ * 除了第一次加载后，当页面可见回调.
+ */
+ protected void doInit2() {
+ if (!isPrepared || !isVisible || isFirstLoad) {
+ return;
+ }
+ visibleLoad();
+ }
+
+ /**
+ * 是否对用户可见.
+ *
+ * @return
+ */
+ protected boolean isVb() {
+ return isPrepared && isVisible;
+ }
+
+ protected void visibleLoad() {
+
+ }
+
protected void lazyLoad() {
}
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java b/baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java
index d274182..1cd366f 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/presenter/BasePresenter.java
@@ -59,7 +59,6 @@ public abstract class BasePresenter<V> {
@Override
public void onError(Throwable e) {
- Log.d("Photoerror******", e.toString());
ProgressUtil.stopLoad();
processException(e);
}
diff --git a/baseSDK/src/main/java/com/dayu/common/Constants.java b/baseSDK/src/main/java/com/dayu/common/Constants.java
index 3a649ca..a10e1a9 100755
--- a/baseSDK/src/main/java/com/dayu/common/Constants.java
+++ b/baseSDK/src/main/java/com/dayu/common/Constants.java
@@ -12,16 +12,16 @@ public class Constants {
/**
* 测试环境配置.
*/
- public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
- public static final String ENVIROMENT = "debug";
- 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 WEB_SOP = "http://47.94.101.239:9004/#/sop";
- public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
- public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
- public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
- public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
- public static final boolean IS_DEBUG = true;
+// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+// public static final String ENVIROMENT = "debug";
+// 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 WEB_SOP = "http://47.94.101.239:9004/#/sop";
+// public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
+// public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
+// public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
+// public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
+// public static final boolean IS_DEBUG = true;
/**
* uat环境配置.
@@ -40,16 +40,16 @@ public class Constants {
/**
* 正式环境.
*/
-// public static final String ENVIROMENT = "release";
-// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-// public static final String BASE_URL = "https://mobile.kf.ai";
-// 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_DETAIL = "https://sop.kf.ai/#/sopdetail";
-// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
-// public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
-// public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
-// public static final boolean IS_DEBUG = false;
+ public static final String ENVIROMENT = "release";
+ public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+ public static final String BASE_URL = "https://mobile.kf.ai";
+ 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_DETAIL = "https://sop.kf.ai/#/sopdetail";
+ public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
+ public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
+ public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
+ public static final boolean IS_DEBUG = false;
/**
* 演示环境
diff --git a/baseSDK/src/main/res/drawable-hdpi/seacher.png b/baseSDK/src/main/res/drawable-hdpi/seacher.png
new file mode 100755
index 0000000..99ece2c
Binary files /dev/null and b/baseSDK/src/main/res/drawable-hdpi/seacher.png differ
diff --git a/baseSDK/src/main/res/drawable-xhdpi/seacher.png b/baseSDK/src/main/res/drawable-xhdpi/seacher.png
new file mode 100755
index 0000000..99ece2c
Binary files /dev/null and b/baseSDK/src/main/res/drawable-xhdpi/seacher.png differ
diff --git a/baseSDK/src/main/res/drawable-xxhdpi/seacher.png b/baseSDK/src/main/res/drawable-xxhdpi/seacher.png
new file mode 100755
index 0000000..99ece2c
Binary files /dev/null and b/baseSDK/src/main/res/drawable-xxhdpi/seacher.png differ
diff --git a/baseSDK/src/main/res/drawable-xxxhdpi/seacher.png b/baseSDK/src/main/res/drawable-xxxhdpi/seacher.png
new file mode 100755
index 0000000..99ece2c
Binary files /dev/null and b/baseSDK/src/main/res/drawable-xxxhdpi/seacher.png differ
diff --git a/baseSDK/src/main/res/values/strings.xml b/baseSDK/src/main/res/values/strings.xml
index 8ad2474..39d0466 100644
--- a/baseSDK/src/main/res/values/strings.xml
+++ b/baseSDK/src/main/res/values/strings.xml
@@ -230,6 +230,7 @@
<string name="cancle_order">已取消</string>
<string name="appointment_already">已预约</string>
<string name="not_appointment_already">未预约</string>
+ <string name="in_server">服务中</string>
<string name="order_doing">进行中</string>
<string name="finish_order">已完成</string>
<string name="order_close">订单关闭</string>
@@ -464,6 +465,11 @@
<string name="edite">编辑</string>
<string name="modify_order">修改工单</string>
<string name="modify_order_success">工单修改成功!</string>
+ <string name="all_order">全部工单</string>
+ <string name="waite_manager_order">待派单</string>
+ <string name="servering">服务中</string>
+ <string name="order_success">已完工</string>
+ <string name="order_closed">已关闭</string>
<!--消息-->
diff --git a/build.gradle b/build.gradle
index 6bc2d06..cd45ac5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,14 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16
ext.target_sdk_version = 23
- ext.version_code = 20
- ext.verson_name = "1.9.8"
+ ext.version_code = 21
+ ext.verson_name = "1.9.9"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = true
ext.isDebugMinify = false
ext.arouter_api_version = '1.3.1'
ext.arouter_compiler_version = '1.1.4'
+// ext.kotlin_version = '1.2.50'
repositories {
jcenter()
@@ -23,6 +24,7 @@ buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0'
+// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/api/ManagerApiFactory.java b/managercenter/src/main/java/com/dayu/managercenter/api/ManagerApiFactory.java
index b042043..8b2fdda 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/api/ManagerApiFactory.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/api/ManagerApiFactory.java
@@ -144,4 +144,8 @@ public class ManagerApiFactory {
public static Observable<Boolean> cancelOrder(int id, String reason, String name) {
return Api.getService(ManagerService.class).cancelOrder(id, reason, name).compose(Api.applySchedulers());
}
+
+ public static Observable<BasePageBean<Order>> searchOrder(String key, int siteId,int userAccount, int status, int page, int pageSize) {
+ return Api.getService(ManagerService.class).searchOrder(key, siteId,userAccount, status, page, pageSize).compose(Api.applySchedulers());
+ }
}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java b/managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java
index ae61ad6..7194b59 100755
--- a/managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java
@@ -310,4 +310,21 @@ public interface ManagerService {
*/
@POST(ManagerConstant.CANCEL_ORDER)
Observable<BaseResponse<Boolean>> cancelOrder(@Query("id") int id, @Query("reason") String reason, @Query("updated") String name);
+
+ /**
+ * 搜索.
+ *
+ * @param key
+ * @param status
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ @GET(ManagerConstant.SEARCH_ORDER)
+ Observable<BaseResponse<BasePageBean<Order>>> searchOrder(@Query("key") String key,
+ @Query("siteId") int siteId,
+ @Query("engineerId") int engineerId,
+ @Query("status") int status,
+ @Query("page") int page,
+ @Query("pageSize") int pageSize);
}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java b/managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java
index 0f0dd7c..5b414a7 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java
@@ -13,6 +13,11 @@ public class ManagerConstant {
public final static String[] tabs = {UIUtils.getString(R.string.grab_order), UIUtils.getString(R.string.send_order)
, UIUtils.getString(R.string.subcribe_order), UIUtils.getString(R.string.change_order)};
+ public final static String[] allTab = {UIUtils.getString(R.string.all_order), UIUtils.getString(R.string.waite_manager_order)
+ , UIUtils.getString(R.string.not_appointment_already), UIUtils.getString(R.string.appointment_already),
+ UIUtils.getString(R.string.servering), UIUtils.getString(R.string.order_success)
+ , UIUtils.getString(R.string.order_cancle), UIUtils.getString(R.string.order_closed)};
+
public final static String[] GRAB_TAB = {UIUtils.getString(R.string.can_grab_order), UIUtils.getString(R.string.bargain_order)};
public final static int SEND_ORDER = 0;
@@ -26,6 +31,18 @@ public class ManagerConstant {
public final static int AGIN_ORDER = 6;
public final static int CREATE_ORDER = 7;
+
+ public final static int ALL = 0;
+ public final static int WAITE_MANAGER = 1;
+ public final static int WAITE_SUBCRIBE = 2;
+ public final static int AREADY_SUBCRIBE = 3;
+ public final static int SERVERING = 4;
+ public final static int FINISH = 5;
+ public final static int CANLE = 6;
+ public final static int CLOSE = 7;
+
+ public final static String KEY = "key";
+
/**
* 获取服务站列表.
*/
@@ -141,4 +158,10 @@ public class ManagerConstant {
* 取消工单.
*/
public static final String CANCEL_ORDER = "api-order" + "/orders/cancel";
+
+ /**
+ * 模糊搜索
+ */
+ public static final String SEARCH_ORDER = "/api-order/" + "orders/provider";
+
}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java
new file mode 100755
index 0000000..ea2f2f8
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java
@@ -0,0 +1,51 @@
+package com.dayu.managercenter.presenter.allorder;
+
+
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.dayu.base.ui.presenter.BaseListPresenter;
+import com.dayu.common.BaseView;
+import com.dayu.managercenter.data.Order;
+
+import java.util.List;
+
+/**
+ * Created by luo on 2016/8/4.
+ */
+public interface AllOrderContract {
+
+ interface View extends BaseView {
+ String getKey();
+
+ void setKey(String key);
+
+ void showEngineerDialog(List<String> list, OnOptionsSelectListener onOptionsSelectListener);
+ }
+
+ abstract class Presenter extends BaseListPresenter<View> {
+
+ /**
+ * 获取工单.
+ */
+ public abstract void getOrders();
+
+ /**
+ * 指派工程师.
+ */
+ public abstract void designate(int accountId,int id);
+
+ /**
+ * 获取工程师列表.
+ */
+ public abstract void getEngineers(Order order);
+
+ /**
+ * 再来一单.
+ */
+ public abstract void createAgain(int id);
+
+ /**
+ * 修改工单.
+ */
+ public abstract void modifyOrder(int id);
+ }
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java
new file mode 100644
index 0000000..15312a5
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderPresenter.java
@@ -0,0 +1,125 @@
+package com.dayu.managercenter.presenter.allorder;
+
+import android.databinding.ObservableField;
+import android.os.Bundle;
+
+import com.dayu.common.Constants;
+import com.dayu.event.ServiceStation;
+import com.dayu.event.UserInfo;
+import com.dayu.managercenter.R;
+import com.dayu.managercenter.api.ManagerApiFactory;
+import com.dayu.managercenter.common.ManagerConstant;
+import com.dayu.managercenter.data.Engineer;
+import com.dayu.managercenter.data.Order;
+import com.dayu.managercenter.ui.activity.ChangeReasonActivity;
+import com.dayu.managercenter.ui.activity.CreateOrderActivity;
+import com.dayu.utils.StationManager;
+import com.dayu.utils.UserManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by luofan
+ * on 2017/11/8.
+ */
+public class AllOrderPresenter extends AllOrderContract.Presenter {
+ public ObservableField<Object> datas = new ObservableField<>();
+ private Integer mSiteId;
+ private int mUserId;
+ private int mPage;
+ private int mStatus;
+ private String mUserName;
+ private int mId;
+ private Order mOrder;
+
+ @Override
+ public void onAttached() {
+ UserInfo user = UserManager.getInstance().getUser();
+ ServiceStation station = StationManager.getInstance().getStation();
+ mSiteId = user.getSiteId();
+ mUserId = Integer.parseInt(user.getAccountId());
+ mUserName = user.getAccountName();
+ mStatus = mView.getBundle().getInt(Constants.STATE, 0);
+ mId = station.getId();
+ }
+
+ @Override
+ public void getOrders() {
+ mView.showDialog();
+ ManagerApiFactory.searchOrder(mView.getKey(), mSiteId, mUserId, mStatus, mPage, Constants.PAGESIZE)
+ .subscribe(baseObserver(orderBasePageBean -> {
+ datas.set(orderBasePageBean);
+ mPage++;
+ }, throwable -> datas.set(Constants.FAILED)));
+ }
+
+ @Override
+ public ObservableField<Object> getSourceDatas() {
+ return datas;
+ }
+
+ @Override
+ public void designate(int accountId, int id) {
+ ManagerApiFactory.designate(id, accountId, mUserName).subscribe(baseObserver(
+ aBoolean -> {
+ mView.showToast(R.string.designate_success);
+ refresh();
+ }));
+ }
+
+ @Override
+ public void getEngineers(Order order) {
+ mOrder = order;
+ ManagerApiFactory.getEngineers(mId).subscribe(baseObserver(
+ engineers -> showEngineerDialog(engineers, order.getId())));
+ }
+
+ @Override
+ public void modifyOrder(int id) {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.STATE, ManagerConstant.MODIFY_ORDER);
+ bundle.putInt(Constants.ORDER_ID, id);
+ mView.startActivity(CreateOrderActivity.class, bundle);
+ }
+
+ @Override
+ public void createAgain(int id) {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.ORDER_ID, id);
+ bundle.putInt(Constants.STATE, ManagerConstant.AGIN_ORDER);
+ mView.startActivity(CreateOrderActivity.class, bundle);
+ }
+
+ private void showEngineerDialog(List<Engineer> engineers, int id) {
+ List<String> list = new ArrayList<>();
+ for (Engineer info : engineers) {
+ list.add(info.getRealName());
+ }
+ if (mOrder.getStatus() == ManagerConstant.WAITE_MANAGER) {
+ mView.showEngineerDialog(list, (options1, options2, options3, v)
+ -> designate(engineers.get(options1).getAccountId(), id));
+ } else {
+ mView.showEngineerDialog(list, (options1, options2, options3, v)
+ -> {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.ACCOUNT_ID, engineers.get(options1).getAccountId());
+ bundle.putInt(Constants.ID, id);
+ bundle.putInt(Constants.TYPE, ManagerConstant.CHANGE_ORDER_REASON);
+ mView.startActivity(ChangeReasonActivity.class, bundle);
+ });
+ }
+
+ }
+
+ @Override
+ public void refresh() {
+ mPage = 1;
+ getOrders();
+ }
+
+ @Override
+ public void loadMore() {
+ getOrders();
+ }
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/base/BaseManagerPresenter.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/base/BaseManagerPresenter.java
new file mode 100644
index 0000000..ba67d2d
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/base/BaseManagerPresenter.java
@@ -0,0 +1,74 @@
+package com.dayu.managercenter.presenter.base;
+
+import android.os.Bundle;
+
+import com.dayu.common.BaseView;
+import com.dayu.common.Constants;
+import com.dayu.event.ServiceStation;
+import com.dayu.event.UserInfo;
+import com.dayu.managercenter.R;
+import com.dayu.managercenter.api.ManagerApiFactory;
+import com.dayu.managercenter.common.ManagerConstant;
+import com.dayu.managercenter.data.Engineer;
+import com.dayu.managercenter.ui.activity.CreateOrderActivity;
+import com.dayu.utils.StationManager;
+import com.dayu.utils.UserManager;
+
+import java.util.List;
+
+/**
+ * Created by luofan
+ * on 2018/12/20.
+ */
+public abstract class BaseManagerPresenter<V extends BaseView> extends IBaseManagerPresenter<V> {
+ private int mId;
+ private String mUserName;
+
+ @Override
+ public void onAttached() {
+ ServiceStation station = StationManager.getInstance().getStation();
+ UserInfo user = UserManager.getInstance().getUser();
+ mUserName = user.getAccountName();
+ mId = station.getId();
+ }
+
+ @Override
+ public void designate(int accountId, int id) {
+ ManagerApiFactory.designate(id, accountId, mUserName).subscribe(baseObserver(
+ aBoolean -> {
+ mView.showToast(R.string.designate_success);
+ refresh();
+ }));
+ }
+
+ @Override
+ public void getEngineers(int id) {
+ ManagerApiFactory.getEngineers(mId).subscribe(baseObserver(
+ engineers -> showEngineerDialog(engineers, id)));
+ }
+
+ @Override
+ public void modifyOrder(int id) {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.STATE, ManagerConstant.MODIFY_ORDER);
+ bundle.putInt(Constants.ORDER_ID, id);
+ mView.startActivity(CreateOrderActivity.class, bundle);
+ }
+
+ @Override
+ public void createAgain(int id) {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.ORDER_ID, id);
+ bundle.putInt(Constants.STATE, ManagerConstant.AGIN_ORDER);
+ mView.startActivity(CreateOrderActivity.class, bundle);
+ }
+
+ private void showEngineerDialog(List<Engineer> engineers, int id) {
+// List<String> list = new ArrayList<>();
+// for (Engineer info : engineers) {
+// list.add(info.getRealName());
+// }
+// mView.showEngineerDialog(list, (options1, options2, options3, v)
+// -> designate(engineers.get(options1).getAccountId(), id));
+ }
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java
new file mode 100644
index 0000000..374fe33
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java
@@ -0,0 +1,30 @@
+package com.dayu.managercenter.presenter.base;
+
+import com.dayu.base.ui.presenter.BaseListPresenter;
+
+/**
+ * Created by luofan
+ * on 2018/12/20.
+ */
+public abstract class IBaseManagerPresenter<V> extends BaseListPresenter<V> {
+ /**
+ * 指派工程师.
+ */
+ public abstract void designate(int accountId, int id);
+
+ /**
+ * 获取工程师列表.
+ */
+ public abstract void getEngineers(int id);
+
+ /**
+ * 再来一单.
+ */
+ public abstract void createAgain(int id);
+
+ /**
+ * 修改工单.
+ */
+ public abstract void modifyOrder(int id);
+
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java
index 7f30016..302b6c1 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/changereason/ChangeReasonPresenter.java
@@ -1,7 +1,6 @@
package com.dayu.managercenter.presenter.changereason;
import android.databinding.ObservableField;
-import android.text.TextUtils;
import com.dayu.common.Constants;
import com.dayu.managercenter.R;
@@ -31,16 +30,13 @@ public class ChangeReasonPresenter extends ChangeReasonContract.Presenter {
mAccountId = mView.getBundle().getInt(Constants.ACCOUNT_ID);
mId = mView.getBundle().getInt(Constants.ID);
mState = mView.getBundle().getInt(Constants.STATE);
+ mReason.set("");
}
@Override
public void changeEngineer() {
- if (TextUtils.isEmpty(mReason.get())) {
- ToastUtils.showShortToast("请输入原因");
- return;
- }
- if (!TextUtils.isEmpty(mReason.get()) && UtilsUserAccountMatcher.containsEmoji(mReason.get())) {
+ if (mReason.get() != null && UtilsUserAccountMatcher.containsEmoji(mReason.get())) {
mView.showToast(R.string.no_emoij);
return;
}
@@ -60,6 +56,10 @@ public class ChangeReasonPresenter extends ChangeReasonContract.Presenter {
@Override
public void cancleOrder(int type) {
+ if (mReason.get() != null && UtilsUserAccountMatcher.containsEmoji(mReason.get())) {
+ mView.showToast(R.string.no_emoij);
+ return;
+ }
mView.showDialog();
ManagerApiFactory.cancelOrder(mId, mReason.get(), UserManager.getInstance().getUserName())
.subscribe(baseObserver(aBoolean -> {
diff --git a/managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java b/managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java
index fb05d72..237260a 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderPresenter.java
@@ -79,7 +79,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
private UserInfo mUser;
private ServiceStation mStation;
private int mState;
- private int mId;
+ private int mId = -1;
private OrderDetail mDetail;
@Override
@@ -87,8 +87,10 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
mRole = UserManager.getInstance().getRole();
mUser = UserManager.getInstance().getUser();
mSiteId = UserManager.getInstance().getUser().getSiteId();
- mState = mView.getBundle().getInt(Constants.STATE);
- mId = mView.getBundle().getInt(Constants.ORDER_ID, -1);
+ if (mView.getBundle() != null) {
+ mState = mView.getBundle().getInt(Constants.STATE);
+ mId = mView.getBundle().getInt(Constants.ORDER_ID, -1);
+ }
if (mId != -1) {
getOrderInfo(mId);
}
@@ -170,22 +172,19 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
private void queryProduct(OrderDetail detail, String categorId) {
mView.showDialog();
ManagerApiFactory.queryParentProduct(mSiteId, categorId)
- .subscribe(baseObserver(new Consumer<List<Product>>() {
- @Override
- public void accept(List<Product> products) throws Exception {
- mView.setInfo(detail, products);
- mDetail = detail;
- mSpuServerId = detail.getSpuId();
- serverName.set(detail.getSpuName());
- serverType.set(detail.getProviderName());
- sProduct.set(detail.getCategoryName());
- mCategoryId = detail.getCategoryId();
- mServerTypeId = detail.getProviderTypeId();
- if (!TextUtils.isEmpty(detail.getEngineerName())){
- mEngineer = new Engineer();
- mEngineer.setRealName(detail.getEngineerName());
- mEngineer.setAccountId(detail.getEngineerId());
- }
+ .subscribe(baseObserver(products -> {
+ mView.setInfo(detail, products);
+ mDetail = detail;
+ mSpuServerId = detail.getSpuId();
+ serverName.set(detail.getSpuName());
+ serverType.set(detail.getProviderName());
+ sProduct.set(detail.getCategoryName());
+ mCategoryId = detail.getCategoryId();
+ mServerTypeId = detail.getProviderTypeId();
+ if (!TextUtils.isEmpty(detail.getEngineerName())) {
+ mEngineer = new Engineer();
+ mEngineer.setRealName(detail.getEngineerName());
+ mEngineer.setAccountId(detail.getEngineerId());
}
}));
}
@@ -318,13 +317,13 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
EventBus.getDefault().post(new RefreshManagerEvent(ManagerConstant.CHANGE_ORDER));
}
});
+ getDisposable().add(disposable);
mView.dumpBack();
} else {
mView.dumpBack();
Bundle bundle = new Bundle();
- bundle.putInt(Constants.TYPE, mType);
bundle.putInt(Constants.STATE, mState);
- mView.startActivity(CreateOrderActivity.class);
+ mView.startActivity(CreateOrderActivity.class,bundle);
}
}));
}
@@ -435,7 +434,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
return null;
}
if (mEngineer != null) {
- params.put("engineerName", engineerName.get());
+ params.put("engineerName", mEngineer.getRealName());
params.put("engineerId", mEngineer.getAccountId());
}
params.put("categoryName", sProduct.get());
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
new file mode 100644
index 0000000..b315eaa
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
@@ -0,0 +1,101 @@
+package com.dayu.managercenter.ui.activity;
+
+import android.content.Context;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import com.dayu.base.ui.activity.DataBindingActivity;
+import com.dayu.base.ui.adapter.FragmentBaseAdapter;
+import com.dayu.managercenter.R;
+import com.dayu.managercenter.common.ManagerConstant;
+import com.dayu.managercenter.databinding.ActivityAllOrderBinding;
+import com.dayu.managercenter.ui.fragment.AllOrderFragment;
+import com.dayu.utils.TabLayoutUtils;
+import com.dayu.utils.UIUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Function;
+
+/**
+ * 全部工单页面.
+ * Created by luofan
+ * on 2018/12/19.
+ */
+public class AllOrderActivity extends DataBindingActivity<ActivityAllOrderBinding> {
+ private List<Fragment> mFragments;
+ private boolean needRefresh;//点击取消是否要刷新.
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_all_order;
+ }
+
+ @Override
+ public void initView() {
+ initFragment();
+ mBind.ivSaecher.setOnClickListener(v -> {
+ mBind.etSeacher.requestFocus();
+ mBind.rlSeacher.setVisibility(View.VISIBLE);
+ InputMethodManager inputManager = (InputMethodManager) mBind.etSeacher.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputManager.showSoftInput(mBind.etSeacher, 0);
+ });
+ mBind.tvCancel.setOnClickListener(v -> {
+ UIUtils.hideSoftInputFromWindow(mActivity);
+ mBind.rlSeacher.setVisibility(View.GONE);
+ mBind.etSeacher.setText("");
+ if (needRefresh) {
+ setKey();
+ }
+ needRefresh = false;
+ });
+ mBind.etSeacher.setOnEditorActionListener((v, actionId, event) -> {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+ setKey();
+ UIUtils.hideSoftInputFromWindow(mActivity);
+ needRefresh = true;
+ mBind.etSeacher.setCursorVisible(false);
+ return true;
+ }
+ return false;
+ });
+ mBind.etSeacher.setOnClickListener(v -> mBind.etSeacher.setCursorVisible(true));
+ }
+
+ private void setKey() {
+ for (Fragment fragment : mFragments) {
+ ((AllOrderFragment) fragment).setKey(mBind.etSeacher.getText().toString().trim());
+ }
+ }
+
+ private void initFragment() {
+ List<Integer> status = new ArrayList<>();
+ status.add(ManagerConstant.ALL);
+ status.add(ManagerConstant.WAITE_MANAGER);
+ status.add(ManagerConstant.WAITE_SUBCRIBE);
+ status.add(ManagerConstant.AREADY_SUBCRIBE);
+ status.add(ManagerConstant.SERVERING);
+ status.add(ManagerConstant.FINISH);
+ status.add(ManagerConstant.CANLE);
+ status.add(ManagerConstant.CLOSE);
+ Disposable disposable = Observable.fromIterable(status)
+ .map((Function<Integer, Fragment>) AllOrderFragment::newInstance).toList()
+ .map(allOrderFragments -> {
+ mFragments = allOrderFragments;
+ return FragmentBaseAdapter.newInstance(getSupportFragmentManager(), allOrderFragments, Arrays.asList(ManagerConstant.allTab));
+ }).subscribe(fragmentBaseAdapter -> {
+ mBind.viewpager.setAdapter(fragmentBaseAdapter);
+ mBind.tab.setupWithViewPager(mBind.viewpager);
+ mBind.tab.setTabMode(TabLayout.MODE_SCROLLABLE);
+ mBind.viewpager.setOffscreenPageLimit(mFragments.size());
+ });
+ TabLayoutUtils.setIndicator(mBind.tab, 3, 3, R.color.cl_receiving_order_item_data, mActivity);
+ }
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
index c64048d..858fe5d 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
@@ -94,7 +94,9 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
@Override
public void initView() {
- mState = getBundle().getInt(Constants.STATE);
+ if (getBundle() != null) {
+ mState = getBundle().getInt(Constants.STATE);
+ }
mBind.toolbar.setNavigationOnClickListener(v -> dumpBack());
mBind.tvTitle.setText(getString(R.string.create_order));
mBind.otherCustomer.setOnCheckedChangeListener((buttonView, isChecked) -> {
@@ -225,7 +227,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
ToastUtils.showShortToast(R.string.please_input_company_name);
return false;
}
- if ( UtilsUserAccountMatcher.containsEmoji(mBind.companyName.getText().toString())) {
+ if (UtilsUserAccountMatcher.containsEmoji(mBind.companyName.getText().toString())) {
showToast(R.string.no_emoij);
return false;
}
@@ -234,7 +236,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
ToastUtils.showShortToast(R.string.please_input_name);
return false;
}
- if ( UtilsUserAccountMatcher.containsEmoji(mBind.customerName.getText().toString())) {
+ if (UtilsUserAccountMatcher.containsEmoji(mBind.customerName.getText().toString())) {
showToast(R.string.no_emoij);
return false;
}
@@ -250,7 +252,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
ToastUtils.showShortToast(R.string.please_input_detail_address_first);
return false;
}
- if ( UtilsUserAccountMatcher.containsEmoji(mBind.customerDetailAddress.getText().toString())) {
+ if (UtilsUserAccountMatcher.containsEmoji(mBind.customerDetailAddress.getText().toString())) {
showToast(R.string.no_emoij);
return false;
}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/AllOrderAdapter.java b/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/AllOrderAdapter.java
new file mode 100644
index 0000000..757c78a
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/AllOrderAdapter.java
@@ -0,0 +1,212 @@
+package com.dayu.managercenter.ui.adapter;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.dayu.base.ui.adapter.CoreAdapter;
+import com.dayu.managercenter.R;
+import com.dayu.managercenter.common.ManagerConstant;
+import com.dayu.managercenter.data.Order;
+import com.dayu.managercenter.databinding.ItemManagerOrderBinding;
+import com.dayu.utils.UIUtils;
+import com.dayu.utils.UtilsDate;
+
+import java.text.ParseException;
+
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+
+/**
+ * Created by luofan
+ * on 2018/8/29.
+ */
+public class AllOrderAdapter extends CoreAdapter<Order, ItemManagerOrderBinding> {
+ private int state;
+
+ public AllOrderAdapter(boolean needFoot, int state) {
+ super(needFoot);
+ this.state = state;
+ }
+
+ @Override
+ protected void onBind(ItemManagerOrderBinding holder, Order item, int position) {
+ String address = item.getProvinceName() + item.getCityName() +
+ item.getDistrictName() + item.getAddress();
+ holder.itemTextWeixiuLeixing.setText(item.getCategoryName());
+ holder.itemTextWeixiu.setText(item.getProviderName());
+ holder.tvOrderDetail.setText(item.getSpuName());
+ holder.itemTextDizhi.setText(address);
+ holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
+ holder.itemTextUserName.setText(item.getCustomerName());
+ holder.itemTextUserPhone.setText(item.getCustomerMobile());
+ holder.tvErrorState.setVisibility(View.VISIBLE);
+ if (TextUtils.isEmpty(item.getSpuName())) {
+ holder.tvOrderDetail.setText(mContext.getString(R.string.no_server));
+ } else {
+ holder.tvOrderDetail.setText(item.getSpuName());
+ }
+ if (item.getCreatedSource() == 2 || item.getCreatedSource() == 3 || item.getCreatedSource() == 4) {
+ Order.SpusBean spu;
+ if (item.getSpus().size() == 0) {
+ return;
+ } else {
+ spu = item.getSpus().get(0);
+ }
+ if (TextUtils.isEmpty(spu.getKaSpuName())) {
+ holder.tvOrderDetail.setText(mContext.getString(R.string.no_server));
+ } else {
+ holder.tvOrderDetail.setText(spu.getKaSpuName());
+ }
+ holder.itemTextWeixiu.setText(spu.getProviderTypeName());
+ holder.itemTextWeixiuLeixing.setText(spu.getCategoryThreeName());
+ holder.tvServerType.setVisibility(View.VISIBLE);
+ if (item.getSpus().size() > 1) {
+ String str = UIUtils.getString(R.string.server_num);
+ String result = String.format(str, item.getSpus().size());
+ holder.tvServerType.setText(result);
+ } else {
+ String str = UIUtils.getString(R.string.single_server_num);
+ String result = String.format(str, spu.getFinNum(), spu.getGoodNum());
+ holder.tvServerType.setText(result);
+ }
+ } else {
+ holder.tvServerType.setVisibility(View.GONE);
+ }
+ holder.itemTextPhone.setOnClickListener(v -> {
+ if (mOnChildClickListener != null) {
+ mOnChildClickListener.OnChildClick(holder.itemTextPhone, this, position);
+ }
+ });
+
+ holder.itemUpdataTime.setOnClickListener(v -> {
+ if (mOnChildClickListener != null) {
+ mOnChildClickListener.OnChildClick(holder.itemUpdataTime, this, position);
+ }
+ });
+
+ holder.tvItemProcess.setOnClickListener(v -> {
+ if (mOnChildClickListener != null) {
+ mOnChildClickListener.OnChildClick(holder.tvItemProcess, this, position);
+ }
+ });
+ String time;
+ LinearLayout.LayoutParams param = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+ param.topMargin = 0;
+ holder.llWeixiu.setLayoutParams(param);
+
+ holder.tvItemProcess.setText("再来一单");
+ holder.orderLineOne.setVisibility(View.VISIBLE);
+ holder.orderLineTwo.setVisibility(View.VISIBLE);
+ holder.tvItemProcess.setVisibility(View.VISIBLE);
+ holder.itemTextPhone.setVisibility(View.VISIBLE);
+ holder.itemUpdataTime.setVisibility(View.VISIBLE);
+ holder.llBottom.setVisibility(View.VISIBLE);
+ holder.itemBottomLine.setVisibility(View.VISIBLE);
+ switch (item.getStatus()) {
+ case ManagerConstant.WAITE_MANAGER:
+ holder.itemUpdataTime.setText(R.string.designate);
+ holder.itemTextPhone.setText("修改");
+ if (item.getCreatedSource() == 1) {
+ holder.orderLineOne.setVisibility(View.VISIBLE);
+ holder.orderLineTwo.setVisibility(View.VISIBLE);
+ holder.tvItemProcess.setVisibility(View.VISIBLE);
+ holder.itemTextPhone.setVisibility(View.VISIBLE);
+ holder.itemUpdataTime.setVisibility(View.VISIBLE);
+ } else {
+ holder.itemTextPhone.setVisibility(View.GONE);
+ holder.tvItemProcess.setVisibility(View.GONE);
+ holder.orderLineOne.setVisibility(View.GONE);
+ holder.orderLineTwo.setVisibility(View.GONE);
+ }
+ break;
+ case ManagerConstant.WAITE_SUBCRIBE:
+ case ManagerConstant.AREADY_SUBCRIBE:
+ holder.itemUpdataTime.setText(R.string.change);
+ holder.itemTextPhone.setText("修改");
+ if (item.getCreatedSource() == 1) {
+ holder.orderLineOne.setVisibility(View.VISIBLE);
+ holder.orderLineTwo.setVisibility(View.VISIBLE);
+ holder.tvItemProcess.setVisibility(View.VISIBLE);
+ holder.itemTextPhone.setVisibility(View.VISIBLE);
+ holder.itemUpdataTime.setVisibility(View.VISIBLE);
+ } else {
+ holder.itemTextPhone.setVisibility(View.GONE);
+ holder.tvItemProcess.setVisibility(View.GONE);
+ holder.orderLineOne.setVisibility(View.GONE);
+ holder.orderLineTwo.setVisibility(View.GONE);
+ }
+ break;
+ case ManagerConstant.SERVERING:
+ case ManagerConstant.FINISH:
+ case ManagerConstant.CANLE:
+ case ManagerConstant.CLOSE:
+ if (item.getCreatedSource() == 1) {
+ holder.tvItemProcess.setVisibility(View.VISIBLE);
+ holder.itemTextPhone.setVisibility(View.GONE);
+ holder.itemUpdataTime.setVisibility(View.GONE);
+ holder.orderLineOne.setVisibility(View.GONE);
+ holder.orderLineTwo.setVisibility(View.GONE);
+ } else {
+ holder.llBottom.setVisibility(View.GONE);
+ holder.itemBottomLine.setVisibility(View.GONE);
+ }
+ break;
+ default:
+ break;
+ }
+ if (item.getStatus() == 1 || item.getStatus() == 2) {
+ time = item.getAppointmentTime();
+ holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
+ } else {
+ time = item.getConfirmDoorTime();
+ holder.tvOrderTime.setText(mContext.getString(R.string.tv_home_tab_one_subscribe_time));
+ }
+ if (TextUtils.isEmpty(time)) {
+ holder.itemTody.setText(mContext.getString(R.string.no_appointment));
+ holder.itemTime.setVisibility(View.GONE);
+ } else {
+ String dateTime = null;
+ try {
+ dateTime = UtilsDate.changeFormat(time, FORMAT_ONE, LONG_TIME_FORMAT_TWO);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ holder.itemTody.setText(UtilsDate.getDayOrIsToday(time));
+ holder.itemTime.setText(dateTime);
+ holder.itemTime.setVisibility(View.VISIBLE);
+ }
+ int errorState = item.getExcptionCode();
+ if (errorState == 1) {
+ holder.tvErrorState.setText(mContext.getString(R.string.receive_time_out));
+ holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
+ } else if (errorState == 2) {
+ holder.tvErrorState.setText(mContext.getString(R.string.appointment_time_out));
+ holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
+ } else if (errorState == 3) {
+ holder.tvErrorState.setText(mContext.getString(R.string.server_time_out));
+ holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
+ } else if (errorState == 4) {
+ holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out));
+ holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
+ } else {
+ holder.tvErrorState.setTextColor(UIUtils.getColor(R.color.default_editext_color));
+ if (item.getStatus() == ManagerConstant.WAITE_MANAGER) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.not_receive_order));
+ } else if (item.getStatus() == ManagerConstant.WAITE_SUBCRIBE) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.not_appointment_already));
+ } else if (item.getStatus() == ManagerConstant.AREADY_SUBCRIBE) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.appointment_already));
+ } else if (item.getStatus() == ManagerConstant.SERVERING) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.in_server));
+ } else if (item.getStatus() == ManagerConstant.FINISH) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.order_finish));
+ } else if (item.getStatus() == ManagerConstant.CANLE) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.cancle_order));
+ } else if (item.getStatus() == ManagerConstant.CLOSE) {
+ holder.tvErrorState.setText(UIUtils.getString(R.string.order_closed));
+ }
+ }
+ }
+}
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/AllOrderFragment.java b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/AllOrderFragment.java
new file mode 100644
index 0000000..5be4bc0
--- /dev/null
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/AllOrderFragment.java
@@ -0,0 +1,127 @@
+package com.dayu.managercenter.ui.fragment;
+
+import android.os.Bundle;
+
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.dayu.base.ui.fragment.BaseFragment;
+import com.dayu.common.Constants;
+import com.dayu.managercenter.R;
+import com.dayu.managercenter.common.ManagerConstant;
+import com.dayu.managercenter.data.Order;
+import com.dayu.managercenter.databinding.FragmentRecycleBinding;
+import com.dayu.managercenter.presenter.allorder.AllOrderContract;
+import com.dayu.managercenter.presenter.allorder.AllOrderPresenter;
+import com.dayu.managercenter.ui.activity.SendOrderDetailActivity;
+import com.dayu.managercenter.ui.adapter.AllOrderAdapter;
+import com.dayu.provider.event.SwtichAllOrderEvent;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+
+/**
+ * Created by luofan
+ * on 2018/8/27.
+ */
+public class AllOrderFragment extends BaseFragment<AllOrderPresenter, FragmentRecycleBinding> implements AllOrderContract.View {
+ private String mKey = "";
+ private boolean isRefresh = false;
+ private int mState;
+
+ public static AllOrderFragment newInstance(int status) {
+ Bundle args = new Bundle();
+ AllOrderFragment fragment = new AllOrderFragment();
+ args.putInt(Constants.STATE, status);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.fragment_recycle;
+ }
+
+ @Override
+ protected void lazyLoad() {
+ mPresenter.refresh();
+ }
+
+ @Override
+ public void initView() {
+ EventBus.getDefault().register(this);
+ mState = getArguments().getInt(Constants.STATE);
+ AllOrderAdapter adapter = new AllOrderAdapter(true, mState);
+ adapter.setViewType(R.layout.item_manager_order);
+ mBind.recyclerView.setAdapter(adapter);
+ mBind.recyclerView.setOnItemClickListener((item, bind) -> {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.ID, (((Order) item).getId()));
+ bundle.putInt(Constants.STATE, ManagerConstant.SEND_ORDER);
+ startActivity(SendOrderDetailActivity.class, bundle);
+ });
+ mBind.recyclerView.mCoreAdapter.setOnChildClickListener((view, adapter1, position) -> {
+ Order order = ((Order) mBind.recyclerView.getDatas().get(position));
+ int id = order.getId();
+ if (view.getId() == R.id.item_updata_time) {
+ showDialog();
+ mPresenter.getEngineers(order);
+ } else if (view.getId() == R.id.item_text_phone) {
+ mPresenter.modifyOrder(id);
+ } else if (view.getId() == R.id.tv_item_process) {
+ mPresenter.createAgain(id);
+ }
+ });
+ }
+
+ @Override
+ public void setPresenter() {
+ mBind.setPresenter(mPresenter);
+ }
+
+ @Override
+ public String getKey() {
+ return mKey;
+ }
+
+ @Override
+ public void setKey(String key) {
+ mKey = key;
+ if (isVb()) {
+ mPresenter.refresh();
+ } else {
+ isRefresh = true;
+ }
+ }
+
+ @Override
+ public void showEngineerDialog(List<String> list, OnOptionsSelectListener onOptionsSelectListener) {
+ //条件选择器
+ OptionsPickerView pvOptions = new OptionsPickerBuilder(mActivity, onOptionsSelectListener)
+ .setContentTextSize(18)
+ .setLineSpacingMultiplier(2.0f)
+ .build();
+ pvOptions.setPicker(list);
+ pvOptions.show();
+ }
+
+ @Override
+ protected void visibleLoad() {
+ if (isRefresh) {
+ showDialog();
+ mPresenter.refresh();
+ isRefresh = false;
+ }
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void swtichAllOrder(SwtichAllOrderEvent event) {
+ if (event.getState() == mState || mState == ManagerConstant.ALL) {
+ mPresenter.refresh();
+ }
+ }
+}
diff --git a/managercenter/src/main/release/AndroidManifest.xml b/managercenter/src/main/release/AndroidManifest.xml
index 239c5a1..df6247b 100644
--- a/managercenter/src/main/release/AndroidManifest.xml
+++ b/managercenter/src/main/release/AndroidManifest.xml
@@ -22,6 +22,10 @@
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.managercenter.ui.activity.CreateOrderActivity"
+ android:launchMode="singleTop"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.dayu.managercenter.ui.activity.AllOrderActivity"
android:screenOrientation="portrait" />
</application>
diff --git a/managercenter/src/main/res/layout/activity_all_order.xml b/managercenter/src/main/res/layout/activity_all_order.xml
new file mode 100644
index 0000000..ef37887
--- /dev/null
+++ b/managercenter/src/main/res/layout/activity_all_order.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <data>
+
+
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <RelativeLayout
+ android:id="@+id/rl_title"
+ style="@style/title">
+
+ <TextView
+ android:id="@+id/tv_title"
+ style="@style/text_title"
+ android:text="@string/all_order" />
+
+ <ImageView
+ android:id="@+id/title_back"
+ style="@style/title_image_back" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="3dp"
+ android:layout_alignParentBottom="true"
+ android:src="@drawable/line_shape" />
+
+ <ImageView
+ android:id="@+id/iv_saecher"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="20dp"
+ android:src="@drawable/seacher" />
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/rl_seacher"
+ style="@style/title"
+ android:visibility="gone">
+
+ <EditText
+ android:id="@+id/et_seacher"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="10dp"
+ android:layout_toRightOf="@+id/iv"
+ android:background="@null"
+ android:hint="@string/find_customer_mobile"
+ android:imeOptions="actionSearch"
+ android:inputType="text"
+ android:singleLine="true"
+ android:textSize="16sp" />
+
+ <ImageView
+ android:id="@+id/iv"
+ style="@style/title_image_back"
+ android:src="@drawable/seacher" />
+
+ <TextView
+ android:id="@+id/tv_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="20dp"
+ android:gravity="center"
+ android:text="@string/cancle"
+ android:textColor="@color/cl_black"
+ android:textSize="@dimen/dp_18"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="3dp"
+ android:layout_alignParentBottom="true"
+ android:src="@drawable/line_shape" />
+ </RelativeLayout>
+
+ </RelativeLayout>
+
+ <android.support.design.widget.TabLayout
+ android:id="@+id/tab"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:background="@color/cl_white"
+ android:textSize="15sp"
+ app:tabIndicatorColor="@color/cl_receiving_order_item_data"
+ app:tabMaxWidth="0dp"
+ app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
+ app:tabTextAppearance="@style/TabLayoutTextStyle"
+ app:tabTextColor="@color/cl_tab_line" />
+
+ <ImageView style="@style/line" />
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/viewpager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/managercenter/src/main/res/layout/fragment_recycle.xml b/managercenter/src/main/res/layout/fragment_recycle.xml
index fa6fb0e..2e76281 100644
--- a/managercenter/src/main/res/layout/fragment_recycle.xml
+++ b/managercenter/src/main/res/layout/fragment_recycle.xml
@@ -11,8 +11,8 @@
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
+ setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
- setPresenter="@{presenter}"
android:background="#f5f5f5" />
</layout>
\ No newline at end of file
diff --git a/managercenter/src/main/res/layout/item_manager_order.xml b/managercenter/src/main/res/layout/item_manager_order.xml
index 2b42e39..477a12f 100644
--- a/managercenter/src/main/res/layout/item_manager_order.xml
+++ b/managercenter/src/main/res/layout/item_manager_order.xml
@@ -224,6 +224,7 @@
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="40dp"
+ android:visibility="visible"
android:orientation="horizontal">
<TextView
diff --git a/orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java b/orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java
index 0943ed2..dbb1f28 100644
--- a/orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/detailedite/EditePresenter.java
@@ -8,6 +8,7 @@ import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.provider.event.RefreshDetailEvent;
import com.dayu.utils.UIUtils;
+import com.dayu.utils.UtilsUserAccountMatcher;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -42,6 +43,10 @@ public class EditePresenter extends EditeContract.Presenter {
public void commite() {
HashMap<String, Object> params = new HashMap<>();
params.put("id", mOrderId);
+ if (info.get() != null && UtilsUserAccountMatcher.containsEmoji(info.get())) {
+ mView.showToast(R.string.no_emoij);
+ return;
+ }
if (mState == 0) {
if (!TextUtils.isEmpty(info.get())) {
params.put("comment", info.get());
diff --git a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
index 03a0986..b85de9b 100644
--- a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
@@ -82,15 +82,15 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
if (mView.getSelectPayer()) {
mView.showNoPayerDialog();
} else {
- if (mOrderType == 1) {
- mView.showSelectPayerDialog((dialog, confirm) -> {
- if (confirm) {
- commitePhoto();
- }
- });
- } else {
- commitePhoto();
- }
+// if (mOrderType == 1) {
+// mView.showSelectPayerDialog((dialog, confirm) -> {
+// if (confirm) {
+// commitePhoto();
+// }
+// });
+// } else {
+ commitePhoto();
+// }
}
}
@@ -195,9 +195,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
} else if (2 == (detail.getRepairType())) {
mRepairType = UIUtils.getString(R.string.payer_baowai);
}
- if (mOrderType != 1) {
- mView.setRepairType();
- }
+// if (mOrderType != 1) {
+ mView.setRepairType();
+// }
mNeedEsignature = detail.getNeedEsignature();
if (mNeedEsignature != null && mNeedEsignature == 1) {
mView.showSignature();
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
index 508aa01..1b54e3e 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
@@ -66,7 +66,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private TextView mCashPay;
private TextView mWechatPay;
private TextView mNoPay;
- private int mPayType =3;
+ private int mPayType = 3;
private PhotoViewAdapter mAdapter;
private RecyclerView mPhoto;
@@ -134,14 +134,14 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
}
});
- if (mPresenter.getOrderType() == 1) {
- initPhotoView();
- mRepairType.setOnClickListener(v -> showPayerDialog());
- } else {
- setRepairType();
- mArrow.setVisibility(View.GONE);
- mPayerNotice.setVisibility(View.GONE);
- }
+// if (mPresenter.getOrderType() == 1) {
+// initPhotoView();
+// mRepairType.setOnClickListener(v -> showPayerDialog());
+// } else {
+ setRepairType();
+ mArrow.setVisibility(View.GONE);
+ mPayerNotice.setVisibility(View.GONE);
+// }
mSignature.setOnClickListener(v -> startActivityForReult(SignatureActivity.class, 100));
if (isShowSignature) {
mAllSignature.setVisibility(View.VISIBLE);
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java
index 73cdced..a7b65df 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderRecordActivity.java
@@ -27,7 +27,6 @@ public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, Acti
implements OrderRecordContract.View {
private OrderAdapter mAdapter;
-
@Override
public int getLayoutId() {
return R.layout.activity_order_record;
@@ -76,6 +75,10 @@ public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, Acti
public void showSearch() {
mBind.rlTitle.setVisibility(View.GONE);
mBind.rlSeacher.setVisibility(View.VISIBLE);
+ mBind.etSeacher.setFocusable(true);
+ mBind.etSeacher.requestFocus();
+ InputMethodManager inputManager = (InputMethodManager) mBind.etSeacher.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputManager.showSoftInput(mBind.etSeacher, 0);
MobclickAgent.onEvent(mActivity, "search_order");
}
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
index 3da2c9c..0e815cf 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
@@ -64,8 +64,12 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
tabDesc = new String[]{mActivity.getString(R.string.waite_appointemnt), mActivity.getString(R.string.waite_server), mActivity.getString(R.string.order_exception), mActivity.getString(R.string.cancle_order)};
if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
mBind.createOrder.setVisibility(View.VISIBLE);
- mBind.createOrder.setOnClickListener(v ->
- ARouter.getInstance().build(RouterPath.PATH_MANAGER_CREATE_ORDER).navigation());
+ mBind.createOrder.setOnClickListener(v -> {
+ Bundle bundle = new Bundle();
+ bundle.putInt(Constants.STATE, 7);
+ ARouter.getInstance().build(RouterPath.PATH_MANAGER_CREATE_ORDER).with(bundle)
+ .navigation();
+ });
}
EventBus.getDefault().register(this);
initData();
diff --git a/orderCenter/src/main/res/drawable-hdpi/seacher.png b/orderCenter/src/main/res/drawable-hdpi/seacher.png
deleted file mode 100755
index 99ece2c..0000000
Binary files a/orderCenter/src/main/res/drawable-hdpi/seacher.png and /dev/null differ
diff --git a/orderCenter/src/main/res/drawable-xhdpi/seacher.png b/orderCenter/src/main/res/drawable-xhdpi/seacher.png
deleted file mode 100755
index 99ece2c..0000000
Binary files a/orderCenter/src/main/res/drawable-xhdpi/seacher.png and /dev/null differ
diff --git a/orderCenter/src/main/res/drawable-xxhdpi/seacher.png b/orderCenter/src/main/res/drawable-xxhdpi/seacher.png
deleted file mode 100755
index 99ece2c..0000000
Binary files a/orderCenter/src/main/res/drawable-xxhdpi/seacher.png and /dev/null differ
diff --git a/orderCenter/src/main/res/drawable-xxxhdpi/seacher.png b/orderCenter/src/main/res/drawable-xxxhdpi/seacher.png
deleted file mode 100755
index 99ece2c..0000000
Binary files a/orderCenter/src/main/res/drawable-xxxhdpi/seacher.png and /dev/null differ
diff --git a/orderCenter/src/main/res/layout/fragment_order_datails.xml b/orderCenter/src/main/res/layout/fragment_order_datails.xml
index 0ceb977..3b3427a 100755
--- a/orderCenter/src/main/res/layout/fragment_order_datails.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_datails.xml
@@ -46,7 +46,7 @@
android:layout_marginTop="@dimen/dp_10"
android:text="@string/tv_order_eg"
android:textColor="@color/cl_order_text_title"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/text_one"
@@ -57,7 +57,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/order_num"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_order_num"
@@ -69,7 +69,7 @@
android:layout_toRightOf="@id/text_one"
android:text='@{!TextUtils.isEmpty(item.orderNum)?item.orderNum:@string/no_data,default = @string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/text_two"
@@ -80,7 +80,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/order_state"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_order_state"
@@ -91,7 +91,7 @@
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_two"
android:textColor="@color/cl_tab_read"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_serve"
@@ -102,7 +102,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/server_name"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_serve_name"
@@ -114,7 +114,7 @@
android:layout_toRightOf="@id/tv_serve"
android:text='@{!TextUtils.isEmpty(item.spuName)?item.spuName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/text_three"
@@ -125,7 +125,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/prodcut"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_product"
@@ -137,7 +137,7 @@
android:layout_toRightOf="@id/text_three"
android:text='@{!TextUtils.isEmpty(item.categoryName)?item.categoryName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/text_foure"
@@ -148,7 +148,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/prodcut_type"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_type"
@@ -160,7 +160,7 @@
android:layout_toRightOf="@id/text_foure"
android:text='@{!TextUtils.isEmpty(item.providerName)?item.providerName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:layout_width="wrap_content"
@@ -170,7 +170,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/door_time"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_door_time"
@@ -182,7 +182,7 @@
android:layout_toRightOf="@id/text_foure"
android:text='@{!TextUtils.isEmpty(item.confirmDoorTime)?item.confirmDoorTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
@@ -194,7 +194,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/server_desc"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<RelativeLayout
android:id="@+id/rl_info_detail"
@@ -203,8 +203,8 @@
android:layout_below="@id/tv_door_time"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
- android:gravity="center_vertical"
- android:layout_toRightOf="@id/text_foure">
+ android:layout_toRightOf="@id/text_foure"
+ android:gravity="center_vertical">
<TextView
android:id="@+id/tv_order_rmark"
@@ -216,7 +216,7 @@
android:maxLines="2"
android:text='@{TextUtils.isEmpty(item.taskDesc)?@string/no_data:item.taskDesc}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="13sp" />
+ android:textSize="14sp" />
<TextView
android:id="@+id/desc_edite"
@@ -234,11 +234,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_order_rmark"
- android:gravity="center_horizontal"
android:layout_marginRight="50dp"
+ android:gravity="center_horizontal"
android:text="@string/look_more"
android:textColor="@color/cl_receiving_order_item_data"
- android:textSize="13.3sp"
+ android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout>
@@ -252,7 +252,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/remark"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<RelativeLayout
android:id="@+id/rl_info_server"
@@ -261,8 +261,8 @@
android:layout_below="@id/rl_info_detail"
android:layout_marginLeft="15dp"
android:layout_marginTop="@dimen/dp_13"
- android:gravity="center_vertical"
- android:layout_toRightOf="@id/tv_server_info">
+ android:layout_toRightOf="@id/tv_server_info"
+ android:gravity="center_vertical">
<TextView
android:id="@+id/tv_order_server"
@@ -274,7 +274,7 @@
android:maxLines="2"
android:text='@{TextUtils.isEmpty(item.comment)?@string/no_data:item.comment}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="13sp" />
+ android:textSize="14sp" />
<TextView
android:id="@+id/remark_edite"
@@ -292,11 +292,11 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_order_server"
android:layout_centerVertical="true"
- android:gravity="center_horizontal"
android:layout_marginRight="50dp"
+ android:gravity="center_horizontal"
android:text="@string/look_more"
android:textColor="@color/cl_receiving_order_item_data"
- android:textSize="13.3sp"
+ android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout>
@@ -317,7 +317,7 @@
android:layout_height="wrap_content"
android:text="@string/order_attachment"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<android.support.v7.widget.RecyclerView
@@ -349,7 +349,7 @@
android:layout_marginTop="@dimen/dp_10"
android:text="@string/customer_info"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/two_text_two"
@@ -360,7 +360,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/customer_type"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_customer_type"
@@ -372,7 +372,7 @@
android:layout_toRightOf="@id/two_text_two"
android:text="@{item.customerType == 1?@string/personal_customer:@string/enterprise_customer}"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/two_text_three"
@@ -383,7 +383,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/customer_name"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_customer_name"
@@ -395,7 +395,7 @@
android:layout_toRightOf="@id/two_text_three"
android:text='@{!TextUtils.isEmpty(item.customerName)?item.customerName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/customer_signature"
@@ -421,7 +421,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/tv_two_text_three"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_contact_mode"
@@ -433,7 +433,7 @@
android:layout_toRightOf="@id/two_text_four"
android:text='@{!TextUtils.isEmpty(item.customerMobile)?item.customerMobile:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_contact_tel"
@@ -445,7 +445,7 @@
android:layout_toRightOf="@id/two_text_four"
android:text='@{item.customerTelphome}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3"
+ android:textSize="@dimen/sp_14"
android:visibility="@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}" />
<TextView
@@ -457,7 +457,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/tv_two_text_foure"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<LinearLayout
android:id="@+id/navigation"
@@ -478,7 +478,7 @@
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<ImageView
android:layout_width="wrap_content"
@@ -499,7 +499,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/lookforword_time"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_forward_time_detail"
@@ -511,7 +511,7 @@
android:layout_toRightOf="@id/text_foure"
android:text='@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/line_two"
@@ -531,7 +531,7 @@
android:layout_marginTop="@dimen/dp_10"
android:text="@string/prodcut_info"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/three_text_two"
@@ -542,7 +542,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/prodcut_brand"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_brand"
@@ -555,7 +555,7 @@
android:layout_toRightOf="@id/three_text_two"
android:text='@{!TextUtils.isEmpty(item.brandName)?item.brandName:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/three_two_two"
@@ -566,7 +566,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/prodcut_num"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_model"
@@ -578,7 +578,7 @@
android:layout_toRightOf="@id/three_two_two"
android:text='@{!TextUtils.isEmpty(item.productModel)?item.productModel:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_sn"
@@ -589,7 +589,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/sn_num"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_sn_code"
@@ -601,7 +601,7 @@
android:layout_toRightOf="@id/tv_sn"
android:text='@{!TextUtils.isEmpty(item.sn)?item.sn:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/line_three"
@@ -626,7 +626,7 @@
android:layout_marginTop="@dimen/dp_10"
android:text="@string/charge_record"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/four_text_two"
@@ -637,7 +637,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/total_money"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_total_money"
@@ -649,7 +649,7 @@
android:layout_toRightOf="@id/four_text_two"
android:text='@{item.totalPrice == null?(@string/zero_money):item.totalPrice+(@string/money)}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/four_text_three"
@@ -660,7 +660,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/door_money"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_door_price"
@@ -672,7 +672,7 @@
android:layout_toRightOf="@id/four_text_three"
android:text='@{item.doorPrice == null?(@string/zero_money):item.doorPrice+(@string/money)}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
@@ -684,7 +684,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/server_money"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_serve_price"
@@ -696,7 +696,7 @@
android:layout_toRightOf="@id/four_text_five"
android:text='@{item.servicePrice == null?(@string/zero_money):item.servicePrice+(@string/money)}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/four_text_seven"
@@ -707,7 +707,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/material_money"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_material_price"
@@ -719,7 +719,7 @@
android:layout_toRightOf="@id/four_text_seven"
android:text='@{item.materialCost == null?(@string/zero_money):item.materialCost+(@string/money)}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/four_text_nine"
@@ -730,7 +730,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/other_money"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_other_price"
@@ -742,7 +742,7 @@
android:layout_toRightOf="@id/four_text_nine"
android:text='@{item.otherPrice == null?(@string/zero_money):item.otherPrice+(@string/money)}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/four_text_ten"
@@ -753,7 +753,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/remark"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_remarks"
@@ -767,7 +767,7 @@
android:maxLines="2"
android:text='@{!TextUtils.isEmpty(item.doorPriceComment)?item.doorPriceComment:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_pay_type"
@@ -778,7 +778,7 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/pay_type"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/pay_type"
@@ -791,7 +791,7 @@
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_pay_state"
@@ -802,20 +802,21 @@
android:layout_marginTop="@dimen/dp_13"
android:text="@string/pay_state"
android:textColor="@color/cl_order_text_one"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/pay_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_pay_type"
+ android:layout_marginBottom="10dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_pay_state"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/cl_home_title_text_color"
- android:textSize="@dimen/sp_13.3" />
+ android:textSize="@dimen/sp_14" />
</RelativeLayout>
<RelativeLayout
diff --git a/orderCenter/src/main/res/layout/item_multi_process_foot.xml b/orderCenter/src/main/res/layout/item_multi_process_foot.xml
index f076ea5..b2a45f6 100644
--- a/orderCenter/src/main/res/layout/item_multi_process_foot.xml
+++ b/orderCenter/src/main/res/layout/item_multi_process_foot.xml
@@ -47,6 +47,7 @@
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_player"
android:text="*"
+ android:visibility="gone"
android:textColor="#F74848"
android:textSize="@dimen/sp_15" />
@@ -69,6 +70,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingRight="@dimen/dp_15"
+ android:visibility="gone"
android:src="@drawable/icon_arrow_right" />
</RelativeLayout>
@@ -82,6 +84,7 @@
android:layout_height="36dp"
android:layout_marginBottom="@dimen/dp_8"
android:layout_marginLeft="@dimen/dp_15"
+ android:visibility="gone"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:text="@string/order_select_payer_notice"
diff --git a/provider/src/main/java/com/dayu/provider/event/SwtichAllOrderEvent.java b/provider/src/main/java/com/dayu/provider/event/SwtichAllOrderEvent.java
new file mode 100755
index 0000000..3927fc5
--- /dev/null
+++ b/provider/src/main/java/com/dayu/provider/event/SwtichAllOrderEvent.java
@@ -0,0 +1,21 @@
+package com.dayu.provider.event;
+
+/**
+ * 人脸认证后刷新我的页面的数据.
+ * on 2017/10/11.
+ */
+public class SwtichAllOrderEvent {
+ private int state;
+
+ public SwtichAllOrderEvent(int state) {
+ this.state = state;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+}
diff --git a/userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java b/userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java
index 3f6574a..1ee6d30 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java
@@ -82,7 +82,7 @@ public class UserConstant {
/**
* 活体检测.
*/
- public final static String FACE_OCR = "/api-user/" + "/accountExt/engineerMegLiveVerify";
+ public final static String FACE_OCR = "/api-user/" + "accountExt/engineerMegLiveVerify";
/**
* 忘记密码.
--
libgit2 0.25.0