From 9b5bbbb1de7302028150f0e575371df04632fe04 Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Mon, 30 Sep 2024 17:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=B5=8B=E9=87=8F=E3=80=81=E6=94=BE?= =?UTF-8?q?=E6=A0=B7=E9=A1=B5=E9=9D=A2UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/adapter/LoftingListAdapter.java | 40 ---- .../adapter/PointMeasureListAdapter.java | 45 ----- .../project/survey/network/RetrofitClient.kt | 22 +-- .../com/project/survey/ui/MainActivity.kt | 20 +- .../project/survey/ui/home/HomeFragment.kt | 10 +- .../survey/ui/home/InstrumentFragment.kt | 6 +- .../com/project/survey/ui/home/MeFragment.kt | 8 +- .../survey/ui/lofting/LoftingListActivity.kt | 46 ++--- .../ui/lofting/adapter/LoftingListAdapter.kt | 28 +++ .../pointmeasure/PointMeasureListActivity.kt | 30 ++- .../pointmeasure/PointMeasureListFragment.kt | 66 ++++--- .../adapter/PointMeasureListAdapter.kt | 29 +++ .../survey/ui/project/ProjectListActivity.kt | 7 +- .../color/text_color_selector_blue_black.xml | 2 +- .../res/layout/activity_base_survey_new.xml | 1 + .../main/res/layout/activity_lofting_list.xml | 30 ++- .../layout/activity_point_measure_list.xml | 25 ++- .../layout/fragment_point_measure_list.xml | 7 +- .../res/layout/item_approval_approved.xml | 3 +- app/src/main/res/layout/item_lofting_list.xml | 140 +++++++++---- .../res/layout/item_point_measure_list.xml | 187 +++++++++++------- 21 files changed, 450 insertions(+), 302 deletions(-) delete mode 100644 app/src/main/java/com/project/survey/adapter/LoftingListAdapter.java delete mode 100644 app/src/main/java/com/project/survey/adapter/PointMeasureListAdapter.java create mode 100644 app/src/main/java/com/project/survey/ui/lofting/adapter/LoftingListAdapter.kt create mode 100644 app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt diff --git a/app/src/main/java/com/project/survey/adapter/LoftingListAdapter.java b/app/src/main/java/com/project/survey/adapter/LoftingListAdapter.java deleted file mode 100644 index 5e1a270..0000000 --- a/app/src/main/java/com/project/survey/adapter/LoftingListAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.project.survey.adapter; - -import android.content.Context; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; - -import com.project.survey.adapter.base.BaseAdapter; -import com.project.survey.adapter.viewholder.LoftingListViewHolder; -import com.project.survey.databinding.ItemLoftingListBinding; -import com.project.survey.model.LoftingListBean; -import com.project.survey.ui.lofting.pointlofting.PointStakingActivity; - -/** - * 放样列表 - */ -public class LoftingListAdapter extends BaseAdapter { - - private final Context context; - - public LoftingListAdapter(Context context) { - super(context); - this.context = context; - } - - @NonNull - @Override - public LoftingListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new LoftingListViewHolder(ItemLoftingListBinding.inflate(getInflater(), parent, false)); - } - - @Override - protected void onBindViewHolderDo(LoftingListViewHolder holder, int position) { - - holder.mBinding.tvProjectMeasured.setOnClickListener(v -> { - PointStakingActivity.start(context); - }); - - } -} diff --git a/app/src/main/java/com/project/survey/adapter/PointMeasureListAdapter.java b/app/src/main/java/com/project/survey/adapter/PointMeasureListAdapter.java deleted file mode 100644 index 000b4d3..0000000 --- a/app/src/main/java/com/project/survey/adapter/PointMeasureListAdapter.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.project.survey.adapter; - -import android.content.Context; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; - -import com.project.survey.adapter.base.BaseAdapter; -import com.project.survey.adapter.viewholder.PointMeasureListViewHolder; -import com.project.survey.databinding.ItemPointMeasureListBinding; -import com.project.survey.model.PointMeasureListBean; -import com.project.survey.ui.pointmeasure.measure.PointSurveyNewActivity; - -/** - * 点测量列表 - */ -public class PointMeasureListAdapter extends BaseAdapter { - - private final Context context; - private final String type; - - public PointMeasureListAdapter(Context context, String type) { - super(context); - this.context = context; - this.type = type; - } - - @NonNull - @Override - public PointMeasureListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new PointMeasureListViewHolder(ItemPointMeasureListBinding.inflate(getInflater(), parent, false)); - } - - @Override - protected void onBindViewHolderDo(PointMeasureListViewHolder holder, int position) { - - //进入测量 - holder.mBinding.tvProjectMeasured.setOnClickListener(v -> { - PointSurveyNewActivity.start(context); - }); - - - } - -} diff --git a/app/src/main/java/com/project/survey/network/RetrofitClient.kt b/app/src/main/java/com/project/survey/network/RetrofitClient.kt index 6e451a4..509dc6f 100644 --- a/app/src/main/java/com/project/survey/network/RetrofitClient.kt +++ b/app/src/main/java/com/project/survey/network/RetrofitClient.kt @@ -69,21 +69,21 @@ object RetrofitClient { val newRequest = builder.url(newHttpUrl).build() return@addInterceptor chain.proceed(newRequest) } - .addInterceptor { chain -> - val token = SPUtils.getString(SPConstants.TOKEN) ?: "" - val builder = chain.request().newBuilder().apply { - removeHeader("Authorization") - if (token.isNotBlank()) { - addHeader("Authorization", token) - } - } - return@addInterceptor chain.proceed(builder.build()) - } +// .addInterceptor { chain -> +// val token = SPUtils.getString(SPConstants.TOKEN) ?: "" +// val builder = chain.request().newBuilder().apply { +// removeHeader("Authorization") +// if (token.isNotBlank()) { +// addHeader("Authorization", token) +// } +// } +// return@addInterceptor chain.proceed(builder.build()) +// } .addInterceptor(HttpLoggingInterceptor().apply { level = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY else - HttpLoggingInterceptor.Level.BODY + HttpLoggingInterceptor.Level.NONE }) .sslSocketFactory( HttpsTrustUtil.createSSLSocketFactory(), diff --git a/app/src/main/java/com/project/survey/ui/MainActivity.kt b/app/src/main/java/com/project/survey/ui/MainActivity.kt index 91295e1..ab4ad90 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivity.kt +++ b/app/src/main/java/com/project/survey/ui/MainActivity.kt @@ -1,20 +1,18 @@ package com.project.survey.ui +import android.view.KeyEvent import androidx.activity.viewModels import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import androidx.viewpager.widget.ViewPager -import blankj.utilcode.util.AppUtils import blankj.utilcode.util.LogUtils -import com.bingce.AppChannel import com.bingce.ui.TabEntity -import com.bingce.utils.AppUtil -import com.bingce.utils.RegisterUtil import com.bingce.utils.SdkUtils import com.flyco.tablayout.listener.OnTabSelectListener import com.project.survey.BuildConfig import com.project.survey.R import com.project.survey.databinding.ActivityMainBinding +import com.project.survey.extend.toast import com.project.survey.logic.viewmodel.MainViewModel import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.ui.home.HomeFragment @@ -119,5 +117,19 @@ class MainActivity : BaseBindingActivity() { }) } + private var exitTime: Long = 0 + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { + if (keyCode == KeyEvent.KEYCODE_BACK){ + if ((System.currentTimeMillis() - exitTime) > 2000) { + toast("再按一次退出程序") + exitTime = System.currentTimeMillis() + } else { + finish() + } + return true + } + return super.onKeyDown(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt index fa609d2..d185773 100644 --- a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt @@ -42,19 +42,19 @@ class HomeFragment : BaseBindingFragment() { } private fun updateViewByData() { - val currentProject = - SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) - mBinding.tvProject.text = currentProject?.XMXX_NAME + SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java)?.let { + mBinding.tvProject.text = it.XMXX_NAME + } } override fun initListener() { //点测量 mBinding.itemPointMeasure.setOnClickNoRepeatListener { - PointMeasureListActivity.launch(requireContext()) + PointMeasureListActivity.start() } //放样 mBinding.itemLofting.setOnClickNoRepeatListener { - LoftingListActivity.launch(mContext) + LoftingListActivity.start() } mBinding.itemToBeProcessed.setOnClickNoRepeatListener { ApprovalActivity.start(ApprovalActivity.PI_PREAPPROV) diff --git a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt index f30e625..91a31e2 100644 --- a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt @@ -56,9 +56,9 @@ class InstrumentFragment : BaseBindingFragment() { } private fun updateViewByData() { - val currentProject = - SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) - mBinding.tvProject.text = currentProject?.XMXX_NAME + SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java)?.let { + mBinding.tvProject.text = it.XMXX_NAME + } } override fun initListener() { diff --git a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt index 5342a64..8ce7c43 100644 --- a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt @@ -44,15 +44,15 @@ class MeFragment : BaseBindingFragment() { } } mBinding.tvName.text = SPUtils.getString(SPConstants.ACCOUNT) - mBinding.tvVersion.text = BuildConfig.VERSION_NAME + mBinding.tvVersion.text = "v${BuildConfig.VERSION_NAME}" updateViewByData() } private fun updateViewByData() { - val currentProject = - SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) - mBinding.tvProject.text = currentProject?.XMXX_NAME + SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java)?.let { + mBinding.tvProject.text = it.XMXX_NAME + } } override fun initListener() { diff --git a/app/src/main/java/com/project/survey/ui/lofting/LoftingListActivity.kt b/app/src/main/java/com/project/survey/ui/lofting/LoftingListActivity.kt index 4cca88d..74cf211 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/LoftingListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/lofting/LoftingListActivity.kt @@ -1,46 +1,33 @@ package com.project.survey.ui.lofting -import android.content.Context -import android.content.Intent -import com.gyf.immersionbar.ImmersionBar -import com.project.survey.adapter.LoftingListAdapter +import com.project.survey.R import com.project.survey.databinding.ActivityLoftingListBinding import com.project.survey.model.LoftingListBean import com.project.survey.ui.base.BaseBindingActivity +import com.project.survey.ui.lofting.adapter.LoftingListAdapter +import com.project.survey.ui.lofting.pointlofting.PointStakingActivity +import com.project.survey.util.ActivityNavUtil import com.project.survey.widget.decoration.TransparentDividerDecoration class LoftingListActivity : BaseBindingActivity() { - private val adapter by lazy { LoftingListAdapter(this) } + private val adapter by lazy { LoftingListAdapter() } companion object { - fun launch(context: Context) { - context.startActivity(Intent(context, LoftingListActivity::class.java)) + fun start() { + ActivityNavUtil.startActivity { } } } - override fun getBinding(): ActivityLoftingListBinding { - return ActivityLoftingListBinding.inflate(layoutInflater) - } + override fun getBinding(): ActivityLoftingListBinding = + ActivityLoftingListBinding.inflate(layoutInflater) override fun initView() { - ImmersionBar.with(this) - .statusBarDarkFont(true) - .titleBarMarginTop(mBinding.ilToolBar.toolbar) - .init() - setSupportActionBar(mBinding.ilToolBar.toolbar) - - initAdapter() - - - } + immersionToolbar(mBinding.toolbar, R.string.lofting) - private fun initAdapter() { mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) - adapter.setOnItemClickListener { - - } mBinding.recyclerView.setAdapter(adapter) + adapter.isStateViewEnable = true } override fun initData() { @@ -48,10 +35,19 @@ class LoftingListActivity : BaseBindingActivity() { for (i in 0 until 3) { dataList.add(LoftingListBean()) } - adapter.refreshData(dataList) + adapter.submitList(dataList) } override fun initListener() { + // 搜索 + mBinding.searchWidget.setOnEditorSearchListener { + } + // 放样 + adapter.addOnItemChildClickListener(R.id.tvLofting) { _, _, position -> + adapter.getItem(position)?.let { bean -> + PointStakingActivity.start(this) + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/lofting/adapter/LoftingListAdapter.kt b/app/src/main/java/com/project/survey/ui/lofting/adapter/LoftingListAdapter.kt new file mode 100644 index 0000000..6923c92 --- /dev/null +++ b/app/src/main/java/com/project/survey/ui/lofting/adapter/LoftingListAdapter.kt @@ -0,0 +1,28 @@ +package com.project.survey.ui.lofting.adapter + +import android.content.Context +import android.view.ViewGroup +import com.chad.library.adapter4.BaseQuickAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder +import com.project.survey.R + +class LoftingListAdapter : BaseQuickAdapter() { + + override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: Any?) { + item?.let { bean -> + holder.setText(R.id.tvWorkName, "作业名称") + .setText(R.id.tvWorkDesc, "作业内容内容内容") + .setText(R.id.tvCreateTime, "2022-05-17 10:58:48") + .setText(R.id.tvProjectName, "单位-分部-分项 3个名称合并显示") + .setText(R.id.tvSurveyor, "丁汉臻") + } + } + + override fun onCreateViewHolder( + context: Context, + parent: ViewGroup, + viewType: Int + ): QuickViewHolder { + return QuickViewHolder(R.layout.item_lofting_list, parent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt index e9bbdd0..a9e3181 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt @@ -1,13 +1,11 @@ package com.project.survey.ui.pointmeasure -import android.content.Context -import android.content.Intent import android.view.View import androidx.core.os.bundleOf -import com.gyf.immersionbar.ImmersionBar import com.project.survey.R import com.project.survey.databinding.ActivityPointMeasureListBinding import com.project.survey.ui.base.BaseBindingActivity +import com.project.survey.util.ActivityNavUtil /** * 点测量列表 @@ -20,24 +18,24 @@ class PointMeasureListActivity : BaseBindingActivity { } } } - override fun getBinding(): ActivityPointMeasureListBinding { - return ActivityPointMeasureListBinding.inflate(layoutInflater) - } + override fun getBinding(): ActivityPointMeasureListBinding = + ActivityPointMeasureListBinding.inflate(layoutInflater) override fun initView() { - ImmersionBar.with(this) - .statusBarDarkFont(true) - .titleBarMarginTop(mBinding.ilToolBar.toolbar) - .init() - setSupportActionBar(mBinding.ilToolBar.toolbar) + immersionToolbar(mBinding.toolbar, R.string.point_measure) + } override fun initListener() { + // 搜索 + mBinding.searchWidget.setOnEditorSearchListener { + } + mBinding.tvAll.setOnClickListener { loadFirstPage() } @@ -52,11 +50,11 @@ class PointMeasureListActivity : BaseBindingActivity() { +class PointMeasureListFragment : BaseBindingFragment() { - private val adapter by lazy { - PointMeasureListAdapter( - requireContext(), - getType() - ) + companion object { + const val TYPE = "type" + + fun newInstance(type: String): Fragment { + return PointMeasureListFragment().apply { + arguments = bundleOf(TYPE to type) + } + } } - override fun getViewBinding( + override fun getBinding( inflater: LayoutInflater, container: ViewGroup? - ): FragmentPointMeasureListBinding { - return FragmentPointMeasureListBinding.inflate(inflater, container, false) - } - - override fun initView() { - initAdapter() - - } + ): FragmentPointMeasureListBinding = + FragmentPointMeasureListBinding.inflate(inflater, container, false) - private fun initAdapter() { - mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(requireContext())) - adapter.setOnItemClickListener { + private val adapter by lazy { PointMeasureListAdapter() } - } + override fun initView() { + mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(mContext)) mBinding.recyclerView.setAdapter(adapter) + adapter.isStateViewEnable = true } override fun initData() { @@ -42,8 +44,26 @@ class PointMeasureListFragment : BaseFragmentBinding + toast("生成报验单:$position") + } + // 结束测量 + adapter.addOnItemChildClickListener(R.id.tvStopMeasure) { _, _, position -> + toast("结束测量:$position") + } + // 进入测量 + adapter.addOnItemChildClickListener(R.id.tvEnterMeasure) { _, _, position -> + adapter.getItem(position)?.let { bean -> + PointSurveyNewActivity.start(mContext) + } + } + + } - private fun getType() = getArgumentString(PointMeasureListActivity.KEY_TYPE) } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt new file mode 100644 index 0000000..1efa292 --- /dev/null +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt @@ -0,0 +1,29 @@ +package com.project.survey.ui.pointmeasure.adapter + +import android.content.Context +import android.view.ViewGroup +import com.chad.library.adapter4.BaseQuickAdapter +import com.chad.library.adapter4.viewholder.QuickViewHolder +import com.project.survey.R + +class PointMeasureListAdapter : BaseQuickAdapter() { + + override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: Any?) { + item?.let { bean -> + holder.setText(R.id.tvName, "测量单位报审（验）单") + .setText(R.id.tvNO, "XMBH2021-0000-$position") + .setText(R.id.tvType, "测量类型") + .setText(R.id.tvProjectName, "单位-分部-分项$position") + .setText(R.id.tvMeasureContent, "内容名称") + .setText(R.id.tvApplyUser, "张三") + } + } + + override fun onCreateViewHolder( + context: Context, + parent: ViewGroup, + viewType: Int + ): QuickViewHolder { + return QuickViewHolder(R.layout.item_point_measure_list, parent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt index 9c625d1..7e735fb 100644 --- a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt @@ -59,7 +59,6 @@ class ProjectListActivity : BaseBindingActivity(), O mBinding.recyclerView.addItemDecoration(HorDividerDecoration(this)) mBinding.recyclerView.setAdapter(adapter) adapter.isStateViewEnable = true - adapter.setStateViewLayout(this, R.layout.layout_no_data) } override fun initData() { @@ -68,7 +67,11 @@ class ProjectListActivity : BaseBindingActivity(), O } viewModel.projectResponse.observe(this) { mBinding.smartRefreshLayout.smartDismiss() - adapter.submitList(it) + if (it.isNotEmpty()) { + adapter.submitList(it) + } else { + adapter.setStateViewLayout(this, R.layout.layout_no_data) + } } fetchData() } diff --git a/app/src/main/res/color/text_color_selector_blue_black.xml b/app/src/main/res/color/text_color_selector_blue_black.xml index 6b76539..d2fe453 100644 --- a/app/src/main/res/color/text_color_selector_blue_black.xml +++ b/app/src/main/res/color/text_color_selector_blue_black.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_base_survey_new.xml b/app/src/main/res/layout/activity_base_survey_new.xml index 7053745..2c8acb0 100644 --- a/app/src/main/res/layout/activity_base_survey_new.xml +++ b/app/src/main/res/layout/activity_base_survey_new.xml @@ -330,6 +330,7 @@ android:id="@+id/rl_more" android:layout_width="wrap_content" android:layout_height="35dp" + android:visibility="gone" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="15dp"> diff --git a/app/src/main/res/layout/activity_lofting_list.xml b/app/src/main/res/layout/activity_lofting_list.xml index 9603664..a99f2cf 100644 --- a/app/src/main/res/layout/activity_lofting_list.xml +++ b/app/src/main/res/layout/activity_lofting_list.xml @@ -1,21 +1,39 @@ - + + + + - + + + android:padding="12dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="2" + tools:listitem="@layout/item_lofting_list" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_point_measure_list.xml b/app/src/main/res/layout/activity_point_measure_list.xml index 3809bf1..4d4a932 100644 --- a/app/src/main/res/layout/activity_point_measure_list.xml +++ b/app/src/main/res/layout/activity_point_measure_list.xml @@ -1,14 +1,31 @@ - + + + + + + - + @@ -8,7 +9,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/sw_12dp" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:padding="12dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="2" + tools:listitem="@layout/item_point_measure_list" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_approval_approved.xml b/app/src/main/res/layout/item_approval_approved.xml index 7079822..f238697 100644 --- a/app/src/main/res/layout/item_approval_approved.xml +++ b/app/src/main/res/layout/item_approval_approved.xml @@ -6,7 +6,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" android:background="@drawable/bg_white_round_4" - android:padding="12dp"> + android:padding="12dp" + tools:layout_editor_absoluteX="12dp"> - + android:padding="12dp"> + android:textColor="@color/text_color_20" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="作业名称" /> + android:layout_marginTop="12dp" + android:text="作 业 描 述 ：" + android:textColor="@color/text_color_20" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvWorkName" /> + android:textColor="@color/text_color_20" + android:textSize="12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvWorkDescKey" + app:layout_constraintStart_toEndOf="@id/tvWorkDescKey" + tools:text="内容" /> + android:layout_marginTop="4dp" + android:text="创 建 时 间 ：" + android:textColor="@color/text_color_20" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvWorkDescKey" /> + android:textColor="@color/text_color_20" + android:textSize="12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvCreateTimeKey" + app:layout_constraintStart_toEndOf="@id/tvCreateTimeKey" + tools:text="2022-05-17 10:58:48" /> - + - + + + android:layout_marginTop="4dp" + android:text="测　 量　 员：" + android:textColor="@color/text_color_20" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" /> - + - + + + - + diff --git a/app/src/main/res/layout/item_point_measure_list.xml b/app/src/main/res/layout/item_point_measure_list.xml index 3055d9e..b0710f1 100644 --- a/app/src/main/res/layout/item_point_measure_list.xml +++ b/app/src/main/res/layout/item_point_measure_list.xml @@ -1,106 +1,159 @@ - + android:padding="12dp"> + android:textColor="@color/text_color_20" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="测量单位报审（验）单" /> + android:textColor="@color/text_color_727778" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvName" + tools:text="XMBH2021-00001" /> + android:textSize="10sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvNO" + tools:text="测量类型" /> + android:layout_marginTop="12dp" + android:text="分项工程名称：" + android:textColor="@color/text_color_404145" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvType" /> + android:textColor="@color/text_color_404145" + android:textSize="12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvProjectNameKey" + app:layout_constraintStart_toEndOf="@id/tvProjectNameKey" + tools:text="单位-分部-分项3个名称合并显示" /> + android:layout_marginTop="4dp" + android:text="测 量 内 容 ：" + android:textColor="@color/text_color_404145" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" /> - + - + + + android:textColor="@color/text_color_404145" + android:textSize="12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvApplyUserKey" + app:layout_constraintStart_toEndOf="@id/tvApplyUserKey" + tools:text="丁汉臻" /> - + - + - + - + - +