Skip to content

M
magicbox
Commit 5772131d authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改

parent 2a4f013b
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 27 deletions
moduleMain/src/main/java/com/zxhl/main/page/fragment/RecycledFragment.kt
View file @ 5772131d
......@@ -50,7 +50,9 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
id_ll_tihuo_bottom?.visibility = View.VISIBLE
// id_rl_xianshi?.visibility = View.VISIBLE
id_img_xianshi?.setOnClickListener {
id_rl_xianshi?.visibility = View.GONE
}
id_tv_huishou?.setOnClickListener {
if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, mActivity?.getString(R.string.select_reclaim))
......@@ -106,24 +108,18 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
// mPresenter?.recoverGoods(sb.toString())
}
}
// id_tv_fahuo?.setOnClickListener {
// if (mChoosList.isEmpty()) {
// Utils.showToast(mActivity, "请选择要发货的物品")
// } else {
// if (wechatutil!!.isWechatLogin() == true) {
// val intent = Intent(mActivity, OrderDetailActivity::class.java)
// intent.putStringArrayListExtra(
// "stringList",
// mChoosList as java.util.ArrayList<String>?
// )
// startActivity(intent)
// } else {
// wechatutil!!.wechatLogin(mActivity, Constant.Key.FIVE_LOTTERY)
// }
//
// }
// // JumpUtils.OrderDetailJump()
// }
id_tv_fahuo?.setOnClickListener {
if (mChoosList.isEmpty()) {
Utils.showToast(mActivity, mActivity?.getString(R.string.select_deliver))
} else {
val intent = Intent(mActivity, OrderDetailActivity::class.java)
intent.putStringArrayListExtra(
"stringList",
mChoosList as java.util.ArrayList<String>?
)
startActivity(intent)
}
}
id_ll_all_choose?.setOnClickListener {
if (chooseStatus == 0) {
chooseStatus = 1
......@@ -236,14 +232,14 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
id_ll_empty?.visibility = View.GONE
if (reslut?.size == 1) {
if (reslut[0].boxId.equals("-2")) {
//id_rl_xianshi?.visibility = View.GONE
id_rl_xianshi.visibility = View.GONE
id_tv_dixian?.visibility = View.VISIBLE
} else {
// id_rl_xianshi?.visibility = View.VISIBLE
id_rl_xianshi?.visibility = View.VISIBLE
id_tv_dixian?.visibility = View.VISIBLE
}
} else {
// id_rl_xianshi?.visibility = View.VISIBLE
id_rl_xianshi?.visibility = View.VISIBLE
id_tv_dixian?.visibility = View.VISIBLE
}
}
......@@ -272,7 +268,7 @@ class RecycledFragment : BaseFragment(), WareHouseContract.View,
}
override fun setAppInfo(reslut: AppInEntity?) {
// id_tv_depot_text?.text = "${reslut?.depots_text}"
id_tv_depot_text?.text = "${reslut?.depots_text}"
recoveType = reslut?.recover_type.toString()
SettingPreference.setRecoveType(reslut?.recover_type)
}
......
moduleMain/src/main/res/layout/fragment_recycled_layout.xml
View file @ 5772131d
......@@ -119,9 +119,66 @@
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_fahuo"
android:layout_width="80dp"
android:layout_height="32dp"
android:layout_marginLeft="15dp"
android:background="@drawable/button_recycle_center"
android:gravity="center"
android:text="@string/take_delivery"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<RelativeLayout
android:id="@+id/id_rl_xianshi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/id_ll_tihuo_bottom"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_cangku_bottom_bg"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<TextView
android:id="@+id/id_tv_time_limit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:background="@drawable/shape_4c84ff_r3"
android:paddingLeft="3dp"
android:paddingTop="2dp"
android:paddingRight="3dp"
android:paddingBottom="2dp"
android:text="@string/time_limit"
android:textColor="@color/white"
android:textSize="15sp" />
<TextView
android:id="@+id/id_tv_depot_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/id_tv_time_limit"
android:textColor="#2669FF"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_xianshi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="14dp"
android:paddingRight="14dp"
android:src="@drawable/icon_bottom_guanbi" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
moduleMain/src/main/res/layout/fragment_warehouse.xml
View file @ 5772131d
......@@ -17,7 +17,7 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp"
android:text="@string/recycle_center"
android:text="@string/ware_house"
android:textColor="@color/color_333333"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -34,7 +34,8 @@
android:drawableLeft="@drawable/icon_cangku"
android:text=""
android:textColor="@color/color_333333"
android:textSize="13sp" />
android:textSize="13sp"
android:visibility="gone"/>
</RelativeLayout>
<com.zxhl.cms.widget.TabPagerIndicator
......
moduleMain/src/main/res/layout/view_navigation_bottom.xml
View file @ 5772131d
......@@ -51,7 +51,7 @@
android:drawablePadding="2dp"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/recycle_center"
android:text="@string/ware_house"
android:textColor="@color/color_333333"
android:textSize="11sp" />
......
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