Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MiYaFastCashier
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangjiantao
MiYaFastCashier
Commits
66e22d78
Commit
66e22d78
authored
Feb 27, 2023
by
赵鹏翔
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基础数据类转化成kotlin
parent
378a78d0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
698 additions
and
1695 deletions
+698
-1695
MiyaApiRequest.kt
app/src/main/java/com/miya/fastcashier/net/MiyaApiRequest.kt
+2
-2
LFilePickerActivity.kt
.../main/java/com/miya/fastcashier/ui/LFilePickerActivity.kt
+2
-3
SelfCashierAccountInfo.kt
...ier/lib_common/function/account/SelfCashierAccountInfo.kt
+4
-2
SelfCashierTerminalConfig.java
...ib_common/function/account/SelfCashierTerminalConfig.java
+0
-1688
SelfCashierTerminalConfig.kt
.../lib_common/function/account/SelfCashierTerminalConfig.kt
+690
-0
No files found.
app/src/main/java/com/miya/fastcashier/net/MiyaApiRequest.kt
View file @
66e22d78
...
...
@@ -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
app/src/main/java/com/miya/fastcashier/ui/LFilePickerActivity.kt
View file @
66e22d78
...
...
@@ -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"
)
...
...
lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierAccountInfo.kt
View file @
66e22d78
...
...
@@ -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
...
...
lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierTerminalConfig.java
deleted
100644 → 0
View file @
378a78d0
This diff is collapsed.
Click to expand it.
lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierTerminalConfig.kt
0 → 100644
View file @
66e22d78
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment