Commit 499bc8e1 authored by maxiaoliang's avatar maxiaoliang

1

parent 2c2232f5
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
<string name="make_sure_recycle">Confirm</string> <string name="make_sure_recycle">Confirm</string>
<string name="recycle_desc">Reclaim the good you selected for</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="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="shop_order">Mall order</string>
<string name="my_order">My order</string> <string name="my_order">My order</string>
......
...@@ -54,7 +54,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View, ...@@ -54,7 +54,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
id_tv_huishou?.setOnClickListener { id_tv_huishou?.setOnClickListener {
if (mChoosList.isEmpty()) { if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, "请选择要回收的物品") Utils.showToast(mActivity, mActivity?.getString(R.string.select_reclaim))
} else { } else {
val sb = StringBuilder() val sb = StringBuilder()
...@@ -258,7 +258,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View, ...@@ -258,7 +258,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
override fun recoverSuccess() { override fun recoverSuccess() {
//回收成功刷新数据 //回收成功刷新数据
Utils.showToast(mActivity, "回收成功") Utils.showToast(mActivity, mActivity?.getString(R.string.recycle_suc))
chooseStatus = 0 chooseStatus = 0
id_img_xuanze?.setImageResource(R.drawable.icon_xuanze) id_img_xuanze?.setImageResource(R.drawable.icon_xuanze)
mChoosList?.clear() mChoosList?.clear()
......
...@@ -80,7 +80,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View, ...@@ -80,7 +80,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
// } // }
id_tv_huishou?.setOnClickListener { id_tv_huishou?.setOnClickListener {
if (mChoosList.isEmpty()) { if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, "请选择要回收的物品") Utils.showToast(mActivity, mActivity?.getString(R.string.select_reclaim))
} else { } else {
val sb = StringBuilder() val sb = StringBuilder()
...@@ -142,7 +142,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View, ...@@ -142,7 +142,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
} }
id_tv_fahuo?.setOnClickListener { id_tv_fahuo?.setOnClickListener {
if (mChoosList.isEmpty()) { if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, "请选择要发货的物品") Utils.showToast(mActivity, mActivity?.getString(R.string.select_deliver))
} else { } else {
val intent = Intent(mActivity, OrderDetailActivity::class.java) val intent = Intent(mActivity, OrderDetailActivity::class.java)
intent.putStringArrayListExtra( intent.putStringArrayListExtra(
...@@ -294,7 +294,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View, ...@@ -294,7 +294,7 @@ class TobePickUpFragment : BaseFragment(), WareHouseContract.View,
override fun recoverSuccess() { override fun recoverSuccess() {
//回收成功刷新数据 //回收成功刷新数据
Utils.showToast(mActivity, "回收成功") Utils.showToast(mActivity, mActivity?.getString(R.string.recycle_suc))
chooseStatus = 0 chooseStatus = 0
id_img_xuanze?.setImageResource(R.drawable.icon_xuanze) id_img_xuanze?.setImageResource(R.drawable.icon_xuanze)
mChoosList?.clear() mChoosList?.clear()
......
...@@ -182,7 +182,7 @@ class RecoverPopupWindow : PopupWindow(), RecoverPopupContract.View { ...@@ -182,7 +182,7 @@ class RecoverPopupWindow : PopupWindow(), RecoverPopupContract.View {
override fun recoverSuccess() { override fun recoverSuccess() {
dismiss() 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) { 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() mContext?.finish()
} else { } else {
listener?.onClosePopupWindow() listener?.onClosePopupWindow()
......
...@@ -88,7 +88,7 @@ object RecycleDialog : RecoverPopupContract.View { ...@@ -88,7 +88,7 @@ object RecycleDialog : RecoverPopupContract.View {
override fun recoverSuccess() { override fun recoverSuccess() {
mDialog?.dismiss() 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) { 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() context?.finish()
} else { } else {
listener?.onClosePopupWindow() listener?.onClosePopupWindow()
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="订单空空如也" android:text="@string/empty_trip"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="订单空空如也,快去商城下单吧" android:text="empty_trip"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="空空如也,快去打卡盲盒吧" android:text="@string/empty_trip"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
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