新增后台点餐已完成界面

app/src/main/java/com/jld/vod/view/adapter/HostAllOrderItemAdapter.kt

@@ -57,7 +57,7 @@ class HostAllOrderItemAdapter: RecyclerView.Adapter<MyViewHolder>() {
         {
             holder.tv_food_status.visibility = View.VISIBLE
             holder.tv_food_status.setText( R.string.finished)
-            holder.tv_food_status.setTextColor(R.color.md_green_900)
+            holder.tv_food_status.setTextColor(R.color.brown_973)
         }else if(mData!![position].status == "1")
         {
             holder.bt_host_order_finished.visibility = View.VISIBLE

app/src/main/java/com/jld/vod/view/adapter/HostAllOrdersAdapter.kt

@@ -97,17 +97,19 @@ class HostAllOrdersAdapter :
             if (moviet.bigOrderStatus == "1")
             {
                 bt_onclick_complete.visibility = View.VISIBLE
+
                 bt_onclick_complete.setOnClickListener {
                     itemClickListener!!.onItemClickListener(moviet.oid)
                 }
             }else if (moviet.bigOrderStatus == "0"){
                 tv_food_status.visibility = View.VISIBLE
                 tv_food_status.setText( R.string.finished)
-                tv_food_status.setTextColor(R.color.md_green_900)
+                tv_food_status.setTextColor(R.color.brown_973)
             }else if (moviet.bigOrderStatus == "2"){
                 tv_food_status.visibility = View.VISIBLE
                 tv_food_status.setTextColor(R.color.brown_979)
                 tv_food_status.setText( R.string.canceled)
+
             }
         }
     }

app/src/main/java/com/jld/vod/view/fragment/HostCancelledOrdersFragment.kt

@@ -1,11 +1,13 @@
 package com.jld.vod.view.fragment
 
 import android.content.Intent
+import android.view.MotionEvent
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.jld.kotilntest.room.adapter.BrowserAdapter
 import com.jld.vod.R
@@ -17,8 +19,10 @@ import com.jld.vod.utils.AppUtil
 import com.jld.vod.utils.LogUtils
 import com.jld.vod.utils.SharedPrefUtils
 import com.jld.vod.view.WebActivity
+import com.jld.vod.view.adapter.HostAllOrdersAdapter
 import com.jld.vod.viewmodel.BrowserViewModel
 import com.jld.vod.viewmodel.MainViewModel
+import com.jld.vod.viewmodel.MyOrderViewModel
 import com.xuexiang.xpage.annotation.Page
 import com.xuexiang.xpage.enums.CoreAnim
 import com.xuexiang.xui.widget.actionbar.TitleBar
@@ -27,17 +31,31 @@ import kotlinx.coroutines.flow.collectLatest
 
 @Page(anim = CoreAnim.none)
 class HostCancelledOrdersFragment : BaseFragment() {
-
+    private lateinit var myOrderViewModel: MyOrderViewModel
+    private lateinit var mRootRecyclerView : RecyclerView
     override fun getLayoutId(): Int {
         return R.layout.fragment_host_order
     }
 
     override fun initViews() {
+        mRootRecyclerView =   findViewById(R.id.rl_all_orders_client)
 
-    }
-
-    private fun showNullBrowswer() {
+        //初始化viewmodel
+        myOrderViewModel = ViewModelProviders.of(this)
+                .get(MyOrderViewModel::class.java)
+        //购物车列表
+        val listAdapter = HostAllOrdersAdapter()
+        val layoutManager = LinearLayoutManager(activity,RecyclerView.HORIZONTAL, false)
+        mRootRecyclerView.setLayoutManager(layoutManager)
+        mRootRecyclerView!!.adapter = listAdapter
+        val lid = SharedPrefUtils.getString(activity,"language_lid")
 
+        lifecycleScope.launchWhenCreated {
+            myOrderViewModel.getAllOrders(lid.toLong(),"2")
+                    .collectLatest { pagingData ->
+                        listAdapter.submitData(pagingData)
+                    }
+        }
     }
 
     override fun initTitle(): TitleBar? {

app/src/main/java/com/jld/vod/view/fragment/HostCompletedOrdersFragment.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.jld.kotilntest.room.adapter.BrowserAdapter
 import com.jld.vod.R
@@ -17,8 +18,10 @@ import com.jld.vod.utils.AppUtil
 import com.jld.vod.utils.LogUtils
 import com.jld.vod.utils.SharedPrefUtils
 import com.jld.vod.view.WebActivity
+import com.jld.vod.view.adapter.HostAllOrdersAdapter
 import com.jld.vod.viewmodel.BrowserViewModel
 import com.jld.vod.viewmodel.MainViewModel
+import com.jld.vod.viewmodel.MyOrderViewModel
 import com.xuexiang.xpage.annotation.Page
 import com.xuexiang.xpage.enums.CoreAnim
 import com.xuexiang.xui.widget.actionbar.TitleBar
@@ -27,17 +30,31 @@ import kotlinx.coroutines.flow.collectLatest
 
 @Page(anim = CoreAnim.none)
 class HostCompletedOrdersFragment : BaseFragment() {
-
+    private lateinit var myOrderViewModel: MyOrderViewModel
+    private lateinit var mRootRecyclerView : RecyclerView
     override fun getLayoutId(): Int {
         return R.layout.fragment_host_order
     }
 
     override fun initViews() {
-
-    }
-
-    private fun showNullBrowswer() {
-
+        mRootRecyclerView =   findViewById(R.id.rl_all_orders_client)
+
+        //初始化viewmodel
+        myOrderViewModel = ViewModelProviders.of(this)
+                .get(MyOrderViewModel::class.java)
+        //购物车列表
+        val listAdapter = HostAllOrdersAdapter()
+        val layoutManager = LinearLayoutManager(activity,RecyclerView.HORIZONTAL, false)
+        mRootRecyclerView.setLayoutManager(layoutManager)
+        mRootRecyclerView!!.adapter = listAdapter
+        val lid = SharedPrefUtils.getString(activity,"language_lid")
+
+        lifecycleScope.launchWhenCreated {
+            myOrderViewModel.getAllOrders(lid.toLong(),"0")
+                    .collectLatest { pagingData ->
+                        listAdapter.submitData(pagingData)
+                    }
+        }
     }
 
     override fun initTitle(): TitleBar? {

app/src/main/java/com/jld/vod/view/fragment/MyAllOrdersFragment.kt

@@ -1,5 +1,6 @@
 package com.jld.vod.view.fragment
 
+import android.view.KeyEvent
 import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -44,6 +45,7 @@ class MyAllOrdersFragment : BaseFragment() {
                     }
         }
 
+
     }
 
     override fun initTitle(): TitleBar? {

app/src/main/res/values/colors.xml

@@ -23,7 +23,7 @@
     <color name="brown_974">#B68974</color>
     <color name="white_00">#00FFFFFF</color>
 
-    <color name="brown_979">#504F4E</color>
-    <color name="brown_973">#FD9801</color>
+    <color name="brown_979">#ff504F4E</color>
+    <color name="brown_973">#ffFD9801</color>
 
 </resources>