8.6

liugl

2020-08-06 4cbf791d9d1f5f729c45441ffd0c896235bfdbce

8.6

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 13
        versionName "13"
        versionCode 16
        versionName "16"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

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

@@ -1,17 +1,22 @@
package com.okgoincar.netUtls;

import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.util.Log;

import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.okgoincar.base.MyApplication;
import com.okgoincar.slab.SlabLoginActivity;
import com.okgoincar.utils.Cache.CacheUtil;

import java.io.IOException;
import java.lang.ref.WeakReference;
import java.net.ConnectException;
import java.net.SocketTimeoutException;

import cn.sinata.rxnetty.NettyClient;
import cn.sinata.xldutils.activitys.BaseActivity;
import cn.sinata.xldutils.fragment.BaseFragment;
import cn.sinata.xldutils.net.utils.ResultException;
@@ -84,6 +89,14 @@
            if (baseBean.getCode() == Api.SUCCESS) {
                success(responseString);
            } else {
                if (baseBean.getCode() == 600) {
                    CacheUtil.get().clear();
                    NettyClient.getInstance().stopService();
                    Intent intent = new Intent();
                    intent.setClass(MyApplication.Companion.getAppContext(), SlabLoginActivity.class);
                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                    MyApplication.Companion.getAppContext().startActivity(intent);
                }
                onError(baseBean.getCode(), baseBean.getMsg(),responseString);
//                success(responseString);
            }

 app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt

@@ -9,6 +9,7 @@
import com.okgoincar.R
import com.okgoincar.base.BaseRvAdapter
import com.okgoincar.base.BaseViewHolder
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.OrderListBean
import com.okgoincar.slab.SlabTripActivity
import kotlinx.android.synthetic.main.item_main_list_slab.view.*
@@ -27,6 +28,10 @@
            it.itemView.tv_start.text = item.startAddress
            it.itemView.tv_end.text = item.endAddress
            it.itemView.tv_qian.text = item.redMoney.toString()+"元小费"
            if (item.state == 2 ||item.state == 3||item.state == 4||item.state == 5){
                MyApplication.currentOrderId = item.id.toString()
                MyApplication.currentOrderType = "2"
            }
            it.itemView.clickDelay {
                when(item.state){
                    2,3,4,5 -> {

 app/src/main/java/com/okgoincar/utils/UtilKt.kt

@@ -311,10 +311,10 @@

fun getNowTimeBlack():Boolean{
    var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
//    if (hour < 7 || hour >= 18){
//            return true
//    }
    return true
    if (hour < 7 || hour >= 18){
            return true
    }
    return false
}

fun toast(s:String){

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

@@ -16,12 +16,14 @@
            android:id="@+id/btn_start"
            android:layout_width="wrap_content"
            android:layout_marginStart="150dp"
            android:visibility="gone"
            android:text="开始行程"
            android:layout_height="match_parent"/>

        <Button
            android:id="@+id/btn_end"
            android:layout_width="wrap_content"
            android:visibility="gone"
            android:layout_marginStart="300dp"
            android:text="结束行程"
            android:layout_height="match_parent"/>