8.7

liugl

2020-08-07 4cb70f4d45d586a5048750b77675d82f142deacc

8.7

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

@@ -41,10 +41,10 @@
                    }

                    "android.net.conn.CONNECTIVITY_SUCCESS", "android.net.conn.CONNECTIVITY_FAILURE", "android.net.conn.CONNECTIVITY_CHANGE" -> {
                        toast("收到网络变化")
                        if (NetUtils.isNetworkConnected(MyApplication.getInstance())) {
                            callErrorOrder(contexts!!)
                        }
//                        toast("收到网络变化")
//                        if (NetUtils.isNetworkConnected(MyApplication.getInstance())) {
//                            callErrorOrder(contexts!!)
//                        }
                    }
                }
            }
@@ -120,7 +120,7 @@
        /***
         * 上传异常订单
         */
        private fun callErrorOrder(contexts: Context) {
        fun callErrorOrder(contexts: Context) {
            var bean = CacheKey.getLocalOrderBean()
            bean?.let {
                if (bean.money <= 0.0) {
@@ -133,10 +133,10 @@
                map["travelFee"] = bean.money
                callNet(contexts, "api/order/confirmFees$", map) {
                    toast("上传异常订单成功")
                    CacheKey.saveLocalOrderBeanNull()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))
                }
            }

        }

        private fun callStartOrder(contexts: Context, i: Int) {

 app/src/main/java/com/okgoincar/base/gpsnav/util/IFlyTTS.java

@@ -72,14 +72,12 @@


    private void createSynthesizer() {
        Toast.makeText(mContext, "创建银屏", Toast.LENGTH_SHORT).show();
        mTts = SpeechSynthesizer.createSynthesizer(mContext,
                new InitListener() {
                    @Override
                    public void onInit(int errorcode) {
                        if (ErrorCode.SUCCESS == errorcode) {
                            //初始化成功
                            Toast.makeText(mContext, "初始化音频成功", Toast.LENGTH_SHORT).show();
                        }
                    }


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

@@ -28,6 +28,7 @@

import com.okgoincar.R;
import com.okgoincar.base.BaseEvent;
import com.okgoincar.base.MoneyBroadCastReceiver;
import com.okgoincar.base.MyApplication;
import com.okgoincar.slab.util.DialogUtil;
import com.github.zackratos.ultimatebar.UltimateBar;
@@ -42,11 +43,13 @@
import java.util.List;

import cn.sinata.xldutils.activitys.SlabBaseActivity;
import cn.sinata.xldutils.netstatus.NetUtils;
import cn.sinata.xldutils.utils.UtilKtKt;
import pub.devrel.easypermissions.EasyPermissions;

import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static cn.sinata.xldutils.utils.UtilKtKt.toast;

/**
 * Created by Administrator on 2018/1/16.
@@ -95,7 +98,16 @@

    }

//    Handler heartHandler;
    @Override
    protected void onNetworkConnected(NetUtils.NetType type) {
        super.onNetworkConnected(type);
        toast("收到网络变化");
        if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
            MoneyBroadCastReceiver.Companion.callErrorOrder(this);
        }
    }

    //    Handler heartHandler;
    private void settest() {
//        tv_test.setVisibility(VISIBLE);
//        if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){

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

@@ -338,7 +338,6 @@
                }

            } else {
                toast("已经是最新版本")
            }
        }
    }

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

@@ -81,5 +81,9 @@
        putKeyStr(LocalOrderBean.LOCAL_ORDER_INFO,Gson().toJson(bean))
    }

    fun saveLocalOrderBeanNull(){
        putKeyStr(LocalOrderBean.LOCAL_ORDER_INFO,"")
    }


}

 xldUtils/src/main/java/cn/sinata/xldutils/activitys/SlabBaseActivity.java

@@ -159,7 +159,7 @@
     * @return 默认false
     */
    protected boolean shouldRegisterNetworkChangeReceiver(){
        return false;
        return true;
    }

    /**