diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e98de7b..5f54602 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,12 +5,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -27,11 +27,11 @@
-
+
-
+
@@ -39,14 +39,14 @@
+ android:usesCleartextTraffic="true">
@@ -54,55 +54,131 @@
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
map=new HashMap<>();
+ map.put("page",page);
+ map.put("limit",limit);
+ map.put("receiverAddress",receiverAddress);
+// if(orderStatus!=0){
+ map.put("orderStatus",200004);
+// }
+ Request re = OkHttpUtil.posts(new OkDate(UrlManager.getWaybillListV2(), "post", MapUtil.mapJson(map)),getToken(con),con);
+ RequestTest.test(1,"searchOrderList",re,con,hd);
+ }
+
//运单详情
public void orderDetail(int waybillId){
Map map=new HashMap<>();
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/waybill/WayBillsFragment.kt b/app/src/main/java/com/oneclouds/cargo/ui/waybill/WayBillsFragment.kt
index b64e1c4..196a9ca 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/waybill/WayBillsFragment.kt
+++ b/app/src/main/java/com/oneclouds/cargo/ui/waybill/WayBillsFragment.kt
@@ -4,10 +4,12 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter
import com.dahe.mylibrary.base.BaseFragment
+import com.dahe.mylibrary.utils.ActivityUtils
import com.oneclouds.cargo.R
import com.oneclouds.cargo.ui.home.OrderListActivity
import com.oneclouds.cargo.ui.home.typelist.*
import com.oneclouds.cargo.ui.parts.UserParts
+import com.oneclouds.cargo.ui.waybill.activity.SearchWaybillActivity
import com.xuexiang.xui.widget.tabbar.TabSegment
import kotlinx.android.synthetic.main.fragment_waybill_list.*
import kotlinx.android.synthetic.main.order_list_top.*
@@ -48,6 +50,10 @@ class WayBillsFragment : BaseFragment() {
vp.adapter = MyAdapter(this.fragmentManager)
tabSegment.setupWithViewPager(vp, false)
tabSegment.setMode(TabSegment.MODE_FIXED)
+
+ tvSearch.setOnClickListener {
+ ActivityUtils.startActivity(mContext, SearchWaybillActivity::class.java)
+ }
}
inner class MyAdapter(fm: FragmentManager?) :
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/SearchWaybillActivity.kt b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/SearchWaybillActivity.kt
new file mode 100644
index 0000000..191dbff
--- /dev/null
+++ b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/SearchWaybillActivity.kt
@@ -0,0 +1,348 @@
+package com.oneclouds.cargo.ui.waybill.activity
+
+import android.accessibilityservice.AccessibilityService.SoftKeyboardController
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Intent
+import android.os.Bundle
+import android.os.Message
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.Toast
+import com.dahe.mylibrary.base.BaseActivity
+import com.google.gson.Gson
+import com.lxj.xpopup.util.KeyboardUtils
+import com.oneclouds.cargo.R
+import com.oneclouds.cargo.bean.WaybillListBean
+import com.oneclouds.cargo.bean.WaybillListBean.DataDTO.ListDTO
+import com.oneclouds.cargo.request.WaybillRequest
+import com.oneclouds.cargo.ui.home.OrderDetailsActivity
+import com.oneclouds.cargo.ui.home.OrderDetailsAllActivity
+import com.oneclouds.cargo.ui.home.typelist.OrderList4Fragment
+import com.oneclouds.cargo.ui.parts.TypeParts
+import com.oneclouds.cargo.util.ToastUtil
+import com.oneclouds.cargo.util.adapter.AdapterAlls
+import com.oneclouds.cargo.util.adapter.ManyBean
+import com.oneclouds.cargo.util.cache.CacheGroup
+import com.oneclouds.cargo.util.http.RequsetCodeConstants
+import com.oneclouds.cargo.util.time.Timer
+import com.scwang.smart.refresh.layout.api.RefreshLayout
+import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener
+import com.scwang.smart.refresh.layout.listener.OnRefreshListener
+import kotlinx.android.synthetic.main.activity_search_waybill.btnSearch
+import kotlinx.android.synthetic.main.activity_search_waybill.etSearch
+import kotlinx.android.synthetic.main.activity_search_waybill.refreshLayout
+import kotlinx.android.synthetic.main.activity_search_waybill.rv
+
+/**
+ * @ClassName SearchWaybillActivity
+ * @Author john
+ * @Date 2025/1/7 09:17
+ * @Description TODO
+ */
+class SearchWaybillActivity : BaseActivity() {
+ private val type = 200004
+ private var index = 1
+ private var dataKey = true
+ private lateinit var aas: AdapterAlls
+ private lateinit var olb: WaybillListBean
+ private lateinit var wr :WaybillRequest
+ private var timer = ""
+ var sum: Int = 0
+ private var list = mutableListOf()
+ private var keys = mutableListOf()
+
+ override fun msgMethod(m: Message) {
+ super.msgMethod(m)
+ when (m.what) {
+ RequsetCodeConstants.SUCCESS -> {
+// sr.finishRefresh()
+// sr.finishLoadMore()
+ //获取数据
+ if (CacheGroup.cacheList["searchOrderList"] != null) {
+ refreshLayout.finishLoadMore()
+ refreshLayout.finishRefresh()
+ Log.e(
+ "-list-",
+ CacheGroup.cacheList["searchOrderList"]+""
+ )
+ olb = Gson().fromJson(
+ CacheGroup.cacheList["searchOrderList"],
+ WaybillListBean::class.java
+ )
+ if (olb.code==200){
+ if (index == 1) {
+ initRecyclerView()
+ } else {
+ if (olb.data.list.size == 0) {
+ dataKey = false
+ Toast.makeText(mContext, "没有更多了", Toast.LENGTH_SHORT).show()
+ } else {
+ addData()
+ }
+ }
+ }else{
+ ToastUtil.show(mContext, "加载失败")
+ }
+
+// if (olb.code == 200) {
+// if (index == 1) {
+// initData()
+// } else {
+// if (olb.data.list.size == 0) {
+// dataKey = false
+// Toast.makeText(con, "没有更多了", Toast.LENGTH_SHORT).show()
+// } else {
+// addData()
+// }
+// }
+// } else {
+// ToastUtil.show(con, "加载失败")
+// }
+ CacheGroup.cacheList.remove("searchOrderList")
+ }
+
+
+ //签收
+// if (CacheGroup.cacheList["order_sign"] != null) {
+// val bb: BaseBean = gson.fromJson(
+// CacheGroup.cacheList["order_sign"],
+// BaseBean::class.java
+// )
+// if (bb.code == 200) {
+// sr.autoRefresh()
+// ToastUtil.show(con, "收货成功")
+// } else {
+// sr.autoRefresh()
+// ToastUtil.show(con, bb.msg)
+// }
+// CacheGroup.cacheList.remove("order_sign")
+// }
+// //删除
+// if (CacheGroup.cacheList[OrderRequest.ORDER_DEL] != null) {
+// val bb: BaseBean = gson.fromJson(
+// CacheGroup.cacheList[OrderRequest.ORDER_DEL],
+// BaseBean::class.java
+// )
+// if (bb.code == 200) {
+// sr.autoRefresh()
+// ToastUtil.show(con, "删除成功")
+// } else {
+// ToastUtil.show(con, bb.msg)
+// }
+// CacheGroup.cacheList.remove(OrderRequest.ORDER_DEL)
+// }
+ }
+
+
+ else -> {}
+ }
+ }
+
+
+ override fun getLayout() = R.layout.activity_search_waybill
+
+ override fun initView(savedInstanceState: Bundle?) {
+ setStatusBarColor(R.color.color_theme)
+ setTitleBar("搜索运单") { finish() }
+ wr = WaybillRequest(mContext, hd)
+ btnSearch.setOnClickListener {
+ etSearch.text.toString().trim().let {
+ if (it.isNotEmpty()) {
+ index = 1
+ refreshLayout.autoRefresh()
+// getDatas(it)
+ } else {
+ refreshLayout.autoRefresh()
+ }
+ }
+ KeyboardUtils.hideSoftInput(etSearch)
+ }
+ initRefreshLoad()
+ }
+
+ override fun initDate() {
+ getDatas("")
+ }
+
+ private fun getDatas(search: String){
+ wr.searchOrderList(index, 10, search)
+ }
+
+ private fun initRecyclerView() {
+ list.clear()
+ val lists: MutableList = mutableListOf()
+ for (i in olb.getData().getList().indices) {
+ var str: String = olb.getData().getList().get(i).getCreateTime()
+ str = Timer.formatChange(str, "yyyy-MM-dd HH:mm:ss", "yyyy-MM")
+ if (str != timer) {
+ timer = str
+ keys.add(false)
+ lists.add(ManyBean(time(timer), R.layout.order_time))
+ }
+ if (TypeParts.isEntrust(mContext)) {
+ olb.getData().getList().get(i).setTotalFreight("")
+ }
+ keys.add(false)
+ lists.add(ManyBean(olb.getData().getList().get(i), R.layout.order_item))
+ }
+ if (lists.size == 0 && index == 1) {
+ keys.add(false)
+ lists.add(ManyBean(time(""), R.layout.item_null))
+ }
+ list.addAll(lists)
+ aas = rv.creates(mContext, list)
+ aas.setOnItemViewListener { position: Int, o: Any, v: View, layout: Int ->
+ when (layout) {
+ R.layout.order_item -> {
+ val ld = o as ListDTO
+ val btn = v.findViewById