Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
M
magicbox
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
magicbox
Commits
499bc8e1
Commit
499bc8e1
authored
Mar 15, 2022
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
2c2232f5
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
10 deletions
+17
-10
strings.xml
cms/src/main/res/values/strings.xml
+7
-0
RecycledFragment.kt
...main/java/com/zxhl/main/page/fragment/RecycledFragment.kt
+2
-2
TobePickUpFragment.kt
...in/java/com/zxhl/main/page/fragment/TobePickUpFragment.kt
+3
-3
RecoverPopupWindow.kt
...c/main/java/com/zxhl/main/page/view/RecoverPopupWindow.kt
+1
-1
RecycleDialog.kt
...in/src/main/java/com/zxhl/main/page/view/RecycleDialog.kt
+1
-1
fragment_layout_magic_box_order.xml
...n/src/main/res/layout/fragment_layout_magic_box_order.xml
+1
-1
fragment_shop_order.xml
moduleMain/src/main/res/layout/fragment_shop_order.xml
+1
-1
layout_empty.xml
moduleMain/src/main/res/layout/layout_empty.xml
+1
-1
No files found.
cms/src/main/res/values/strings.xml
View file @
499bc8e1
...
...
@@ -42,6 +42,13 @@
<string
name=
"make_sure_recycle"
>
Confirm
</string>
<string
name=
"recycle_desc"
>
Reclaim the good you selected for
</string>
<string
name=
"recycle_desc2"
>
You can exchange high-value goods
</string>
<string
name=
"empty_trip"
>
Empty,go open some boxes
</string>
//请选择要发货的商品
<string
name=
"select_deliver"
>
Please select the goods you want to deliver
</string>
//请选择要回收的商品
<string
name=
"select_reclaim"
>
Please select the goods you want to reclaim
</string>
<string
name=
"recycle_suc"
>
Reclaim successful
</string>
<string
name=
"deling"
>
Deleting
</string>
<!--订单-->
<string
name=
"shop_order"
>
Mall order
</string>
<string
name=
"my_order"
>
My order
</string>
...
...
moduleMain/src/main/java/com/zxhl/main/page/fragment/RecycledFragment.kt
View file @
499bc8e1
...
...
@@ -54,7 +54,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
id_tv_huishou
?.
setOnClickListener
{
if
(
mChoosList
.
isEmpty
())
{
Utils
.
showToast
(
mActivity
,
"请选择要回收的物品"
)
Utils
.
showToast
(
mActivity
,
mActivity
?.
getString
(
R
.
string
.
select_reclaim
)
)
}
else
{
val
sb
=
StringBuilder
()
...
...
@@ -258,7 +258,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
override
fun
recoverSuccess
()
{
//回收成功刷新数据
Utils
.
showToast
(
mActivity
,
"回收成功"
)
Utils
.
showToast
(
mActivity
,
mActivity
?.
getString
(
R
.
string
.
recycle_suc
)
)
chooseStatus
=
0
id_img_xuanze
?.
setImageResource
(
R
.
drawable
.
icon_xuanze
)
mChoosList
?.
clear
()
...
...
moduleMain/src/main/java/com/zxhl/main/page/fragment/TobePickUpFragment.kt
View file @
499bc8e1
...
...
@@ -80,7 +80,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
// }
id_tv_huishou
?.
setOnClickListener
{
if
(
mChoosList
.
isEmpty
())
{
Utils
.
showToast
(
mActivity
,
"请选择要回收的物品"
)
Utils
.
showToast
(
mActivity
,
mActivity
?.
getString
(
R
.
string
.
select_reclaim
)
)
}
else
{
val
sb
=
StringBuilder
()
...
...
@@ -142,7 +142,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
}
id_tv_fahuo
?.
setOnClickListener
{
if
(
mChoosList
.
isEmpty
())
{
Utils
.
showToast
(
mActivity
,
"请选择要发货的物品"
)
Utils
.
showToast
(
mActivity
,
mActivity
?.
getString
(
R
.
string
.
select_deliver
)
)
}
else
{
val
intent
=
Intent
(
mActivity
,
OrderDetailActivity
::
class
.
java
)
intent
.
putStringArrayListExtra
(
...
...
@@ -294,7 +294,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
override
fun
recoverSuccess
()
{
//回收成功刷新数据
Utils
.
showToast
(
mActivity
,
"回收成功"
)
Utils
.
showToast
(
mActivity
,
mActivity
?.
getString
(
R
.
string
.
recycle_suc
)
)
chooseStatus
=
0
id_img_xuanze
?.
setImageResource
(
R
.
drawable
.
icon_xuanze
)
mChoosList
?.
clear
()
...
...
moduleMain/src/main/java/com/zxhl/main/page/view/RecoverPopupWindow.kt
View file @
499bc8e1
...
...
@@ -182,7 +182,7 @@ class RecoverPopupWindow : PopupWindow(), RecoverPopupContract.View {
override
fun
recoverSuccess
()
{
dismiss
()
if
(
type
==
Constant
.
Key
.
ONE_LOTTERY
||
type
==
Constant
.
Key
.
FIVE_LOTTERY
||
type
==
Constant
.
Key
.
RE_PUMPING_ONE_LOTTERY
||
type
==
Constant
.
Key
.
RE_PUMPING_FIVE_LOTTERY
)
{
Utils
.
showToast
(
mContext
,
"回收成功"
)
Utils
.
showToast
(
mContext
,
mContext
?.
getString
(
R
.
string
.
recycle_suc
)
)
mContext
?.
finish
()
}
else
{
listener
?.
onClosePopupWindow
()
...
...
moduleMain/src/main/java/com/zxhl/main/page/view/RecycleDialog.kt
View file @
499bc8e1
...
...
@@ -88,7 +88,7 @@ object RecycleDialog : RecoverPopupContract.View {
override
fun
recoverSuccess
()
{
mDialog
?.
dismiss
()
if
(
type
==
Constant
.
Key
.
ONE_LOTTERY
||
type
==
Constant
.
Key
.
FIVE_LOTTERY
||
type
==
Constant
.
Key
.
RE_PUMPING_ONE_LOTTERY
||
type
==
Constant
.
Key
.
RE_PUMPING_FIVE_LOTTERY
)
{
Utils
.
showToast
(
context
,
"回收成功"
)
Utils
.
showToast
(
context
,
context
?.
getString
(
R
.
string
.
recycle_suc
)
)
context
?.
finish
()
}
else
{
listener
?.
onClosePopupWindow
()
...
...
moduleMain/src/main/res/layout/fragment_layout_magic_box_order.xml
View file @
499bc8e1
...
...
@@ -61,7 +61,7 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
订单空空如也
"
android:text=
"
@string/empty_trip
"
android:textColor=
"@color/color_999999"
android:textSize=
"13sp"
/>
</LinearLayout>
...
...
moduleMain/src/main/res/layout/fragment_shop_order.xml
View file @
499bc8e1
...
...
@@ -37,7 +37,7 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
订单空空如也,快去商城下单吧
"
android:text=
"
empty_trip
"
android:textColor=
"@color/color_999999"
android:textSize=
"13sp"
/>
</LinearLayout>
...
...
moduleMain/src/main/res/layout/layout_empty.xml
View file @
499bc8e1
...
...
@@ -18,7 +18,7 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
空空如也,快去打卡盲盒吧
"
android:text=
"
@string/empty_trip
"
android:textColor=
"@color/color_999999"
android:textSize=
"13sp"
/>
</LinearLayout>
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