增加小红点，接单语音播报，预约时间默认等功能

3b137c4c · 罗翻 · 6d085b6c · 3b137c4c · 3b137c4c · 3b137c4c
Commit 3b137c4c authored Aug 21, 2018 by 罗翻
Showing with 29 additions and 5 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
app/src/main/res/raw/new_order.mp3
orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
--- a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
@@ -41,6 +41,7 @@ import com.dayu.provider.event.SwtichFragment;
 import com.dayu.provider.router.RouterPath;
 import com.dayu.usercenter.ui.fragment.HomePersonFragment;
 import com.dayu.utils.UserManager;
+import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
 import com.dayu.widgets.CustomDialog;
 import com.dayu.widgets.listener.onDownloadListener;
 import com.umeng.analytics.MobclickAgent;
@@ -295,7 +296,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
    @Override
    public void onResume() {
        super.onResume();
-//        BadgeNumberManager.from(mActivity).setBadgeNumber(0);
+        BadgeNumberManager.from(mActivity).setBadgeNumber(0);
        MobclickAgent.onResume(this);
    }

--- a/app/src/main/java/com/dayu/bigfish/utils/HxManager.java
+++ b/app/src/main/java/com/dayu/bigfish/utils/HxManager.java
@@ -7,6 +7,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
@@ -21,6 +22,8 @@ import com.dayu.utils.AppManager;
 import com.dayu.utils.SPUtils;
 import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UserManager;
+import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
+import com.dayu.utils.badgeNumberManger.BadgeNumberUtils;
 import com.dayu.widgets.LicenceDialog;
 import com.google.gson.Gson;
 import com.hyphenate.EMConnectionListener;
@@ -121,6 +124,10 @@ public class HxManager {
                        if (!(boolean) SPUtils.get(Constants.HX_STATE, true)) {
                            return;
                        }
+                        if (info.getCategory() == 1 && (info.getFunctionType() == 2)) {
+                            MediaPlayer player = MediaPlayer.create(mContext, R.raw.new_order);
+                            player.start();
+                        }
                        Intent intent = new Intent(mContext, MainActivity.class);
                        intent.putExtra(Constants.MESSAGE_INFO, info);
                        PendingIntent pi = PendingIntent.getActivity(mContext,
@@ -150,8 +157,8 @@ public class HxManager {
                            notificationManager.notify(0, builder.build());
                        }
                        mCount++;
-//                        BadgeNumberManager.from(mContext).setBadgeNumber(mCount);
+                        BadgeNumberManager.from(mContext).setBadgeNumber(mCount);
-//                        BadgeNumberUtils.setBadgeNumberXiaoMi(notification, messages.size());
+                        BadgeNumberUtils.setBadgeNumberXiaoMi(notification, messages.size());
                    }
                }
            }

--- a/app/src/main/res/raw/new_order.mp3
+++ b/app/src/main/res/raw/new_order.mp3
--- a/orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java
+++ b/orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java
@@ -19,6 +19,7 @@ public class OrderConstant {
    public final static String CREATEDSOURCE = "created_source";
    public final static String KAADDRESSID = "ka_address_id";
    public final static String ORDER_TYPE = "order_type";//0:单任务单数量
+    public static final String TIME = "time";
    /**
     * 异常单获取.
@@ -156,4 +157,5 @@ public class OrderConstant {
     * 接单活体检测校验.
     */
    public final static String FACE_CERTIFICAITON = "/api-third/" +"detect/receiptOrderVerify";
 }
--- a/orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
@@ -8,6 +8,7 @@ import android.view.View;
 import com.dayu.common.Constants;
 import com.dayu.order.R;
 import com.dayu.order.api.OrderApiFactory;
+import com.dayu.order.common.OrderConstant;
 import com.dayu.provider.event.OrderState;
 import com.dayu.provider.event.RefreshApoiment;
 import com.dayu.provider.event.RefreshServe;
@@ -29,6 +30,7 @@ import io.reactivex.disposables.Disposable;
 import static com.dayu.order.common.OrderConstant.ORDER_DOING;
 import static com.dayu.order.common.OrderConstant.ORDER_YUYUE;
 import static com.dayu.order.common.OrderConstant.SUBCRIBE_TIME;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
 import static com.dayu.utils.UtilsDate.LONG_DATE;
 import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT;
 import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
@@ -49,6 +51,7 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
    private String mTime;
    private boolean mIsToday;
    private int mType;
+    private String mDefaultTime;
    @Override
    public void onAttached() {
@@ -56,6 +59,15 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
        mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
        mPosition = bundle.getInt(Constants.ORDER_POSTION, 0);
        mState = bundle.getInt(Constants.ORDER_STATE, 0);
+        mDefaultTime = bundle.getString(OrderConstant.TIME);
+        try {
+            String hour = UtilsDate.changeFormat(mDefaultTime, FORMAT_ONE, LONG_TIME_FORMAT_TWO);
+            String day = UtilsDate.changeFormat(mDefaultTime, FORMAT_ONE, LONG_DATE);
+            mDay.set(day);
+            mHour.set(hour);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
        if (mState == SUBCRIBE_TIME) {
            mTitle.set(UIUtils.getString(R.string.tv_home_tab_one_subscribe_time));
        } else if (mState == ORDER_YUYUE) {

--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
@@ -232,8 +232,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
        holder.tvItemProcess.setOnClickListener(
                v -> processClick(item, holder, position));
+        String temp  = time;
        holder.itemUpdataTime.setOnClickListener(v -> {
-            dumpSubcribeTimeActivity(id, position, item.getStatus());
+            dumpSubcribeTimeActivity(id, position, item.getStatus(),temp);
            //工单状态:1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
            //工单子状态:3已预约1未出发|3已预约2已出发|4进行中3无SOP处理|4进行中4SOP未完成|4进行中5SOP已完成
            if (item.getStatus() == 2) {
@@ -358,7 +359,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
        }
    }
-    private void dumpSubcribeTimeActivity(int id, int adapterPosition, int state) {
+    private void dumpSubcribeTimeActivity(int id, int adapterPosition, int state,String time) {
        int status = UserManager.getInstance().getUser().getDetectStatus();
        if (state == 2 && (status == 2 || status == 3)) {   //没有活体检测的先去进行活体检测
            showCertificationDialog();
@@ -368,6 +369,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
            bundle.putInt(Constants.ORDER_ID, id);
            bundle.putInt(Constants.ORDER_POSTION, adapterPosition);
            bundle.putInt(Constants.ORDER_STATE, state);
+            bundle.putString(OrderConstant.TIME,time);
            intent.putExtra(Constants.BUNDLE, bundle);
            mContext.startActivity(intent);
        }