liugl
2020-11-02 080f7b67b66121fb325d777ba066112a2ace6825
11.30  首页列表添加 其他数据用来展示页面 不空
5个文件已修改
143 ■■■■ 已修改文件
app/src/main/java/com/okgoincar/netUtls/Api.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/slab_activity_main.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -11,10 +11,15 @@
//    public static final String SOCKET_SERVER = "192.168.0.80";
//    public static final int SOCKET_PORT = 9999;
    //39.108.148.228 测试服务器
    public static final String BASE_URL = "http://39.108.148.228:80/driver/";
    public static final String SOCKET_SERVER = "39.108.148.228";
    public static final int SOCKET_PORT = 8888;
    //外网
    public static final String BASE_URL = "https://okyueche.com:443/driver/";
    public static final String SOCKET_SERVER = "39.108.122.38";
    public static final int SOCKET_PORT = 9999;
//    public static final String BASE_URL = "https://okyueche.com:443/driver/";
//    public static final String SOCKET_SERVER = "39.108.122.38";
//    public static final int SOCKET_PORT = 9999;
    public static final  int SUCCESS = 200;
    /**
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -7,11 +7,14 @@
import com.okgoincar.ui.adapter.SlabMainAdapter
import com.okgoincar.bean.OrderListBean
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.callNet
import java.util.HashMap
class SlabMainFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
    var state = 1
    var firstCallRecord = false //是否首次在进行中的列表中加入历史记录 (进行中的订单太少客户觉得太空)
    override fun pathUrl(): String? {
        return Api.queryOrderList
@@ -29,7 +32,7 @@
    override fun getDatas(t: String?): List<OrderListBean.DataBean> {
        var data = gson.fromJson<OrderListBean>(t, OrderListBean::class.java)
        if (!data.data.isNullOrEmpty()){
        if (!data.data.isNullOrEmpty()) {
            if ((data.data[0].state == 2 || data.data[0].state == 3 || data.data[0].state == 4 || data.data[0].state == 5 || data.data[0].state == 6) && data.data.size >= 1) {
                MyApplication.currentOrderId = data.data[0].id.toString()
                MyApplication.currentOrderId = data.data[0].type.toString()
@@ -50,4 +53,29 @@
        nothingMessage = ""
    }
    override fun refresh() {
        super.refresh()
        firstCallRecord = false
    }
    override fun noShowNothing() {
        super.noShowNothing()
        if (!firstCallRecord) {
            callRecord()
        }
    }
    private fun callRecord() {
        var map = getMapByAny()
        map["state"] = 4
        map["size"] = 10
        map["pageNum"] = 1
        callNet(Api.queryMyAllOrder, map) {
            var data = gson.fromJson<OrderListBean>(it, OrderListBean::class.java)
            adapter.data.addAll(data.data)
            adapter.notifyDataSetChanged()
        }
    }
}
app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt
@@ -86,4 +86,6 @@
    override fun initView() {
    }
}
app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
@@ -11,8 +11,14 @@
import com.okgoincar.base.BaseViewHolder
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.OrderListBean
import com.okgoincar.slab.SlabMainActivity
import com.okgoincar.slab.SlabTripActivity
import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.item_main_list_slab.view.*
import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_end
import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_start
import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_time
import kotlinx.android.synthetic.main.order_detail.view.*
import org.jetbrains.anko.startActivity
class SlabMainAdapter : BaseRvAdapter<OrderListBean.DataBean>() {
@@ -23,45 +29,92 @@
    override fun onBindItem(holder: BaseViewHolder?, view: View?, item: OrderListBean.DataBean?) {
        holder?.let {
            setBlackMode(getNowTimeBlack(),it.itemView)
            setBlackMode(getNowTimeBlack(), it.itemView)
            it.itemView.tv_time.text = item!!.time
            it.itemView.tv_start.text = item.startAddress
            it.itemView.tv_end.text = item.endAddress
            it.itemView.tv_qian.text = item.redMoney.toString()+"元小费"
            it.itemView.tv_qian.text = item.redMoney.toString() + "元小费"
            it.itemView.clickDelay {
                when(item.state){
                    2,3,4,5 -> {
                        context.startActivity<SlabTripActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                when (item.state) {
                    2, 3, 4, 5 -> {
                        context.startActivity<SlabTripActivity>(
                            "orderId" to item.id.toString(),
                            "orderType" to item.type.toString()
                        )
                    }
                    6 ->{
                        context.startActivity<SlabFillOutActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                    6 -> {
                        context.startActivity<SlabFillOutActivity>(
                            "orderId" to item.id.toString(),
                            "orderType" to item.type.toString()
                        )
                    }
                    7->{
                        context.startActivity<SlabOrderOverActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                    7 -> {
                        context.startActivity<SlabOrderOverActivity>(
                            "orderId" to item.id.toString(),
                            "orderType" to item.type.toString()
                        )
                    }
                    8,9,10 -> {
                        context.startActivity<SlabOrderOverActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                    8, 9, 10,11 -> {
                        var pop = DialogUtil.getPopupwindow(context, R.layout.order_detail)
                        var view = pop.contentView
                        view.iv_close.clickDelay {
                            pop.dismiss()
                        }
                        view.tv_time.text = item.time
                        view.tv_start.text = item.startAddress
                        view.tv_end.text = item.endAddress
                        view.tv_money.text = item.redMoney.toString() + "元红包"
                        view.tv_money_num.text = item.orderMoney.toString() + "元"
                        setBlack(getNowTimeBlack(), view)
                        pop.showCenter((context as SlabMainActivity).window.decorView)
                    }
                }
            }
        }
    }
    private fun setBlackMode(nowTimeBlack: Boolean,view:View) {
        if (nowTimeBlack){
    private fun setBlackMode(nowTimeBlack: Boolean, view: View) {
        if (nowTimeBlack) {
            view.ll_bg.setBackgroundResource(R.color.slab_gray)
            view.tv_time.textColor(context,R.color.write)
            view.tv_start.textColor(context,R.color.write)
            view.tv_end.textColor(context,R.color.write)
            view.tv_qian.textColor(context,R.color.write)
        }else{
            view.tv_time.textColor(context, R.color.write)
            view.tv_start.textColor(context, R.color.write)
            view.tv_end.textColor(context, R.color.write)
            view.tv_qian.textColor(context, R.color.write)
        } else {
            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)
            view.tv_qian.textColor(context,R.color.black)
            view.tv_time.textColor(context, R.color.black)
            view.tv_start.textColor(context, R.color.black)
            view.tv_end.textColor(context, R.color.black)
            view.tv_qian.textColor(context, R.color.black)
        }
    }
    private fun setBlack(nowTimeBlack: Boolean, view: View?) {
        view?.let {
            if (nowTimeBlack){ //黑
                view.rl_back.setBackgroundResource(R.drawable.bg_slab_gray_4_gray)
                view.tv_title.textColor(context,R.color.slab_yellow_zhong)
                view.tv_money_num.textColor(context,R.color.slab_yellow_zhong)
                view.iv_close.setImageResource(R.mipmap.close_write_c)
                view.tv_time.textColor(context,R.color.write)
                view.tv_start.textColor(context,R.color.write)
                view.tv_end.textColor(context,R.color.write)
                view.tv_money.textColor(context,R.color.write)
                view.tv_money_order.textColor(context,R.color.write)
            }else{
                view.rl_back.setBackgroundResource(R.drawable.bg_white_6)
                view.tv_title.textColor(context,R.color.sdsdf)
                view.tv_money_num.textColor(context,R.color.sdsdf)
                view.iv_close.setImageResource(R.mipmap.close_big)
                view.tv_time.textColor(context,R.color.black)
                view.tv_start.textColor(context,R.color.black)
                view.tv_end.textColor(context,R.color.black)
                view.tv_money.textColor(context,R.color.black)
                view.tv_money_order.textColor(context,R.color.black)
            }
        }
    }
}
app/src/main/res/layout/slab_activity_main.xml
@@ -84,7 +84,8 @@
        android:elevation="6dp"
        app:layout_constraintBottom_toTopOf="@+id/tv_more"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/ll_top" />
        app:layout_constraintTop_toBottomOf="@+id/ll_top"
        app:layout_constraintVertical_bias="0.0" />
    <TextView
        android:id="@+id/tv_title_top"