修复点餐部分问题

app/src/main/java/com/jld/vod/view/HostOrderActivity.kt

@@ -3,10 +3,13 @@ package com.jld.vod.view
 import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.graphics.Bitmap
 import android.os.Handler
+import android.util.Log
 import android.view.WindowManager
 import android.widget.ImageView
 import com.jld.vod.R
@@ -14,6 +17,7 @@ import com.jld.vod.base.BaseActivity
 import com.jld.vod.model.bean.PositionAdvertBean
 import com.jld.vod.model.event.NewOrderEvent
 import com.jld.vod.service.LatLongService
+import com.jld.vod.utils.DateUtils
 import com.jld.vod.utils.LogUtils
 import com.jld.vod.utils.SharedPrefUtils
 import com.jld.vod.view.widget.CustomAdDialog
@@ -21,13 +25,16 @@ import com.xuexiang.xpage.enums.CoreAnim
 import com.xuexiang.xui.widget.tabbar.EasyIndicator
 import com.xuexiang.xui.widget.tabbar.EasyIndicator.onTabClickListener
 import com.xuexiang.xutil.tip.ToastUtils
+import kotlinx.android.synthetic.main.activity_main.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
+import java.util.*
 
 class HostOrderActivity : BaseActivity() {
     private lateinit var iv_order_back:ImageView
     private lateinit var mEasyIndicator1: EasyIndicator
     private val mHandler = Handler()
+    private var receiver: broadCastRecever = broadCastRecever()//更新时间广播
 
     override fun getLayoutId(): Int {
         return R.layout.activity_host_order
@@ -97,6 +104,7 @@ class HostOrderActivity : BaseActivity() {
     override fun onDestroy() {
         super.onDestroy()
         EventBus.getDefault().unregister(this)
+        unregisterReceiver(receiver)
     }
 
     /**
@@ -128,4 +136,52 @@ class HostOrderActivity : BaseActivity() {
         manager.cancel(R.mipmap.ic_launcher)
         manager.cancel(666)
     }
+    /**
+     * onStart
+     * 广播更新时间
+     */
+    override fun onStart() {
+        super.onStart()
+        //初始化当前时间
+        LogUtils.logD("初始化当前时间")
+        var dateString =  SharedPrefUtils.getString(this,"newDate")
+        Log.d("onStart", "onStart: $dateString")
+        Log.d("onStart——系统时间", "onStart:"+System.currentTimeMillis())
+//        var date: Date = Date(System.currentTimeMillis())
+        var dateLong =0L
+        try {
+            dateLong = dateString.toLong()
+        } catch ( e : NumberFormatException){
+            Log.e("OrderActivity", "onStart: ", e)
+        }
+        var date: Date = Date(dateLong)
+        val time = DateUtils.getTime(date)
+        val dates = DateUtils.getDate(date)
+        val week = DateUtils.getWeekOfDate(date)
+        Log.d("OrderActivity", "onStart: $date $dates $time $week")
+        tv_main_time.text = time
+        tv_main_week.text = "$dates  $week"
+        //动态注册广播
+        val filter = IntentFilter()
+        filter.addAction(Intent.ACTION_TIME_TICK)
+        registerReceiver(receiver, filter)
+    }
+    /**
+     * 时间广播更新
+     */
+    inner class broadCastRecever : BroadcastReceiver() {
+        //广播接收器
+        override fun onReceive(context: Context?, intent: Intent?) {//接收广播后执行的操作
+            var action: String? = intent!!.action
+            if (action.equals(Intent.ACTION_TIME_TICK)) {
+                //获取当前时间
+                var date: Date = Date(System.currentTimeMillis())
+                var time = DateUtils.getTime(date)
+                var dates = DateUtils.getDate(date)
+                var week = DateUtils.getWeekOfDate(date)
+                tv_main_time.text = time
+                tv_main_week.text = "$dates $week"
+            }
+        }
+    }
 }

app/src/main/java/com/jld/vod/view/MyOrderActivity.kt

@@ -1,16 +1,27 @@
 package com.jld.vod.view
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.util.Log
 import android.widget.ImageView
 import com.jld.vod.R
 import com.jld.vod.base.BaseActivity
+import com.jld.vod.utils.DateUtils
+import com.jld.vod.utils.LogUtils
+import com.jld.vod.utils.SharedPrefUtils
 import com.xuexiang.xpage.enums.CoreAnim
 import com.xuexiang.xui.widget.tabbar.EasyIndicator
 import com.xuexiang.xui.widget.tabbar.EasyIndicator.onTabClickListener
 import com.xuexiang.xutil.tip.ToastUtils
+import kotlinx.android.synthetic.main.activity_main.*
+import java.util.*
 
 class MyOrderActivity : BaseActivity() {
     private lateinit var iv_order_back:ImageView
     private lateinit var mEasyIndicator1: EasyIndicator
+    private var receiver: broadCastRecever = broadCastRecever()//更新时间广播
 
     override fun getLayoutId(): Int {
         return R.layout.activity_host_order
@@ -52,4 +63,56 @@ class MyOrderActivity : BaseActivity() {
             }
         })
     }
+    /**
+     * onStart
+     * 广播更新时间
+     */
+    override fun onStart() {
+        super.onStart()
+        //初始化当前时间
+        LogUtils.logD("初始化当前时间")
+        var dateString =  SharedPrefUtils.getString(this,"newDate")
+        Log.d("onStart", "onStart: $dateString")
+        Log.d("onStart——系统时间", "onStart:"+System.currentTimeMillis())
+//        var date: Date = Date(System.currentTimeMillis())
+        var dateLong =0L
+        try {
+            dateLong = dateString.toLong()
+        } catch ( e : NumberFormatException){
+            Log.e("OrderActivity", "onStart: ", e)
+        }
+        var date: Date = Date(dateLong)
+        val time = DateUtils.getTime(date)
+        val dates = DateUtils.getDate(date)
+        val week = DateUtils.getWeekOfDate(date)
+        Log.d("OrderActivity", "onStart: $date $dates $time $week")
+        tv_main_time.text = time
+        tv_main_week.text = "$dates  $week"
+        //动态注册广播
+        val filter = IntentFilter()
+        filter.addAction(Intent.ACTION_TIME_TICK)
+        registerReceiver(receiver, filter)
+    }
+    /**
+     * 时间广播更新
+     */
+    inner class broadCastRecever : BroadcastReceiver() {
+        //广播接收器
+        override fun onReceive(context: Context?, intent: Intent?) {//接收广播后执行的操作
+            var action: String? = intent!!.action
+            if (action.equals(Intent.ACTION_TIME_TICK)) {
+                //获取当前时间
+                var date: Date = Date(System.currentTimeMillis())
+                var time = DateUtils.getTime(date)
+                var dates = DateUtils.getDate(date)
+                var week = DateUtils.getWeekOfDate(date)
+                tv_main_time.text = time
+                tv_main_week.text = "$dates $week"
+            }
+        }
+    }
+    override fun onDestroy() {
+        super.onDestroy()
+        unregisterReceiver(receiver)
+    }
 }

app/src/main/java/com/jld/vod/view/OrderActivity.kt

@@ -1,5 +1,10 @@
 package com.jld.vod.view
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.util.Log
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
@@ -16,10 +21,13 @@ import com.jld.vod.base.BaseActivity
 import com.jld.vod.model.bean.OrderFoodAllBean
 import com.jld.vod.model.bean.OrderFoodItemBean
 import com.jld.vod.utils.AppUtil
+import com.jld.vod.utils.DateUtils
 import com.jld.vod.utils.LogUtils
 import com.jld.vod.utils.SharedPrefUtils
 import com.jld.vod.viewmodel.OrderFoodAllViewModel
+import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.flow.collectLatest
+import java.util.*
 
 class OrderActivity : BaseActivity() {
     private lateinit var orderFoodAllViewModel: OrderFoodAllViewModel
@@ -30,6 +38,7 @@ class OrderActivity : BaseActivity() {
     private lateinit var bt_sure_shopping:Button
     private lateinit var bt_my_order:Button
     private var mOrderFoodAllBean:OrderFoodAllBean?= null
+    private var receiver: broadCastRecever = broadCastRecever()//更新时间广播
 
     override fun getLayoutId(): Int {
         return R.layout.activity_order
@@ -189,4 +198,57 @@ class OrderActivity : BaseActivity() {
             this.onBackPressed()
         }
     }
+    /**
+     * onStart
+     * 广播更新时间
+     */
+    override fun onStart() {
+        super.onStart()
+        //初始化当前时间
+        LogUtils.logD("初始化当前时间")
+        var dateString =  SharedPrefUtils.getString(this,"newDate")
+        Log.d("onStart", "onStart: $dateString")
+        Log.d("onStart——系统时间", "onStart:"+System.currentTimeMillis())
+//        var date: Date = Date(System.currentTimeMillis())
+        var dateLong =0L
+        try {
+            dateLong = dateString.toLong()
+        } catch ( e : NumberFormatException){
+            Log.e("OrderActivity", "onStart: ", e)
+        }
+        var date: Date = Date(dateLong)
+        val time = DateUtils.getTime(date)
+        val dates = DateUtils.getDate(date)
+        val week = DateUtils.getWeekOfDate(date)
+        Log.d("OrderActivity", "onStart: $date $dates $time $week")
+        tv_main_time.text = time
+        tv_main_week.text = "$dates  $week"
+        //动态注册广播
+        val filter = IntentFilter()
+        filter.addAction(Intent.ACTION_TIME_TICK)
+        registerReceiver(receiver, filter)
+    }
+    /**
+     * 时间广播更新
+     */
+    inner class broadCastRecever : BroadcastReceiver() {
+        //广播接收器
+        override fun onReceive(context: Context?, intent: Intent?) {//接收广播后执行的操作
+            var action: String? = intent!!.action
+            if (action.equals(Intent.ACTION_TIME_TICK)) {
+                //获取当前时间
+                var date: Date = Date(System.currentTimeMillis())
+                var time = DateUtils.getTime(date)
+                var dates = DateUtils.getDate(date)
+                var week = DateUtils.getWeekOfDate(date)
+                tv_main_time.text = time
+                tv_main_week.text = "$dates $week"
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        unregisterReceiver(receiver)
+    }
 }

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

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

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

@@ -77,7 +77,7 @@ class OrderFoodItemAdapter :
                 .skipMemoryCache(true).diskCacheStrategy(
                     DiskCacheStrategy.ALL).into(aciv_item_order_pic)
             tv_order_title.text = gameBean?.oName
-            tv_price_title.text = "$ "+gameBean?.totalPrice
+            tv_price_title.text = "$ "+gameBean?.price
             tv_shopping_num.text = gameBean.oNum.toString()