diff --git a/app/src/main/java/com/sw/inbound/network/api/ApiService.kt b/app/src/main/java/com/sw/inbound/network/api/ApiService.kt index 61929e1..3db9c4d 100644 --- a/app/src/main/java/com/sw/inbound/network/api/ApiService.kt +++ b/app/src/main/java/com/sw/inbound/network/api/ApiService.kt @@ -39,31 +39,30 @@ interface ApiService { /** * device获取token */ - @GET("sys/getEquipmentToken") - suspend fun getDeviceToken( - @Query("qrcodeId") qrcodeId: String, - @Query("appVersion") appVersion: String = GlobalData.appVersion - ): ApiResponse +// @GET("sys/getEquipmentToken") +// suspend fun getDeviceToken( +// @Query("qrcodeId") qrcodeId: String, +// @Query("appVersion") appVersion: String = GlobalData.appVersion +// ): ApiResponse /** *获取配置信息 */ - @GET("equipment/stEquipment/queryByEquipmentCode") - suspend fun getDeviceInfo( - @Query("equipmentCode") equipmentCode: String, - @Query("appVersion") appVersion: String = GlobalData.appVersion, - @Header("X-Access-Token") token: String - ): ApiResponse +// @GET("equipment/stEquipment/queryByEquipmentCode") +// suspend fun getDeviceInfo( +// @Query("equipmentCode") equipmentCode: String, +// @Query("appVersion") appVersion: String = GlobalData.appVersion, +// @Header("X-Access-Token") token: String +// ): ApiResponse /** * 登录 */ - @POST//("sys/loginPad") - suspend fun login( - @Url url: String = "${GlobalData.appBaseUrl}/sys/loginPad", - @Body body: LoginParam, - - ): ApiResponse +// @POST//("sys/loginPad") +// suspend fun login( +// @Url url: String = "${GlobalData.appBaseUrl}/sys/loginPad", +// @Body body: LoginParam, +// ): ApiResponse /** * 采购单入库-列表 @@ -94,11 +93,11 @@ interface ApiService { /** * 部分收货 */ - @POST//("pad/partialReceiptGoods") - suspend fun partialReceipt( - @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/partialReceiptGoods", - @Body uploadInfo: UploadInfo - ): ApiResponse +// @POST//("pad/partialReceiptGoods") +// suspend fun partialReceipt( +// @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/partialReceiptGoods", +// @Body uploadInfo: UploadInfo +// ): ApiResponse /** * 确认收货 @@ -195,11 +194,11 @@ interface ApiService { /** * 添加物品采购单位 */ - @POST//("pad/goodsAddUnit") - suspend fun goodsAddUnit( - @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/goodsAddUnit", - @Body purchaseUnitParam: GoodsPurchaseUnitParam, - ): ApiResponse +// @POST//("pad/goodsAddUnit") +// suspend fun goodsAddUnit( +// @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/goodsAddUnit", +// @Body purchaseUnitParam: GoodsPurchaseUnitParam, +// ): ApiResponse /** * 自采入库 diff --git a/app/src/main/java/com/sw/inbound/repository/RemoteRepository.kt b/app/src/main/java/com/sw/inbound/repository/RemoteRepository.kt index 71cd1d6..08d7935 100644 --- a/app/src/main/java/com/sw/inbound/repository/RemoteRepository.kt +++ b/app/src/main/java/com/sw/inbound/repository/RemoteRepository.kt @@ -38,29 +38,29 @@ class RemoteRepository @Inject constructor( /** * 生成token */ - suspend fun getDeviceToken(qrcodeId: String): ApiResponse { - return safeApiCall { - apiService.getDeviceToken( - qrcodeId - ) - } - } +// suspend fun getDeviceToken(qrcodeId: String): ApiResponse { +// return safeApiCall { +// apiService.getDeviceToken( +// qrcodeId +// ) +// } +// } /** * 获取设备信息 */ - suspend fun getDeviceInfo(equipmentCode: String, token: String): ApiResponse { - return safeApiCall { - apiService.getDeviceInfo( - equipmentCode = equipmentCode, - token = token - ) - } - } +// suspend fun getDeviceInfo(equipmentCode: String, token: String): ApiResponse { +// return safeApiCall { +// apiService.getDeviceInfo( +// equipmentCode = equipmentCode, +// token = token +// ) +// } +// } - suspend fun login(loginParam: LoginParam): ApiResponse { - return safeApiCall { apiService.login(body = loginParam) } - } +// suspend fun login(loginParam: LoginParam): ApiResponse { +// return safeApiCall { apiService.login(body = loginParam) } +// } suspend fun getReceiveList(pageNum: Int, pageSize: Int): ApiResponse?> { return safeApiCall { @@ -153,11 +153,11 @@ class RemoteRepository @Inject constructor( /** * 部分收货 */ - suspend fun partialReceipt(uploadInfo: UploadInfo): ApiResponse { - return safeApiCall { - apiService.partialReceipt(uploadInfo = uploadInfo) - } - } +// suspend fun partialReceipt(uploadInfo: UploadInfo): ApiResponse { +// return safeApiCall { +// apiService.partialReceipt(uploadInfo = uploadInfo) +// } +// } /** * 全部收货 @@ -198,11 +198,11 @@ class RemoteRepository @Inject constructor( } } - suspend fun selfPurchaseGoodsAddUnit(addParam: GoodsPurchaseUnitParam): ApiResponse { - return safeApiCall { - apiService.goodsAddUnit(purchaseUnitParam = addParam) - } - } +// suspend fun selfPurchaseGoodsAddUnit(addParam: GoodsPurchaseUnitParam): ApiResponse { +// return safeApiCall { +// apiService.goodsAddUnit(purchaseUnitParam = addParam) +// } +// } /** * 自采购-入库 diff --git a/app/src/main/java/com/sw/inbound/viewmodel/DeviceViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/DeviceViewModel.kt index e63e362..b298ab2 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/DeviceViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/DeviceViewModel.kt @@ -27,29 +27,29 @@ class DeviceViewModel @Inject constructor( /** * 获取token */ - fun getDeviceToken(deviceId: String = GlobalData.deviceId) { - launchWithLoading { - val response = repository.getDeviceToken(deviceId) - if (parseResponse(response)) { - val response1 = repository.getDeviceInfo(deviceId, response.result!!) - - if (parseResponse(response1)) { - val equipmentInfo = response1.result - if (equipmentInfo == null) return@launchWithLoading - try { - parseEquipmentInfo(equipmentInfo) - SPUtil.getInstance() - .put(GlobalKey.KEY_EQUIPMENT_INFO, GsonUtils.toJson(equipmentInfo)) - _deviceInfoResult.value = true - } catch (e: Exception) { - Timber.e(e) - } - } else { - //ToastUtils.showToast("获取设备信息失败") - } - } - } - } +// fun getDeviceToken(deviceId: String = GlobalData.deviceId) { +// launchWithLoading { +// val response = repository.getDeviceToken(deviceId) +// if (parseResponse(response)) { +// val response1 = repository.getDeviceInfo(deviceId, response.result!!) +// +// if (parseResponse(response1)) { +// val equipmentInfo = response1.result +// if (equipmentInfo == null) return@launchWithLoading +// try { +// parseEquipmentInfo(equipmentInfo) +// SPUtil.getInstance() +// .put(GlobalKey.KEY_EQUIPMENT_INFO, GsonUtils.toJson(equipmentInfo)) +// _deviceInfoResult.value = true +// } catch (e: Exception) { +// Timber.e(e) +// } +// } else { +// //ToastUtils.showToast("获取设备信息失败") +// } +// } +// } +// } /** * 检查缓存数据 diff --git a/app/src/main/java/com/sw/inbound/viewmodel/UserViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/UserViewModel.kt index 5b617c1..a00676b 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/UserViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/UserViewModel.kt @@ -39,16 +39,16 @@ class UserViewModel @Inject constructor( //} } - fun login(userName: String, password: String) = launchWithLoading { - val loginParam = LoginParam(userName = userName, password = password) - val response = repo.login(loginParam) - if (parseResponse(response)) { - SPUtil.getInstance().put(GlobalKey.KEY_USER_NAME, userName) - _user.value = response.result - saveToken(response.result) - response.result?.token - } - } +// fun login(userName: String, password: String) = launchWithLoading { +// val loginParam = LoginParam(userName = userName, password = password) +// val response = repo.login(loginParam) +// if (parseResponse(response)) { +// SPUtil.getInstance().put(GlobalKey.KEY_USER_NAME, userName) +// _user.value = response.result +// saveToken(response.result) +// response.result?.token +// } +// } fun getUserInfo() { val userInfo = SPUtil.getInstance().get(GlobalKey.KEY_USER_INFO, "")