diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fb220db..ecce9af 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -69,6 +69,10 @@ dependencies { implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2") + implementation("io.github.scwang90:refresh-layout-kernel:3.0.0-alpha") + implementation("io.github.scwang90:refresh-header-classics:3.0.0-alpha") + implementation("io.github.scwang90:refresh-footer-classics:3.0.0-alpha") + // implementation("io.github.jeremyliao:live-event-bus-x:1.8.0") // implementation("com.hoho:android-usb-serial:1.3.0") // implementation("io.github.jeadyx:jserialport:1.5") diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/App.kt b/app/src/main/java/com/shuwei/intelligent/shelves/App.kt index 1bfbbb6..b9a3cf6 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/App.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/App.kt @@ -8,10 +8,12 @@ import android.app.Application */ class App : Application() { - //暂时固定，后续从接口获取 - var accessToken: String = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiIiLCJ0eXBlIjoiNiIsInVzZXJJZCI6IjE2NzgyMjY1NTI5MzE1NDkxODYifQ.CQmbELpqT6QzvVCgCeirwvSvPp8Mhft_h6b1Af574Co" + //从接口获取 + var accessToken: String = "" + //"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiIiLCJ0eXBlIjoiNiIsInVzZXJJZCI6IjE2NzgyMjY1NTI5MzE1NDkxODYifQ.CQmbELpqT6QzvVCgCeirwvSvPp8Mhft_h6b1Af574Co" - var androidId:String = "" + var deviceId:String = "" + var canteenId:String = "" override fun onCreate() { super.onCreate() @@ -21,7 +23,7 @@ class App : Application() { companion object { private lateinit var app: App - fun get(): App { + fun getInstance(): App { return app } } diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt index 373870f..c3c5772 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt @@ -8,7 +8,6 @@ import android.os.Looper import android.provider.Settings import android.util.Log import android.util.SparseArray -import android.util.SparseIntArray import androidx.activity.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope @@ -29,8 +28,6 @@ import com.shuwei.intelligent.shelves.task.TaskManager import com.shuwei.intelligent.shelves.utils.UIUtils import com.shuwei.intelligent.shelves.utils.f2C import com.shuwei.intelligent.shelves.utils.hexToDec -import kotlinx.coroutines.CoroutineStart -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import java.text.SimpleDateFormat import java.util.Date @@ -91,43 +88,40 @@ class HomeActivity : BaseActivity() { //SerialPortManager.send(DEVICE_INFO_CMD) } - - repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.getShelfListUiState.collect { state -> - when (state) { - is UiState.Loading -> showProgress() - is UiState.Success<*> -> updateUI(state.data) - is UiState.Error -> showError(state.msg) - else -> {} + repeatOnLifecycle(Lifecycle.State.CREATED) { + launch { + viewModel.getAccessTokenUiState.collect { state -> + when (state) { + is UiState.Loading -> {} + is UiState.Success<*> -> getTokenSuccess(state.data) + is UiState.Error -> UIUtils.toast(state.msg) + else -> {} + } } } - } - repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.getAccessTokenUiState.collect { state -> - when (state) { - is UiState.Loading -> {} - is UiState.Success<*> -> getTokenSuccess(state.data) - is UiState.Error -> UIUtils.toast(state.msg) - else -> {} + launch { + viewModel.getShelfListUiState.collect { state -> + when (state) { + is UiState.Loading -> showProgress() + is UiState.Success<*> -> updateUI(state.data) + is UiState.Error -> showError(state.msg) + else -> {} + } } } } } TaskManager.startTask() - App.get().androidId = "53babf69-0d2f-3875-a649-f2e12f80ad4c1" - // Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) - Log.d(TAG, "onCreate: androidId=${App.get().androidId}") + val androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) + Log.d(TAG, "onCreate: androidId=${androidId}") + App.getInstance().deviceId = "53babf69-0d2f-3875-a649-f2e12f80ad4c1" val swDpValue = resources?.configuration?.smallestScreenWidthDp Log.d(TAG, "onCreate: swDpValue=$swDpValue") - viewModel.getShelfList(deviceId = App.get().androidId) - - - - viewModel.getAccessToken(App.get().androidId) + viewModel.getAccessToken(App.getInstance().deviceId) // repeat(100) { // lifecycleScope.launch { @@ -141,7 +135,9 @@ class HomeActivity : BaseActivity() { private fun getTokenSuccess(data: RespData<*>) { Log.d(TAG, "getTokenSuccess: $data") data.result?.let { - //App.get().accessToken = it.toString() + App.getInstance().accessToken = it.toString() + //UIUtils.toast(it.toString()) + viewModel.getShelfList(deviceId = App.getInstance().deviceId) } } @@ -156,6 +152,7 @@ class HomeActivity : BaseActivity() { UIUtils.toast("数据错误") return } + App.getInstance().canteenId = data.result.canteenId val tempList = data.result.containerGoodsList if (tempList.isNullOrEmpty()) { UIUtils.toast("数据为空") diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt index 04b868c..326455e 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt @@ -15,6 +15,7 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.GridLayoutManager import com.chad.library.adapter4.util.setOnDebouncedItemClick +import com.scwang.smart.refresh.layout.constant.RefreshState import com.shuwei.intelligent.shelves.HomeActivity.Companion.DEVICE_INFO_CMD import com.shuwei.intelligent.shelves.adapter.SearchAdapter import com.shuwei.intelligent.shelves.base.BaseActivity @@ -48,6 +49,7 @@ class ShelfActivity : BaseActivity() { const val RECEIVER_DEVICE_INFO = "receiverDeviceInfo" const val SHELF_WEIGHT = "shelfWeight" + const val PAGE_SIZE = 50 } private lateinit var binding: ActivityShelfBinding @@ -57,6 +59,7 @@ class ShelfActivity : BaseActivity() { private var clickIndex: Int = -1 private var realWeight: Int = 0 + private var pageNo: Int = 1 private val viewModel: NetViewModel by viewModels() @@ -87,8 +90,7 @@ class ShelfActivity : BaseActivity() { } // loadSearchData() viewModel.getGoodsList( - canteenId = "1599670511042785282", - goodsName = text.toString().trim() + canteenId = "1599670511042785282", goodsName = text.toString().trim() ) KeyboardUtil.hideKeyboard(context, this) } @@ -119,8 +121,7 @@ class ShelfActivity : BaseActivity() { val shelfNo = shelfModel?.deviceNo ?: 0 val hex = shelfNo.toString(16).padStart(2, '0').uppercase() Log.d(TAG, "onCreate: hex=$hex") - val zeroClearingCmd = - "${HomeActivity.HEADER}0401${hex}${HomeActivity.FOOTER}" + val zeroClearingCmd = "${HomeActivity.HEADER}0401${hex}${HomeActivity.FOOTER}" Log.d(TAG, "onCreate: zeroClearingCmd=$zeroClearingCmd") SerialPortManager.send(zeroClearingCmd) } @@ -144,9 +145,32 @@ class ShelfActivity : BaseActivity() { registerReceiver(receiver, IntentFilter(RECEIVER_DEVICE_INFO)) + binding.refreshLayout.let { + it.setEnableRefresh(true) + it.setEnableLoadMore(false) + it.setOnRefreshListener { + pageNo = 1 + getGoodsList() + } + it.setOnLoadMoreListener { getGoodsList() } + } + getGoodsList() + } + private fun finishRefresh() { + binding.refreshLayout.let { + if (it.state == RefreshState.Refreshing) { + it.finishRefresh(500) + } else if (binding.refreshLayout.state == RefreshState.Loading) { + it.finishLoadMore(500) + } + } + + } + + private fun getGoodsList() { viewModel.getGoodsList( - canteenId = "1599670511042785282" + canteenId = App.getInstance().canteenId, pageNo = pageNo, pageSize = PAGE_SIZE ) } @@ -156,6 +180,7 @@ class ShelfActivity : BaseActivity() { @SuppressLint("NotifyDataSetChanged") private fun updateUI(data: RespData<*>) { + finishRefresh() Loading.dismiss() Log.d(TAG, "updateUI: ${data.toJsonString()}") if (data.result !is GoodsRecord) { @@ -166,12 +191,21 @@ class ShelfActivity : BaseActivity() { UIUtils.toast("数据错误") return } - list.clear() - list.addAll(data.result.records) + if (pageNo == 1) { + list.clear() + } + val records = data.result.records + list.addAll(records) + val enableLoadMore = records.size >= PAGE_SIZE + binding.refreshLayout.setEnableLoadMore(enableLoadMore) + if (enableLoadMore) { + pageNo++ + } searchAdapter.notifyDataSetChanged() } private fun showError(message: String) { + finishRefresh() Loading.dismiss() UIUtils.toast(message) } diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModel.kt b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModel.kt index 3ef0e2f..3e9d54e 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModel.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModel.kt @@ -6,7 +6,7 @@ data class ShelfModel( var id: String? = null, var deviceNo: Int = 0, var shelfName: String? = null, - var goodsId: Int = 0, + var goodsId: String = "", var goodsName: String? = null, var weight: Double? = null, var createTime: String? = null diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiService.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiService.kt index 7e28b86..76ed393 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiService.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiService.kt @@ -4,7 +4,6 @@ import com.shuwei.intelligent.shelves.model.GoodsRecord import com.shuwei.intelligent.shelves.model.ShelfBody import com.shuwei.intelligent.shelves.model.ShelfResult import retrofit2.http.Body -import retrofit2.http.FormUrlEncoded import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query @@ -21,12 +20,11 @@ interface ApiService { suspend fun getGoodsList( @Query("canteenId") canteenId: String = "0", @Query("goodsName") goodsName: String? = null, - @Query("pageNo") pageNo: Int = 1, - @Query("pageSize") pageSize: Int = 50, + @Query("pageNo") pageNo: Int = 1, + @Query("pageSize") pageSize: Int = 50, ): RespData - @FormUrlEncoded @POST(UrlConfig.SAVE_SHELF_GOODS_LIST) suspend fun saveShelfGoodsList(@Body body: ShelfBody): RespData diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/HttpManager.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/HttpManager.kt index 42cbdde..4751825 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/net/HttpManager.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/HttpManager.kt @@ -3,10 +3,8 @@ package com.shuwei.intelligent.shelves.net import android.annotation.SuppressLint import android.util.Log import com.shuwei.intelligent.shelves.App -import okhttp3.Call import okhttp3.Interceptor import okhttp3.OkHttpClient -import okhttp3.Request import okhttp3.Response import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory @@ -36,7 +34,7 @@ class HttpManager private constructor() { addInterceptor(LoggingInterceptor()) addInterceptor { chain -> val request = chain.request().newBuilder() - .header("x-access-token", App.get().accessToken) + .header("x-access-token", App.getInstance().accessToken) .build() chain.proceed(request) } diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt b/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt index 8d3cb9d..ec6afa3 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt @@ -4,9 +4,9 @@ import android.content.Context import android.util.Log import androidx.work.CoroutineWorker import androidx.work.WorkerParameters +import com.shuwei.intelligent.shelves.App import com.shuwei.intelligent.shelves.HomeActivity import com.shuwei.intelligent.shelves.model.ShelfBody -import com.shuwei.intelligent.shelves.net.HttpManager import com.shuwei.intelligent.shelves.net.apiService import com.shuwei.intelligent.shelves.utils.ext.toJsonString import kotlinx.coroutines.Dispatchers @@ -39,8 +39,8 @@ class SyncTask(appContext: Context, workerParams: WorkerParameters) : Log.d(TAG, "performSync: list:${list.toJsonString()}") val submitList = list.sortedBy { it.deviceNo } val body = ShelfBody().also { - it.deviceId = "" - it.canteenId = "" + it.deviceId = App.getInstance().deviceId + it.canteenId = App.getInstance().canteenId it.goodsList = submitList } val resp = apiService.saveShelfGoodsList(body) diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/task/TaskManager.kt b/app/src/main/java/com/shuwei/intelligent/shelves/task/TaskManager.kt index b59ccc1..af658e6 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/task/TaskManager.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/task/TaskManager.kt @@ -15,7 +15,7 @@ object TaskManager { // .setInitialDelay(10, TimeUnit.SECONDS) // .setInputData(inputData) .build() - WorkManager.getInstance(App.get()) + WorkManager.getInstance(App.getInstance()) .enqueueUniqueWork(TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest) // val constraints = Constraints.Builder() @@ -37,7 +37,7 @@ object TaskManager { } fun cancelTask() { - WorkManager.getInstance(App.get()) + WorkManager.getInstance(App.getInstance()) .cancelUniqueWork(TASK_NAME) } diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/utils/UIUtils.kt b/app/src/main/java/com/shuwei/intelligent/shelves/utils/UIUtils.kt index a90b28d..b5a780d 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/utils/UIUtils.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/utils/UIUtils.kt @@ -5,10 +5,10 @@ import com.shuwei.intelligent.shelves.App //D6DADEDB0302000001000C06 object UIUtils { fun toast(strRes: Int) { - Toast.makeText(App.get(), strRes, Toast.LENGTH_SHORT).show() + Toast.makeText(App.getInstance(), strRes, Toast.LENGTH_SHORT).show() } fun toast(str: String) { - Toast.makeText(App.get(), str, Toast.LENGTH_SHORT).show() + Toast.makeText(App.getInstance(), str, Toast.LENGTH_SHORT).show() } } \ No newline at end of file diff --git a/app/src/main/res/layout-sw360dp/activity_shelf.xml b/app/src/main/res/layout-sw360dp/activity_shelf.xml index 8124a52..fb033d4 100644 --- a/app/src/main/res/layout-sw360dp/activity_shelf.xml +++ b/app/src/main/res/layout-sw360dp/activity_shelf.xml @@ -156,23 +156,37 @@ android:textSize="15sp" tools:ignore="Autofill,HardcodedText,TextFields" /> - - + android:layout_weight="1"> + + + + + + + + - - + android:layout_weight="1"> + + + + + + + +