diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index d8a71de..7d90746 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -34,10 +34,7 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration -import com.pengxh.kt.lite.extensions.dp2px -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.realFilePath -import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* @@ -47,6 +44,7 @@ class EntrustAddActivity : ApplicationBaseActivity() { + private val kTag = "EntrustAddActivity" private val context: Context = this@EntrustAddActivity private val gson by lazy { Gson() } private val typeToken by lazy { @@ -111,6 +109,8 @@ VerticalMarginItemDecoration(0, 5f.dp2px(context)) ) sampleRecyclerView.adapter = sampleAdapter + + createEntrustDateView.text = System.currentTimeMillis().timestampToDate() } private val selectCustomerLauncher = diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index d8a71de..7d90746 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -34,10 +34,7 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration -import com.pengxh.kt.lite.extensions.dp2px -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.realFilePath -import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* @@ -47,6 +44,7 @@ class EntrustAddActivity : ApplicationBaseActivity() { + private val kTag = "EntrustAddActivity" private val context: Context = this@EntrustAddActivity private val gson by lazy { Gson() } private val typeToken by lazy { @@ -111,6 +109,8 @@ VerticalMarginItemDecoration(0, 5f.dp2px(context)) ) sampleRecyclerView.adapter = sampleAdapter + + createEntrustDateView.text = System.currentTimeMillis().timestampToDate() } private val selectCustomerLauncher = diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt index 9ab621d..3bc5ddb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt @@ -213,6 +213,10 @@ } viewHolder.setOnClickListener(R.id.remindButton) { + if (usePerson == "无") { + "当前设备无管理员,无法催办".show(context) + return@setOnClickListener + } //标记被点击的item位置 clickedPosition = position AlertControlDialog.Builder() diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index d8a71de..7d90746 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -34,10 +34,7 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.divider.VerticalMarginItemDecoration -import com.pengxh.kt.lite.extensions.dp2px -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.realFilePath -import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* @@ -47,6 +44,7 @@ class EntrustAddActivity : ApplicationBaseActivity() { + private val kTag = "EntrustAddActivity" private val context: Context = this@EntrustAddActivity private val gson by lazy { Gson() } private val typeToken by lazy { @@ -111,6 +109,8 @@ VerticalMarginItemDecoration(0, 5f.dp2px(context)) ) sampleRecyclerView.adapter = sampleAdapter + + createEntrustDateView.text = System.currentTimeMillis().timestampToDate() } private val selectCustomerLauncher = diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt index 9ab621d..3bc5ddb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt @@ -213,6 +213,10 @@ } viewHolder.setOnClickListener(R.id.remindButton) { + if (usePerson == "无") { + "当前设备无管理员,无法催办".show(context) + return@setOnClickListener + } //标记被点击的item位置 clickedPosition = position AlertControlDialog.Builder() diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml index 2dea624..7b6248b 100644 --- a/app/src/main/res/layout/activity_entrust_add.xml +++ b/app/src/main/res/layout/activity_entrust_add.xml @@ -65,17 +65,9 @@ style="@style/textViewStyle" android:text="委托单创建时间" /> - + style="@style/inputEditTextStyle" /> @@ -213,8 +205,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="@dimen/dp_5" - app:spanCount="2" - app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="2" />