liugl
2020-07-21 2eb712cec24c7c6bb8c64dd332aa625efd8b7abe
first commit
15个文件已修改
2个文件已添加
310 ■■■■ 已修改文件
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabFillOutActivity.kt 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/event/SlabEventDetailActivity.kt 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/event/SlabHistoryEventActivity.kt 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/event/SlabHistoryEventAdapter.kt 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/event/SlabMineEventActivity.kt 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/event/SlabMineEventAdapter.kt 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/utils/UtilKt.kt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/write.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_fill_out_slab.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_trip_slab.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xxhdpi/icon_back_black.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -95,20 +95,20 @@
    }
    Handler heartHandler;
//    Handler heartHandler;
    private void settest() {
        tv_test.setVisibility(VISIBLE);
        if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
            tv_test.setText(
                    "定位位置:lat="+MyApplication.Companion.getLocation().getLatitude()+"  lng="+MyApplication.Companion.getLocation().getLongitude()
                            + "  心跳数量()="+MyApplication.Companion.getTestHeartNunm()+"  收到的websocket数量="+MyApplication.Companion.getTestReceiveNum()
                    +"  方向角="+MyApplication.Companion.getLocation().getBearing()+"  海拔"+MyApplication.Companion.getLocation().getAltitude()
            );
        }
        if (heartHandler == null) {
            heartHandler = new Handler(getMainLooper());
        }
        heartHandler.postDelayed(this::settest,2000);
//        tv_test.setVisibility(VISIBLE);
//        if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
//            tv_test.setText(
//                    "定位位置:lat="+MyApplication.Companion.getLocation().getLatitude()+"  lng="+MyApplication.Companion.getLocation().getLongitude()
//                            + "  心跳数量()="+MyApplication.Companion.getTestHeartNunm()+"  收到的websocket数量="+MyApplication.Companion.getTestReceiveNum()
//                    +"  方向角="+MyApplication.Companion.getLocation().getBearing()+"  海拔"+MyApplication.Companion.getLocation().getAltitude()
//            );
//        }
//        if (heartHandler == null) {
//            heartHandler = new Handler(getMainLooper());
//        }
//        heartHandler.postDelayed(this::settest,2000);
    }
app/src/main/java/com/okgoincar/slab/SlabFillOutActivity.kt
@@ -1,7 +1,9 @@
package com.okgoincar.slab
import androidx.core.content.ContextCompat
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.R
@@ -37,14 +39,47 @@
            et_travel_money.setBackgroundResource(R.drawable.bg_slab_gray_4_black)
            et_parking_money.setBackgroundResource(R.drawable.bg_slab_gray_4_black)
            et_crossing_money.setBackgroundResource(R.drawable.bg_slab_gray_4_black)
            tv_name.textColor(this,R.color.write)
            tv_car_num.textColor(this,R.color.write)
            tv_phone.textColor(this,R.color.write)
            tv_time.textColor(this,R.color.write)
            tv_start_address.textColor(this,R.color.write)
            tv_end_address.textColor(this,R.color.write)
            tv_red_money.textColor(this,R.color.write)
            tv_hint_travel.textColor(this,R.color.write)
            tv_hint_parking.textColor(this,R.color.write)
            tv_hint_crossing.textColor(this,R.color.write)
            et_travel_money.textColor(this,R.color.write)
            et_travel_money.setHintTextColor(ContextCompat.getColor(this,R.color.write_80))
            et_parking_money.textColor(this,R.color.write)
            et_parking_money.setHintTextColor(ContextCompat.getColor(this,R.color.write_80))
            et_crossing_money.textColor(this,R.color.write)
            et_crossing_money.setHintTextColor(ContextCompat.getColor(this,R.color.write_80))
        }else{
            rl_back.setBackgroundResource(R.drawable.bg_slab_main)
            ll_content_web.setBackgroundResource(R.drawable.bg_slab_main_8)
            ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom)
            ll_back_right.setBackgroundResource(R.drawable.bg_slab_main_8_shen)
            et_travel_money.setBackgroundResource(R.drawable.bg_slab_gray_4)
            et_parking_money.setBackgroundResource(R.drawable.bg_slab_gray_4)
            et_crossing_money.setBackgroundResource(R.drawable.bg_slab_gray_4)
            rl_back.setBackgroundResource(R.drawable.write)
            ll_content_web.setBackgroundResource(R.drawable.bg_white_round5)
            ll_order_top.setBackgroundResource(R.drawable.bg_white_round5)
            ll_back_right.setBackgroundResource(R.drawable.bg_white_round5)
            et_travel_money.setBackgroundResource(R.drawable.bg_white_round5)
            et_parking_money.setBackgroundResource(R.drawable.bg_white_round5)
            et_crossing_money.setBackgroundResource(R.drawable.bg_white_round5)
            tv_name.textColor(this,R.color.black)
            tv_car_num.textColor(this,R.color.black)
            tv_phone.textColor(this,R.color.black)
            tv_time.textColor(this,R.color.black)
            tv_start_address.textColor(this,R.color.black)
            tv_end_address.textColor(this,R.color.black)
            tv_red_money.textColor(this,R.color.black)
            tv_hint_travel.textColor(this,R.color.black)
            tv_hint_parking.textColor(this,R.color.black)
            tv_hint_crossing.textColor(this,R.color.black)
            et_travel_money.textColor(this,R.color.black)
            et_travel_money.setHintTextColor(ContextCompat.getColor(this,R.color.black55))
            et_parking_money.textColor(this,R.color.black)
            et_parking_money.setHintTextColor(ContextCompat.getColor(this,R.color.black55))
            et_crossing_money.textColor(this,R.color.black)
            et_crossing_money.setHintTextColor(ContextCompat.getColor(this,R.color.black55))
        }
    }
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -8,6 +8,7 @@
import cn.sinata.xldutils.utils.Toast
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getNowTimeBlack
import cn.sinata.xldutils.utils.textColor
import com.amap.api.maps.model.LatLng
import com.okgoincar.netUtls.*
import com.okgoincar.slab.util.UiUtil
@@ -17,9 +18,6 @@
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.OrderBean
import com.okgoincar.netUtls.Api
import kotlinx.android.synthetic.main.activity_fill_out_slab.ll_order_top
import kotlinx.android.synthetic.main.activity_fill_out_slab.tv_sure
import kotlinx.android.synthetic.main.activity_fill_out_slab.tv_time
import kotlinx.android.synthetic.main.item_get_order.*
import kotlinx.android.synthetic.main.item_map_market.view.*
import org.jetbrains.anko.startActivity
@@ -128,9 +126,18 @@
        if (nowTimeBlack){
            rl_top_back.setBackgroundResource(R.color.black_mode_383838)
            ll_order_top.setBackgroundResource(R.color.black_mode_383838)
            tv_time.textColor(this,R.color.white)
            tv_start.textColor(this,R.color.white)
            tv_end.textColor(this,R.color.white)
            tv_money.textColor(this,R.color.white)
        }else{
            rl_top_back.setBackgroundResource(R.color.green_154c49)
            ll_order_top.setBackgroundResource(R.color.green_154c49)
            rl_top_back.setBackgroundResource(R.color.white)
            ll_order_top.setBackgroundResource(R.color.white)
            tv_time.textColor(this,R.color.black)
            tv_start.textColor(this,R.color.black)
            tv_end.textColor(this,R.color.black)
            tv_money.textColor(this,R.color.black)
        }
    }
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -10,6 +10,7 @@
import androidx.recyclerview.widget.RecyclerView
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getNowTimeBlack
import cn.sinata.xldutils.utils.textColor
import com.amap.api.location.AMapLocation
import com.amap.api.location.AMapLocationListener
@@ -52,9 +53,29 @@
        if (b!!) {
            ct_bg.setBackgroundResource(R.color.black_191919)
            ll_top.setBackgroundResource(R.drawable.bg_green_top_black)
            tv_server_ing.textColor(this,R.color.write)
            iv_small.textColor(this,R.color.write)
            tv_wait_server.textColor(this,R.color.write)
            tv_code_num.textColor(this,R.color.write)
            tv_name.textColor(this,R.color.write)
            tv_car_num.textColor(this,R.color.write)
            tv_star_num.textColor(this,R.color.write)
            tv_current_time.textColor(this,R.color.write)
            tv_company.textColor(this,R.color.write)
            tv_time.textColor(this,R.color.write)
        } else {
            ll_top.setBackgroundResource(R.drawable.bg_green_top)
            ct_bg.setBackgroundResource(R.drawable.bg_slab_main)
            ll_top.setBackgroundResource(R.drawable.bg_white_round5)
            ct_bg.setBackgroundResource(R.drawable.write)
            tv_server_ing.textColor(this,R.color.black)
            iv_small.textColor(this,R.color.black)
            tv_wait_server.textColor(this,R.color.black)
            tv_code_num.textColor(this,R.color.black)
            tv_name.textColor(this,R.color.black)
            tv_car_num.textColor(this,R.color.black)
            tv_star_num.textColor(this,R.color.black)
            tv_current_time.textColor(this,R.color.black)
            tv_company.textColor(this,R.color.black)
            tv_time.textColor(this,R.color.black)
        }
    }
@@ -136,14 +157,22 @@
    override fun setOnclick() {
        tv_server_ing.setOnClickListener {
            tv_server_ing.textColor(this, R.color.main_yellow)
            tv_wait_server.textColor(this, R.color.white)
            if (getNowTimeBlack()){
                tv_wait_server.textColor(this, R.color.white)
            }else{
                tv_wait_server.textColor(this, R.color.black)
            }
            mainFragment.state = 1
            mainFragment.autoRefresh()
        }
        tv_wait_server.setOnClickListener {
            tv_server_ing.textColor(this, R.color.white)
            tv_wait_server.textColor(this, R.color.main_yellow)
            if (getNowTimeBlack()){
                tv_server_ing.textColor(this, R.color.white)
            }else{
                tv_server_ing.textColor(this, R.color.black)
            }
            mainFragment.state = 2
            mainFragment.autoRefresh()
        }
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -3,6 +3,7 @@
import android.os.Looper
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.gone
import cn.sinata.xldutils.utils.textColor
import cn.sinata.xldutils.utils.visible
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
@@ -43,11 +44,33 @@
            ll_content_web.setBackgroundResource(R.drawable.bg_slab_main_8_black)
            ll_order_top.setBackgroundResource(R.color.black_191919)
            ll_pay_result.setBackgroundResource(R.drawable.bg_slab_main_8_shen_black)
            iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
            tv_title_slab.textColor(this,R.color.write)
            tv_name.textColor(this,R.color.write)
            tv_car_num.textColor(this,R.color.write)
            tv_phone.textColor(this,R.color.write)
            tv_time.textColor(this,R.color.write)
            tv_start_address.textColor(this,R.color.write)
            tv_end_address.textColor(this,R.color.write)
            tv_red_money.textColor(this,R.color.write)
            tv_pay_result_title.textColor(this,R.color.write)
            tv_pay_result_small_money.textColor(this,R.color.write)
        }else{
            rl_main_bg.setBackgroundResource(R.drawable.bg_slab_main)
            ll_content_web.setBackgroundResource(R.drawable.bg_slab_main_8)
            ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom)
            ll_pay_result.setBackgroundResource(R.drawable.bg_slab_main_8_shen)
            rl_main_bg.setBackgroundResource(R.drawable.write)
            ll_content_web.setBackgroundResource(R.drawable.bg_white_round5)
            ll_order_top.setBackgroundResource(R.drawable.bg_white_round5)
            ll_pay_result.setBackgroundResource(R.drawable.bg_white_round5)
            iv_back_slab.setImageResource(R.mipmap.icon_back_black)
            tv_title_slab.textColor(this,R.color.black)
            tv_name.textColor(this,R.color.black)
            tv_car_num.textColor(this,R.color.black)
            tv_phone.textColor(this,R.color.black)
            tv_time.textColor(this,R.color.black)
            tv_start_address.textColor(this,R.color.black)
            tv_end_address.textColor(this,R.color.black)
            tv_red_money.textColor(this,R.color.black)
            tv_pay_result_title.textColor(this,R.color.black)
            tv_pay_result_small_money.textColor(this,R.color.black)
        }
    }
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -83,10 +83,49 @@
            ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom_blacl)
            ll_info_top.setBackgroundResource(R.drawable.bg_slab_main_8_black)
            rl_back.setBackgroundResource(R.color.black_191919)
            iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
            tv_title_slab.textColor(this,R.color.write)
            tv_name.textColor(this,R.color.write)
            tv_car_num.textColor(this,R.color.write)
            tv_phone.textColor(this,R.color.write)
            tv_phone.setDrawableLeft(R.mipmap.icon_dial_slab)
            tv_time.textColor(this,R.color.write)
            tv_start_address.textColor(this,R.color.write)
            tv_end_address.textColor(this,R.color.write)
            tv_red_money.textColor(this,R.color.write)
            tv_end_address.textColor(this,R.color.write)
            tv_code_num.textColor(this,R.color.write)
            tv_name_car_man.textColor(this,R.color.write)
            tv_car_num_var.textColor(this,R.color.write)
            tv_star_num.textColor(this,R.color.write)
            tv_company.textColor(this,R.color.write)
            tv_time_send_prove.textColor(this,R.color.write)
            tv_current_time.textColor(this,R.color.write)
        } else {
            ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom)
            ll_info_top.setBackgroundResource(R.drawable.bg_slab_main_8)
            rl_back.setBackgroundResource(R.drawable.bg_slab_main)
            ll_order_top.setBackgroundResource(R.drawable.write)
            ll_info_top.setBackgroundResource(R.drawable.write)
            rl_back.setBackgroundResource(R.drawable.write)
            iv_back_slab.setImageResource(R.mipmap.icon_back_black)
            tv_title_slab.textColor(this,R.color.black)
            tv_name.textColor(this,R.color.black)
            tv_car_num.textColor(this,R.color.black)
            tv_phone.textColor(this,R.color.black)
            tv_phone.setDrawableNull()
            tv_time.textColor(this,R.color.black)
            tv_start_address.textColor(this,R.color.black)
            tv_end_address.textColor(this,R.color.black)
            tv_red_money.textColor(this,R.color.black)
            tv_end_address.textColor(this,R.color.black)
            tv_code_num.textColor(this,R.color.black)
            tv_name_car_man.textColor(this,R.color.black)
            tv_car_num_var.textColor(this,R.color.black)
            tv_star_num.textColor(this,R.color.black)
            tv_company.textColor(this,R.color.black)
            tv_time_send_prove.textColor(this,R.color.black)
            tv_current_time.textColor(this,R.color.black)
        }
    }
@@ -99,6 +138,7 @@
        initMineLocation()
        onclick()
        addSockectCancel()
        changeMode()
        MyApplication.getInstance()!!.initUpPoint()
    }
@@ -123,21 +163,25 @@
        super.onBackPressed()
    }
    fun changeMode(){
        if (tv_change.text == "收起") {
            rl_map.invisible()
            rl_persion_info.visible()
            tv_change.text = "地图"
            tv_change.textColor(this, R.color.main_yellow)
            tv_change.setBackgroundResource(R.drawable.bg_orange_slab_line_4)
        } else {
            rl_map.visible()
            rl_persion_info.invisible()
            tv_change.text = "收起"
            tv_change.textColor(this, R.color.white)
            tv_change.setBackgroundResource(R.drawable.bg_login)
        }
    }
    private fun onclick() {
        tv_change.clickDelay {
            if (tv_change.text == "收起") {
                rl_map.invisible()
                rl_persion_info.visible()
                tv_change.text = "地图"
                tv_change.textColor(this, R.color.main_yellow)
                tv_change.setBackgroundResource(R.drawable.bg_orange_slab_line_4)
            } else {
                rl_map.visible()
                rl_persion_info.invisible()
                tv_change.text = "收起"
                tv_change.textColor(this, R.color.white)
                tv_change.setBackgroundResource(R.drawable.bg_login)
            }
          changeMode()
        }
        iv_move.setOnClickListener {
            orderBean.let {
@@ -229,8 +273,12 @@
        var payType = 1 //支付方式(1=OK平台收款,2=其他方式收款)
        if (getNowTimeBlack()) {
            pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_slab_main_8_black)
            pop.contentView.tv_cancel.textColor(this,R.color.white)
            pop.contentView.tv_ok.textColor(this,R.color.white)
        } else {
            pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_slab_main_8)
            pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_white_round_2)
            pop.contentView.tv_cancel.textColor(this,R.color.black)
            pop.contentView.tv_ok.textColor(this,R.color.black)
        }
        pop.showDown(window.decorView)
        pop.contentView.tv_cancel.setOnClickListener {
@@ -265,8 +313,10 @@
                })
                if (getNowTimeBlack()) {
                    pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_green_4_black)
                    pop.contentView.tv_view_two_base.textColor(this,R.color.white)
                } else {
                    pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_green_4)
                    pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_white_round_2)
                    pop.contentView.tv_view_two_base.textColor(this,R.color.black)
                }
                pop.showCenter(window.decorView)
            }
app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
@@ -3,6 +3,7 @@
import android.view.View
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getNowTimeBlack
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.slab.SlabFillOutActivity
import com.okgoincar.slab.SlabOrderOverActivity
import com.okgoincar.R
@@ -47,8 +48,14 @@
    private fun setBlackMode(nowTimeBlack: Boolean,view:View) {
        if (nowTimeBlack){
            view.ll_bg.setBackgroundResource(R.color.black_191919)
            view.tv_time.textColor(context,R.color.write)
            view.tv_start.textColor(context,R.color.write)
            view.tv_end.textColor(context,R.color.write)
        }else{
            view.ll_bg.setBackgroundResource(R.color._green1f5e57)
            view.ll_bg.setBackgroundResource(R.color.white)
            view.tv_time.textColor(context,R.color.black)
            view.tv_start.textColor(context,R.color.black)
            view.tv_end.textColor(context,R.color.black)
        }
    }
app/src/main/java/com/okgoincar/slab/event/SlabEventDetailActivity.kt
@@ -2,6 +2,7 @@
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.gone
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.R
import com.okgoincar.slab.MySlabBaseActivity
import kotlinx.android.synthetic.main.activity_mine_event_slab.*
@@ -43,8 +44,12 @@
        super.setBlackMode(b)
        if (b!!){
            ll_bg_back.setBackgroundResource(R.color.black_191919)
            iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
            tv_title_slab.textColor(this,R.color.write)
        }else{
            ll_bg_back.setBackgroundResource(R.drawable.bg_slab_main)
            ll_bg_back.setBackgroundResource(R.drawable.write)
            iv_back_slab.setImageResource(R.mipmap.icon_back_black)
            tv_title_slab.textColor(this,R.color.black)
        }
    }
}
app/src/main/java/com/okgoincar/slab/event/SlabHistoryEventActivity.kt
@@ -1,6 +1,7 @@
package com.okgoincar.slab.event
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.R
import com.okgoincar.slab.MySlabBaseActivity
import kotlinx.android.synthetic.main.activity_history_slab.*
@@ -32,8 +33,12 @@
        super.setBlackMode(b)
        if(b!!){
            ll_back.setBackgroundResource(R.color.black_191919)
            iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
            tv_title_slab.textColor(this,R.color.write)
        }else{
            ll_back.setBackgroundResource(R.drawable.bg_slab_main)
            ll_back.setBackgroundResource(R.drawable.write)
            iv_back_slab.setImageResource(R.mipmap.icon_back_black)
            tv_title_slab.textColor(this,R.color.black)
        }
    }
}
app/src/main/java/com/okgoincar/slab/event/SlabHistoryEventAdapter.kt
@@ -30,8 +30,9 @@
    private fun setblack(itemView: View, nowTimeBlack: Boolean) {
        if (nowTimeBlack){
            itemView.tv_time.textColor(context,R.color.write)
        }else{
            itemView.tv_time.textColor(context,R.color.black)
        }
    }
app/src/main/java/com/okgoincar/slab/event/SlabMineEventActivity.kt
@@ -1,6 +1,7 @@
package com.okgoincar.slab.event
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.R
import com.okgoincar.slab.MySlabBaseActivity
import kotlinx.android.synthetic.main.activity_mine_event_slab.*
@@ -38,8 +39,12 @@
        super.setBlackMode(b)
        if (b!!){
            ll_bg_back.setBackgroundResource(R.color.black_191919)
            iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
            tv_title_slab.textColor(this,R.color.write)
        }else{
            ll_bg_back.setBackgroundResource(R.drawable.bg_slab_main)
            ll_bg_back.setBackgroundResource(R.drawable.write)
            iv_back_slab.setImageResource(R.mipmap.icon_back_black)
            tv_title_slab.textColor(this,R.color.black)
        }
    }
}
app/src/main/java/com/okgoincar/slab/event/SlabMineEventAdapter.kt
@@ -2,6 +2,7 @@
import android.view.View
import cn.sinata.xldutils.utils.getNowTimeBlack
import cn.sinata.xldutils.utils.textColor
import com.okgoincar.R
import com.okgoincar.base.BaseRvAdapter
import com.okgoincar.base.BaseViewHolder
@@ -26,8 +27,10 @@
    private fun setblack(nowTimeBlack: Boolean, itemView: View) {
        if (nowTimeBlack){
            itemView.rl_back.setBackgroundResource(R.color.black_191919)
            itemView.tv_start.textColor(context,R.color.write)
        }else{
            itemView.rl_back.setBackgroundResource(R.color.main_green)
            itemView.rl_back.setBackgroundResource(R.drawable.write)
            itemView.tv_start.textColor(context,R.color.black)
        }
    }
app/src/main/java/com/okgoincar/utils/UtilKt.kt
@@ -229,6 +229,11 @@
}
fun TextView.setDrawableNull() {
    this.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
}
fun TextView.setDrawableBottom(drawableResourseId: Int) {
    val topAct: Drawable = context.resources.getDrawable(drawableResourseId)
    this.setCompoundDrawablesWithIntrinsicBounds(null, null, null, topAct)
@@ -243,7 +248,6 @@
    val topAct: Drawable = context.resources.getDrawable(drawableResourseId)
    this.setCompoundDrawablesWithIntrinsicBounds(null, topAct, null, null)
}
fun TextView.setColor(context: Context, resourse: Int) {
    this.setTextColor(ContextCompat.getColor(context, resourse))
@@ -305,8 +309,8 @@
fun getNowTimeBlack():Boolean{
    var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
//    if (hour < 7 || hour >= 18){
        if (hour < 7 || hour >= 12){
    if (hour < 7 || hour >= 18){
//        if (hour < 7 || hour >= 12){
            return true
    }
    return false
app/src/main/res/drawable/write.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/white" />
    <stroke
        android:width="1dp"
        android:color="@color/black" />
</shape>
app/src/main/res/layout/activity_fill_out_slab.xml
@@ -197,6 +197,7 @@
            android:orientation="horizontal">
            <TextView
                android:id="@+id/tv_hint_travel"
                android:layout_width="220dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="9dp"
@@ -233,6 +234,7 @@
            android:orientation="horizontal">
            <TextView
                android:id="@+id/tv_hint_parking"
                android:layout_width="220dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="9dp"
@@ -268,6 +270,7 @@
            android:orientation="horizontal">
            <TextView
                android:id="@+id/tv_hint_crossing"
                android:layout_width="220dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="9dp"
app/src/main/res/layout/activity_trip_slab.xml
@@ -117,7 +117,6 @@
                android:textSize="26sp"
                android:textStyle="bold" />
            <include layout="@layout/include_line" />
            <TextView
@@ -133,7 +132,6 @@
                android:textSize="26sp"
                android:textStyle="bold" />
            <include layout="@layout/include_line" />
            <TextView
                android:id="@+id/tv_end_address"
@@ -148,7 +146,6 @@
                android:textSize="26sp"
                android:textStyle="bold" />
            <include layout="@layout/include_line" />
            <TextView
                android:id="@+id/tv_red_money"
@@ -157,13 +154,12 @@
                android:layout_marginTop="11dp"
                android:layout_marginBottom="11dp"
                android:drawableStart="@mipmap/hongbao"
                android:drawablePadding="5dp"
                android:drawablePadding="10dp"
                android:text="8元小费"
                android:textColor="#ffffffff"
                android:textSize="26sp"
                android:textStyle="bold" />
            <include layout="@layout/include_line" />
        </LinearLayout>
app/src/main/res/mipmap-xxhdpi/icon_back_black.png