commit 9.28

唐浩

2020-09-28 86dab54700e5813367e58263fd04c3e9424cf95d

commit 9.28

 app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt

@@ -76,6 +76,7 @@
                if (NetUtils.isNetworkConnected(MyApplication.getInstance())) { //有网络直接处理
                    callStartOrder(contexts, i)
                } else { //无网络 存本地
                    toast("当前没有网络，订单将保存在本地")
                    var bean = LocalOrderBean()
                    bean.orderId = MyApplication.currentOrderId
                    bean.startTime = System.currentTimeMillis()
@@ -83,7 +84,8 @@
                }
            } else { //有数据存着，并且有网络上传异常订单 如果没有网络就不处理，这个肯定是线下的单
                if (NetUtils.isNetworkConnected(MyApplication.getInstance())) {
                    callErrorOrder(contexts)
                    toast("有网络，有异常数据，此次数据不受理")
//                    callErrorOrder(contexts)
                }
            }
        }
@@ -97,6 +99,7 @@
                if (NetUtils.isNetworkConnected(MyApplication.getInstance())) { //有网络直接处理
                    callEndOrder(contexts, travelFee)
                } else { //无网络 存本地
                    toast("当前没有网络，订单将保存在本地")
                    var bean = LocalOrderBean()
                    bean.orderId = MyApplication.currentOrderId
                    bean.endTime = System.currentTimeMillis()
@@ -155,9 +158,12 @@
                        map["orderType"] = bean.orderType
                        map["type"] = "1"
                        map["travelFee"] = bean.money
                        callNet(contexts, "api/order/confirmFees$", map) {
                        callNet(contexts, "api/order/confirmFees$", map,{
                            toast("上传异常订单成功")
                            EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))
                        }) {
                            toast("上传异常订单失败")
                            CacheKey.saveLocalOrderBean(bean)
                        }
                    }
                }
@@ -178,6 +184,12 @@
        }

        private fun callEndOrder(contexts: Context, travelFee: Double) {
            if (MyApplication.getLocation().latitude == 0.0){
                Handler(Looper.getMainLooper()).post {
                    toast("结束时的位置为空，停止结束")
                }
                return
            }
            var map = getMapByAny()
            map["orderId"] = MyApplication.currentOrderId
            map["orderType"] = MyApplication.currentOrderType

 app/src/main/java/com/okgoincar/bean/LocalOrderBean.java

@@ -7,6 +7,15 @@
    private String orderId;
    private String orderType = "2";
    private double money = 0.0;
    private String userId;

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public Long getStartTime() {
        return startTime;

 app/src/main/java/com/okgoincar/netUtls/MyObserver.java

@@ -3,6 +3,8 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;

import com.google.gson.Gson;
@@ -95,7 +97,11 @@
                    Intent intent = new Intent();
                    intent.setClass(MyApplication.Companion.getAppContext(), SlabLoginActivity.class);
                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                    intent.putExtra("IsMoreLogin",true);
                    MyApplication.Companion.getAppContext().startActivity(intent);
                    new Handler(Looper.getMainLooper()).post(() -> {
                        showToast("您的账号在其他地方登陆");
                    });
                }
                onError(baseBean.getCode(), baseBean.getMsg(),responseString);
//                success(responseString);

 app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java

@@ -105,6 +105,7 @@
    protected void onNetworkConnected(NetUtils.NetType type) {
        super.onNetworkConnected(type);
        if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
            toast("网络重新通畅");
            MoneyBroadCastReceiver.Companion.callErrorOrder(this);
        }
    }

 app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt

@@ -24,6 +24,11 @@
import org.jetbrains.anko.toast

class SlabLoginActivity : MySlabBaseActivity() {

    val isMoreLogin by lazy {
        intent.getBooleanExtra("IsMoreLogin",false)
    }

    override fun setContentView() {
        setContentView(R.layout.slab_activity_login)
    }
@@ -32,15 +37,8 @@
        showTitle(false)
        showHeader(false)

    }

    override fun onResume() {
        super.onResume()
        if (!NetUtils.isNetworkConnected(this)) {
            var dialog = DialogUtil.getSlabSurePopWindow(this, "当前网络不通畅，请稍后再登录") {
                EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
            }
            dialog.showCenter(window.decorView)
        if (isMoreLogin){
//            DialogUtil.getSlabDelAndSurePopWindow()
        }
    }


 app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt

@@ -109,6 +109,7 @@
            tv_title_slab.text = "待支付"
            tv_name.text = it.data.nickName
            tv_car_num.text = it.data.historyNum.toString() + "次乘车"
            tv_phone.text = it.data.phone
            tv_phone.clickDelay {
                MyUtils.getInstans().CallPhone(this, it.data.phone.toString())
            }
@@ -230,6 +231,8 @@
                            return@post
                        }
                        isPlay = true
                        tv_complete.gone()
                        tv_to_main.visible()
                        MyApplication.getTTsManager()
                            .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                        time = timeOver(20000) {
@@ -286,6 +289,7 @@
        tv_complete.clickDelay {
            callComplete() {
                tv_complete.gone()
                tv_to_main.visible()
                tv_pay_result_money.textColor(
                    this@SlabOrderOverActivity,
                    R.color.slab_green_over

 app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt

@@ -366,8 +366,11 @@
    private fun initMineLocation() {
        AMapKit.initLocation(this, AMapLocationListener {
            it?.let {
                MyApplication.aMapLocation = it
                carMarker!!.position = LatLng(it.latitude, it.longitude)
                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
                if (it.errorCode == 0) {
                    MyApplication.aMapLocation = it
                    carMarker!!.position = LatLng(it.latitude, it.longitude)
                }
            }
            orderBean.let {
                when (it.data.orderState) {

 app/src/main/java/com/okgoincar/slab/util/DialogUtil.kt

@@ -163,6 +163,26 @@
        view.tv_view_two_base.text = content
        return dialog
    }

    fun getSlabDelAndSurePopWindow(showCaccel:Boolean,context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit):EasyPopup{
        var dialog = getPopupwindow(context,R.layout.dialog_sure_and_del_slab)
        var view = dialog.contentView
        view.tv_close_base.text = cancelStr
        view.tv_sure_base.text = sureStr
        if (!showCaccel){
            view.tv_close_base.gone()
        }
        view.tv_close_base.setOnClickListener {
            dialog.dismiss()
            clickClose()
        }
        view.tv_sure_base.setOnClickListener {
            dialog.dismiss()
            clickSure()
        }
        view.tv_view_two_base.text = content
        return dialog
    }
//
//    fun getNetListDialog(arrayList: ArrayList<String>,showView: View,context: Context,okclick:(allMode:String) -> Unit):EasyPopup{
//        var pop = getPopupwindow(context,R.layout.dialog_server_mode)

 app/src/main/java/com/okgoincar/utils/Cache/CacheKey.kt

@@ -78,6 +78,7 @@
    }

    fun saveLocalOrderBean(bean: LocalOrderBean){
        bean.userId = getUserId()
        putKeyStr(LocalOrderBean.LOCAL_ORDER_INFO,Gson().toJson(bean))
    }


 app/src/main/res/layout/activity_order_over.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/rl_main_bg"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:id="@+id/rl_main_bg"
    android:background="@drawable/bg_slab_main"
    android:orientation="vertical">

@@ -27,11 +27,11 @@
            android:id="@+id/tv_title_slab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textStyle="bold"
            android:layout_centerInParent="true"
            android:text="准备出发"
            android:textColor="#ffffffff"
            android:textSize="50sp" />
            android:textSize="50sp"
            android:textStyle="bold" />

    </RelativeLayout>

@@ -50,10 +50,10 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/dp_10"
            android:layout_marginEnd="10dp"
            android:elevation="5dp"
            android:layout_marginTop="10dp"
            android:layout_marginEnd="10dp"
            android:background="@drawable/bg_slab_main_8"
            android:elevation="5dp"
            android:orientation="vertical"
            android:paddingStart="10dp">

@@ -74,10 +74,10 @@
                android:layout_marginTop="23dp"
                android:layout_marginBottom="9dp"
                android:text="123次乘车"
                android:visibility="gone"
                android:textColor="#ffffffff"
                android:textSize="30sp"
                android:textStyle="bold" />
                android:textStyle="bold"
                android:visibility="gone" />

            <TextView
                android:id="@+id/tv_phone"
@@ -97,12 +97,12 @@
        <LinearLayout
            android:id="@+id/ll_order_top"
            android:layout_width="match_parent"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="10dp"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="20dp"
            android:layout_height="match_parent"
            android:layout_below="@+id/ll_content_web"
            android:layout_marginStart="10dp"
            android:layout_marginTop="10dp"
            android:layout_marginEnd="10dp"
            android:layout_marginBottom="20dp"
            android:background="@drawable/bg_slab_main_8_bottom"
            android:elevation="3dp"
            android:orientation="vertical"
@@ -114,7 +114,6 @@


            </RelativeLayout>



            <TextView
@@ -129,7 +128,6 @@
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />



            <TextView
@@ -174,7 +172,6 @@
                android:textStyle="bold" />



        </LinearLayout>


@@ -197,22 +194,21 @@
        android:orientation="vertical">

        <TextView
            android:id="@+id/tv_order_type"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="26dp"
            android:id="@+id/tv_order_type"
            android:text="订单金额"
            android:textStyle="bold"
            android:textColor="#ffffffff"
            android:textSize="50sp"
            />
            android:textStyle="bold" />

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            android:layout_marginTop="30dp"
            android:orientation="horizontal">
            android:orientation="horizontal"
            android:visibility="gone">

            <View
                android:layout_width="0dp"
@@ -250,8 +246,8 @@
            android:layout_marginTop="2dp"
            android:text="¥51.5"
            android:textColor="#fffea62d"
            android:textStyle="bold"
            android:textSize="100sp"/>
            android:textSize="100sp"
            android:textStyle="bold" />

        <LinearLayout
            android:layout_width="match_parent"
@@ -265,7 +261,7 @@
                android:layout_height="wrap_content"
                android:text="其中含小费："
                android:textColor="@color/write"
                android:textSize="26sp"/>
                android:textSize="26sp" />

            <TextView
                android:id="@+id/tv_pay_result_small_money"
@@ -273,38 +269,39 @@
                android:layout_height="wrap_content"
                android:text=""
                android:textColor="@color/main_yellow_qian_y"
                android:textSize="26sp"/>

                android:textSize="26sp" />


        </LinearLayout>

        <include layout="@layout/include_weight_height"/>
        <include layout="@layout/include_weight_height" />

        <TextView
            android:id="@+id/tv_complete"
            android:layout_width="wrap_content"
            android:text="乘客已付款 >"
            android:textSize="30sp"
            android:layout_width="match_parent"
            android:layout_height="100dp"
            android:layout_gravity="center"
            android:layout_marginStart="50dp"
            android:layout_marginEnd="50dp"
            android:layout_marginBottom="10dp"
            android:textColor="@color/main_yellow"
            android:background="@drawable/bg_event_btn_one"
            android:gravity="center"
            android:layout_height="70dp"/>
            android:text="乘客已付款 >"
            android:textColor="#ffffffff"
            android:textSize="30sp" />

        <TextView
            android:id="@+id/tv_to_main"
            android:layout_width="match_parent"
            android:layout_height="100dp"
            android:visibility="gone"
            android:layout_marginStart="50dp"
            android:layout_marginEnd="50dp"
            android:background="@drawable/bg_event_btn_one"
            android:gravity="center"
            android:text="返回首页"
            android:layout_marginEnd="50dp"
            android:layout_marginStart="50dp"
            android:textColor="#ffffffff"
            android:textSize="40sp"
            />

            android:textSize="40sp" />


    </LinearLayout>