Commit 66e22d78 authored by 赵鹏翔's avatar 赵鹏翔

基础数据类转化成kotlin

parent 378a78d0
......@@ -45,9 +45,9 @@ class MiyaApiRequest {
throw RuntimeException("DataSourceIpUtils SelfCashierTerminalConfig is null")
}
val path = "${MiyaApi.UPLOAD_LOG_FILE}?equType=$equType"
return if (TextUtils.isEmpty(selfCashierTerminalConfig.scoRuntimeConfig.erpIp))
return if (TextUtils.isEmpty(selfCashierTerminalConfig.scoRuntimeConfig!!.erpIp))
(ApiConfig.baseUrl.plus(path))
else selfCashierTerminalConfig.scoRuntimeConfig.erpIp + path
else selfCashierTerminalConfig.scoRuntimeConfig!!.erpIp + path
}
}
}
\ No newline at end of file
......@@ -35,7 +35,6 @@ import com.miya.fastcashier.util.FileUtils
import com.miya.fastcashier.util.manage.log.LFileFilter
import com.miya.fastcashier.widget.EmptyRecyclerView
import es.dmoral.toasty.Toasty
import okhttp3.MediaType
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody
import okhttp3.RequestBody
......@@ -281,8 +280,8 @@ class LFilePickerActivity : BaseActivity() {
val requestBody = RequestBody.create("".toMediaTypeOrNull(), file)
val part: MultipartBody.Part = MultipartBody.Part.createFormData("logFile", file.name, requestBody)
var ip = getDataSourceIp(selfCashierTerminalConfig!!, equType)
if (!TextUtils.isEmpty(selfCashierTerminalConfig!!.scoRuntimeConfig.platformUrl)) {
ip = (selfCashierTerminalConfig!!.scoRuntimeConfig.platformUrl
if (!TextUtils.isEmpty(selfCashierTerminalConfig!!.scoRuntimeConfig?.platformUrl)) {
ip = (selfCashierTerminalConfig!!.scoRuntimeConfig?.platformUrl
+ UPLOAD_LOG_FILE)
}
LogUtils.e("ip = $ip")
......
......@@ -621,8 +621,10 @@ class SelfCashierAccountInfo : BaseBean() {
functionConfig.isCloseSelfCashierFeatureEnable =
shopInfo!!.extData!!.isCloseSelfCashierFeatureEnable
functionConfig.isEnablePayZero = shopInfo!!.extData!!.isEnablePayZero
functionConfig.setOpenCredit(shopInfo!!.extData!!.isOpenCredit)
functionConfig.setSilentCredit(shopInfo!!.extData!!.isSilentCredit)
// functionConfig.setOpenCredit(shopInfo!!.extData!!.isOpenCredit)
functionConfig.isOpenCredit = shopInfo!!.extData!!.isOpenCredit
// functionConfig.setSilentCredit(shopInfo!!.extData!!.isSilentCredit)
functionConfig.isSilentCredit = shopInfo!!.extData!!.isSilentCredit
functionConfig.payWayControl = shopInfo!!.extData!!.payWayControl
functionConfig.isChangeGoodsInfoAfterInputMember =
shopInfo!!.extData!!.isChangeGoodsInfoAfterInputMember
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment