From 1f67fba393ee8d9853581c98ef61d6aced2a98d2 Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Thu, 26 Sep 2024 15:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8=E5=88=B0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 6 +++ .../logic/viewmodel/ProjectViewModel.kt | 7 +-- .../{ApprovalBean.kt => ApprovalResponse.kt} | 16 +++++- .../java/com/project/survey/network/Api.kt | 4 +- .../com/project/survey/ui/MainActivity.kt | 12 ++--- .../survey/ui/approval/ApprovalActivity.kt | 17 ++++++- .../ui/approval/ApprovalInitiatedFragment.kt | 1 - .../ui/approval/ApprovalProcessedFragment.kt | 1 - .../ui/approval/ApprovalWaitFragment.kt | 1 - .../ui/approval/adapter/ApprovalAdapter.kt | 48 ++++++++++++++---- .../survey/ui/base/BaseBindingActivity.kt | 18 +++++++ .../survey/ui/home/InstrumentFragment.kt | 2 +- .../project/survey/widget/LoadingDialog.kt | 2 +- .../res/drawable-xhdpi/icon_home_selected.png | Bin 906 -> 0 bytes .../drawable-xhdpi/icon_home_unselected.png | Bin 983 -> 0 bytes .../icon_instrument_selected.png | Bin 954 -> 0 bytes .../icon_instrument_unselected.png | Bin 963 -> 0 bytes .../res/drawable-xhdpi/icon_me_selected.png | Bin 933 -> 0 bytes .../res/drawable-xhdpi/icon_me_unselected.png | Bin 958 -> 0 bytes .../res/drawable/icon_tab_home_selected.xml | 13 +++++ .../res/drawable/icon_tab_home_unselected.xml | 13 +++++ .../drawable/icon_tab_instrument_selected.xml | 10 ++++ .../icon_tab_instrument_unselected.xml | 10 ++++ .../res/drawable/icon_tab_me_selected.xml | 10 ++++ .../res/drawable/icon_tab_me_unselected.xml | 10 ++++ app/src/main/res/layout/fragment_me.xml | 16 +++--- app/src/main/res/layout/layout_no_data.xml | 17 +++++++ 27 files changed, 198 insertions(+), 36 deletions(-) rename app/src/main/java/com/project/survey/model/{ApprovalBean.kt => ApprovalResponse.kt} (51%) delete mode 100644 app/src/main/res/drawable-xhdpi/icon_home_selected.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_home_unselected.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_instrument_selected.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_instrument_unselected.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_me_selected.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_me_unselected.png create mode 100644 app/src/main/res/drawable/icon_tab_home_selected.xml create mode 100644 app/src/main/res/drawable/icon_tab_home_unselected.xml create mode 100644 app/src/main/res/drawable/icon_tab_instrument_selected.xml create mode 100644 app/src/main/res/drawable/icon_tab_instrument_unselected.xml create mode 100644 app/src/main/res/drawable/icon_tab_me_selected.xml create mode 100644 app/src/main/res/drawable/icon_tab_me_unselected.xml create mode 100644 app/src/main/res/layout/layout_no_data.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e39fc97..a47a4de 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -249,6 +249,12 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt index 984bcd1..a045a1b 100644 --- a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt +++ b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt @@ -2,6 +2,7 @@ package com.project.survey.logic.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import com.project.survey.model.ApprovalBean import com.project.survey.model.ProjectBean import com.project.survey.network.RetrofitClient @@ -26,9 +27,9 @@ class ProjectViewModel : BaseViewModel() { } } - val workTaskListResponse: LiveData + val workTaskListResponse: LiveData> get() = _workTaskListResponse - private val _workTaskListResponse = MutableLiveData() + private val _workTaskListResponse = MutableLiveData>() /** * 获取流程审批列表 @@ -37,7 +38,7 @@ class ProjectViewModel : BaseViewModel() { launch { val res = api.fetchWorkTask(projectId, type, page) if (res.success) { - _workTaskListResponse.postValue(res.data) + _workTaskListResponse.postValue(res.data.data.rows) } } } diff --git a/app/src/main/java/com/project/survey/model/ApprovalBean.kt b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt similarity index 51% rename from app/src/main/java/com/project/survey/model/ApprovalBean.kt rename to app/src/main/java/com/project/survey/model/ApprovalResponse.kt index 5786473..8547bf9 100644 --- a/app/src/main/java/com/project/survey/model/ApprovalBean.kt +++ b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt @@ -1,6 +1,6 @@ package com.project.survey.model -data class ApprovalBean( +data class ApprovalResponse( val badges: Badge, val data: ApprovalData ) @@ -14,6 +14,18 @@ data class Badge( ) data class ApprovalData( - val rows: List, + val rows: List, val totalCount: Int +) + +data class ApprovalBean( + val id: String, + val title: String, + val context: String, + val collect: String, + val delay: String, + val submitTime: String, + val tableCode: String, + val funcCode: String, + val pkValue: String ) \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/network/Api.kt b/app/src/main/java/com/project/survey/network/Api.kt index a31d1dd..5d61f6c 100644 --- a/app/src/main/java/com/project/survey/network/Api.kt +++ b/app/src/main/java/com/project/survey/network/Api.kt @@ -1,5 +1,7 @@ package com.project.survey.network +import com.project.survey.model.ApprovalBean +import com.project.survey.model.ApprovalResponse import com.project.survey.model.LoginBean import com.project.survey.model.ProjectBean import retrofit2.http.Field @@ -77,7 +79,7 @@ interface Api { // @Field("userName") userName: String = "", @Field("page") page: Int, @Field("limit") limit: Int = 30, - ): HttpResult + ): HttpResult } \ No newline at end of file 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 75a7030..6f91f26 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivity.kt +++ b/app/src/main/java/com/project/survey/ui/MainActivity.kt @@ -61,18 +61,18 @@ class MainActivity : BaseBindingActivity() { arrayListOf( TabEntity( getString(R.string.tab_home_page), - R.drawable.icon_home_selected, - R.drawable.icon_home_unselected + R.drawable.icon_tab_home_selected, + R.drawable.icon_tab_home_unselected ), TabEntity( getString(R.string.tab_instrument), - R.drawable.icon_instrument_selected, - R.drawable.icon_instrument_unselected + R.drawable.icon_tab_instrument_selected, + R.drawable.icon_tab_instrument_unselected ), TabEntity( getString(R.string.tab_mine), - R.drawable.icon_me_selected, - R.drawable.icon_me_unselected + R.drawable.icon_tab_me_selected, + R.drawable.icon_tab_me_unselected ) ) ) diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt index 8a6b960..f0e6eb4 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt @@ -1,6 +1,10 @@ package com.project.survey.ui.approval +import android.net.Uri import androidx.activity.viewModels +import com.bingce.surveyor.agentweb.AgentWebActivity +import com.project.survey.BuildConfig +import com.project.survey.R import com.project.survey.constants.SPConstants import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityApprovalBinding @@ -10,6 +14,7 @@ import com.project.survey.ui.approval.adapter.ApprovalAdapter import com.project.survey.util.ActivityNavUtil import com.project.survey.util.SPUtils import com.project.survey.util.param.Param +import com.project.survey.widget.LoadingDialog import com.project.survey.widget.decoration.TransparentDividerDecoration /** @@ -61,11 +66,15 @@ class ApprovalActivity : BaseBindingActivity() { mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) mBinding.recyclerView.adapter = adapter + adapter.isStateViewEnable = true + adapter.setStateViewLayout(this, R.layout.layout_no_data) } override fun initData() { + viewModel.errorResponse.observe(this){ + } viewModel.workTaskListResponse.observe(this) { - adapter.submitList(emptyList()) + adapter.submitList(it, type) } viewModel.fetchWorkTask(SPUtils.getString(SPConstants.PROJECT_ID) ?: "", type) // if (type == PI_PREAPPROV) { @@ -80,7 +89,11 @@ class ApprovalActivity : BaseBindingActivity() { override fun initListener() { adapter.setOnItemClickListener { _, _, position -> adapter.getItem(position)?.let { bean -> - toast("item${bean}") + // http://10.190.183.37/app/micro/func/#/pages/func/form/{功能编码}/{流程ID}?authorization={登录token}&appId=2024-0926-1104-0165 + val token = SPUtils.getString(SPConstants.TOKEN)?:"" + val url = + BuildConfig.BASE_URL + "app/micro/func/#/pages/func/form/${bean.funcCode}/${bean.pkValue}?authorization=${token}&appId=2024-0926-1104-0165" + AgentWebActivity.navigation2(this, Uri.parse(url)) } } } diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalInitiatedFragment.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalInitiatedFragment.kt index da93d4e..d34e142 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalInitiatedFragment.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalInitiatedFragment.kt @@ -5,7 +5,6 @@ import android.view.ViewGroup import com.project.survey.adapter.ApprovalInitatedAdapter import com.project.survey.databinding.FragmentApprovalBinding import com.project.survey.ui.base.BaseFragmentBinding -import com.project.survey.model.ApprovalBean import com.project.survey.widget.decoration.TransparentDividerDecoration /** diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalProcessedFragment.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalProcessedFragment.kt index 2c19f82..536d01e 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalProcessedFragment.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalProcessedFragment.kt @@ -5,7 +5,6 @@ import android.view.ViewGroup import com.project.survey.adapter.ApprovalWaitAdapter import com.project.survey.databinding.FragmentApprovalBinding import com.project.survey.ui.base.BaseFragmentBinding -import com.project.survey.model.ApprovalBean import com.project.survey.widget.decoration.TransparentDividerDecoration /** diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalWaitFragment.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalWaitFragment.kt index 7aeffea..764bf23 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalWaitFragment.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalWaitFragment.kt @@ -5,7 +5,6 @@ import android.view.ViewGroup import com.project.survey.adapter.ApprovalWaitAdapter import com.project.survey.databinding.FragmentApprovalBinding import com.project.survey.ui.base.BaseFragmentBinding -import com.project.survey.model.ApprovalBean import com.project.survey.widget.decoration.TransparentDividerDecoration /** diff --git a/app/src/main/java/com/project/survey/ui/approval/adapter/ApprovalAdapter.kt b/app/src/main/java/com/project/survey/ui/approval/adapter/ApprovalAdapter.kt index 9b7af07..b7482ce 100644 --- a/app/src/main/java/com/project/survey/ui/approval/adapter/ApprovalAdapter.kt +++ b/app/src/main/java/com/project/survey/ui/approval/adapter/ApprovalAdapter.kt @@ -9,11 +9,14 @@ import com.project.survey.databinding.ItemApprovalApprovedBinding import com.project.survey.databinding.ItemApprovalOwnerBinding import com.project.survey.extend.isVisibleOrGone import com.project.survey.model.ApprovalBean +import com.project.survey.ui.approval.ApprovalActivity class ApprovalAdapter : BaseMultiItemAdapter() { + private var type = ApprovalActivity.PI_PREAPPROV + init { - addItemType(TYPE_0, object : OnMultiItemAdapterListener { + addItemType(0, object : OnMultiItemAdapterListener { override fun onCreate( context: Context, parent: ViewGroup, @@ -26,8 +29,13 @@ class ApprovalAdapter : BaseMultiItemAdapter() { override fun onBind(holder: ItemPreapprovVH, position: Int, item: ApprovalBean?) { holder.binding.ivAgree.isVisibleOrGone(false) + item?.let { bean -> + holder.binding.tvName.text = bean.title + holder.binding.tvNo.text = bean.funcCode + holder.binding.tvTime.text = bean.submitTime + } } - }).addItemType(TYPE_1, object : OnMultiItemAdapterListener { + }).addItemType(1, object : OnMultiItemAdapterListener { override fun onCreate( context: Context, parent: ViewGroup, @@ -40,8 +48,13 @@ class ApprovalAdapter : BaseMultiItemAdapter() { override fun onBind(holder: ItemApprovedVH, position: Int, item: ApprovalBean?) { holder.binding.ivAgree.isVisibleOrGone(true) + item?.let { bean -> + holder.binding.tvName.text = bean.title + holder.binding.tvNo.text = bean.funcCode + holder.binding.tvTime.text = bean.submitTime + } } - }).addItemType(TYPE_2, object : OnMultiItemAdapterListener { + }).addItemType(2, object : OnMultiItemAdapterListener { override fun onCreate( context: Context, parent: ViewGroup, @@ -53,8 +66,25 @@ class ApprovalAdapter : BaseMultiItemAdapter() { } override fun onBind(holder: ItemOwnerVH, position: Int, item: ApprovalBean?) { + item?.let { bean -> + holder.binding.tvName.text = bean.title + holder.binding.tvNo.text = bean.funcCode + holder.binding.tvStartTime.text = bean.submitTime + holder.binding.tvEndTime.text = "" + } + } + }).onItemViewType { _, _ -> + when (type) { + ApprovalActivity.PI_PREAPPROV -> 0 + ApprovalActivity.PI_APPROVED -> 1 + else -> 2 } - }) + } + } + + fun submitList(list: List?, type: String) { + this.type = type + super.submitList(list) } class ItemPreapprovVH(val binding: ItemApprovalApprovedBinding) : @@ -66,10 +96,10 @@ class ApprovalAdapter : BaseMultiItemAdapter() { class ItemOwnerVH(val binding: ItemApprovalOwnerBinding) : RecyclerView.ViewHolder(binding.root) - companion object { - private const val TYPE_0 = 0 - private const val TYPE_1 = 1 - private const val TYPE_2 = 2 - } +// companion object { +// private const val TYPE_0 = 0 +// private const val TYPE_1 = 1 +// private const val TYPE_2 = 2 +// } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt index 930d7bc..94109d3 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt +++ b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt @@ -11,6 +11,7 @@ import androidx.viewbinding.ViewBinding import com.gyf.immersionbar.ImmersionBar import com.project.survey.R import com.project.survey.util.param.ParamUtil +import com.project.survey.widget.LoadingDialog import org.polaric.colorful.Colorful abstract class BaseBindingActivity : AppCompatActivity() { @@ -91,4 +92,21 @@ abstract class BaseBindingActivity : AppCompatActivity() { supportActionBar?.title = title } + private var loadingDialog: LoadingDialog? = null + + protected fun showLoadingDialog() { + if (loadingDialog == null) { + loadingDialog = LoadingDialog.Builder(this) + .setCancelable(true) + .setCancelOutside(true) + .create() + } + loadingDialog?.show() + } + + protected fun dismissLoadingDialog() { + if (loadingDialog?.isShowing == true) { + loadingDialog?.dismiss() + } + } } \ No newline at end of file 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 7e2e53f..874cdbb 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 @@ -39,7 +39,7 @@ class InstrumentFragment : BaseBindingFragment() { } override fun initData() { - mBinding.tvProject.text = "哈哈哈哈哈" +// mBinding.tvProject.text = "哈哈哈哈哈" } override fun initListener() { diff --git a/app/src/main/java/com/project/survey/widget/LoadingDialog.kt b/app/src/main/java/com/project/survey/widget/LoadingDialog.kt index 28d791e..a025c3f 100644 --- a/app/src/main/java/com/project/survey/widget/LoadingDialog.kt +++ b/app/src/main/java/com/project/survey/widget/LoadingDialog.kt @@ -10,7 +10,7 @@ import com.project.survey.extend.isVisibleOrGone class LoadingDialog @JvmOverloads constructor(context: Context) : Dialog(context, R.style.loading_dialog) { - inner class Builder(val context: Context) { + class Builder(val context: Context) { private var message = "" private var isCancelable = false private var isCancelOutside = false diff --git a/app/src/main/res/drawable-xhdpi/icon_home_selected.png b/app/src/main/res/drawable-xhdpi/icon_home_selected.png deleted file mode 100644 index 1467898e6e050989909bb0289d38b85ccd537d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmV;519kj~P)Px#1am@3R0s$N2z&@+hyVZsG)Y83R9J=Wmp@1waTLeD@0T;lkf8;IY+4W$6lzdw z&RQCw1qY!P99pQWnC!QzjwQg| z%H|+|Md)GAA4J-!}V@%=`04Zyw{mgSAiAl`M!Ngd(^~wVFhqhh;G-)vJ z@?TX3r|$sJ9ykf0$xKY?D*2X>gIkjT>vxQ>omNlouZM5#13;&;=9PqV8H`p#*{Rs< z%@?KAEgCp5u_7J)zCK65BZKR^i);F#;g&<)dS%CROs8J~+}7F|_~@?tGZdZZO;-#! zpzL^##pxUv19}gCak2A>5mpa<@&TX+hU%YPYRyotI5QR8!vST-b3~^RBP=r(Ty?3z z%Zf(BEr+hU)F3k!bPmSA5uHW?%8uFXVyc36xKmm4N^mZN486!a9Si%4I{C7am;%vr zeI9J5k?sAh)^pC5&!7sJv0A*z}?E`Ajq)<^SR)vjwNvI)o9?zhln6jYpdbu^=<19wn!}r7=4q{gg`=r`BwoAmzT?0Y z_{^b$1pqmie3}awDgs3Gx)5Gg831wuuZDdS`Epn~z+Z)`4p_>+q&N}iu}bPb00a#;JHTXijA16Nu$aHUnkEkSO1^yl64FDA9V@KCDP z#scgHxTxwS0J9f@qZbTCL=rFzp$->cGpnj=iK+uGuqAk!xv*jW$c>ct-F?Du3W+1i g#@VuE%U0?72j>I}xX)ve#sB~S07*qoM6N<$f~29I2><{9 diff --git a/app/src/main/res/drawable-xhdpi/icon_home_unselected.png b/app/src/main/res/drawable-xhdpi/icon_home_unselected.png deleted file mode 100644 index 8176aeae2e97daea74e3e849b7fecaf092065101..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 983 zcmV;|11S87P)Px#1am@3R0s$N2z&@+hyVZsfk{L`R9J=WR?ll2XAph!tz;BXThp2#(l$RJ)JtkB z>9Hgw+cW_ed`a-O`n1wo|3Q4oB_Sj^YP!y9xbx0wQlVzdime8ib zhY$=67$kcqha}Q!Em^zP+923>($0ME&C}@9>;NG`gy?@rnNy|Ase7SKK?_QmQw8il z0lUPBq}V?IX#C-bC<3BsLuRk_QghcGHss_q z2v=Kzgi5V0ep*_ZeOWG-->B+$zbO$O18}f;hR!8NP7SVBR+e{D*Y{Y{G%fPgp|9r| zlyas1s?|5f3WdU3XHeJm_(1f)Ljb2+3-jX3SN~>9rP8LK`o21>>w5h2!7nTZO}J9O z*XkRW+-3owTCLVp^_wL{iGB;f@iL*2&p!DyIjj!MUOjm3u&(RzX!Jml0QX$I z|KF>BGTl0*Xnxv5*a;nT!~^CgcGeb__-@B^ErT{uJCJ{`J!dbKW@iq`{KyR%-H+AV4Kpvm(`oa3 zyW}>*M#`M9K@VD&nEeLD!CW*_rh9xM;(U-&4gow2qTB4G1DDaE+nH2GvxU&S*buf| zT3B2tbx5x>Fw-nb0C-qRIb>PZ>$ZkJByPKvjI=q~$*?ViM!*d(hHW7Lprhe@e(q*B zjX)Rp{XpLtj&wib4-A&V<~0DY1tkb%1*spnVcS-oCHC75TJ$kQ?(i(%dQxmLq1FFayi?|v#oh!7#V;T-@=7$F*5IEVlM002ovPDHLk FV1i=W#ryyO diff --git a/app/src/main/res/drawable-xhdpi/icon_instrument_selected.png b/app/src/main/res/drawable-xhdpi/icon_instrument_selected.png deleted file mode 100644 index 08438978565504c1b8bd1b535b71ab5a89d71962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 954 zcmV;r14aCaP)Px#1am@3R0s$N2z&@+hyVZsWJyFpR9J=WS4~J%Q562pb8M!P(qO^}2(`n77Se>uKwMYWboz+P)15NVkMHLw8{z z%ZwSXf6MRnZ~2)qV{!F)v)nCPPns|hw_4ZCd!vb=a4s&bdwx0Z@Q|P;O zNuWS+i-VPXoj_XY2)Tqc4Jpc4XH@Gjm;L3wvh`d*XHQk25MG=NZg`Dal^G)pY~<|>Y%pWQYt*WXlfjKjIgShImQW*$ z-B4=oc+*>hiK(y-0G$J=764dy)xH7%p$GH6%$bH4%*O1(%WEHG>PcTZMok|v`ZH%6 zdOBlErYHvNjt46)x$b=dr+cs#%sHe&E_*>97BpQDN0}IdhboSPpQowBV5yIV8_Fy zCdJ@YORCSwc-xJGeAVdEC!nZ$hCi6dRqvA{->-_Bv4b2M+moQ=d$N3O|ybypu(|Jj*gv3->C(v}! z!i|}q=WdDC7jFsMU%AIzCKiXmpwelj|9`<B3hSho{ostrADPx#1am@3R0s$N2z&@+hyVZsZAnByR9J=WSI=t`K@|SpY?4OtkW0ZzD+*G2u+W3z zrH2R#1-;oqb~j0L>_Jda{{b%^L=Y6bu5FS{sDc-v$DF(<6fp-69*Vyz=%LW6`8m%+ zH_dKpQg>(3gZVDWy!qaIAG5RX?EpgzF~na5g}tDuXRb3*0sx44t6;C(4|DxUn2P}b zh^`TE!uh`eAXLL5%*Fl&{%^yEk(&XKaD@_1EHs2>*fg_u2yz`gh6!@rG_!ZY($T_L z#4r|b5^#F}Wp;Xc=KGsBuV1KYDVMceE|+LF%YXtQr8MQn?cVP%2p)0FcY&;*Ey9%PgPUc79DoPx+-2LYQEr zn{_#F>Y0bp5$&F3b&WRb?HkRyyh?GE5-TJ(i$+FQ+%wo8wPTe7*Rk+rSO|81)7D69TYmC^POI+LWPtjX!{2)F zsn=N002ovPDHLkV1hIKyvP6m diff --git a/app/src/main/res/drawable-xhdpi/icon_me_selected.png b/app/src/main/res/drawable-xhdpi/icon_me_selected.png deleted file mode 100644 index 138a982ebd2c32fcabd6ce3f3357c2448367f304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 933 zcmV;W16urvP)Px#1am@3R0s$N2z&@+hyVZsPf0{UR9J=Wm``X_R}_c8b0;xkvoKI0i%7Fj2pE_d z8_i^zLR_^%-3bbA0&e0YE=0Sk1)(jiD0E?Fl1;&d?h0Mhg$2bCV`gH4GXoK_5LCz_ z;6fJ>({|oHE;@-bFY}zqd#{Kx-)6Y?o^yY{d4KLb_d$ymEn0k3NSKo)CJJ8|%!svi z4}dY|vBhTdlkxjuX@p{UXkwucZJPo{JVLTa`BZLlU@53pV8er{;;<3^1a>wEeQB+8 zcy8+Rd=R}rh7Y73bhpX20?_T6cKN?w?Qx~7l=YwZeCFVaUrpmT5ujbR{Ysx#OC}_Z5DiRb9*nex*R1rPq73&^z=WYexhUYT} zR}i_i-c}e*riy3XamiHititFZdV!U`>psBT0;ro0#_G1veP-=<9sfS}?BEN!e_mEjr>zv6??Vk>+6r)Q_5i_HW#WjK*4To94(fHsei#|jGu9$D4p>H#CtV_~1b0IutS)UdJ)NG2j*6nqR0Wff)s#!+m$ZRHdGlkwQ8h&TBrb6{ryPV5JLor)TE*-l8Y&=q`Z%;Ax2y_U2AH4ICaM3fADn9w2 ze7HXcc(N74ZAhi4d5?T-kA&XW@av-nXlNe}TeN7=;sf9f(yA5VNUWPf00000NkvXX Hu0mjfdz!#I diff --git a/app/src/main/res/drawable-xhdpi/icon_me_unselected.png b/app/src/main/res/drawable-xhdpi/icon_me_unselected.png deleted file mode 100644 index aad4106b0fa94305425dc5674858bafacc1a20fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmV;v13~Px#1am@3R0s$N2z&@+hyVZsXh}ptR9J=Wm_LXdbri=x?>D<=kRTQ+S8OnafrGmo z1|k-&5F~|yc81OFxSIhhi&Sc*LPSCg1{(`2Vcfl$HAJv5MT!$ny@29@;qHV(0-~fi zu}P8Qa@qMki{0CQ*>NW`E8?-=X6N_jz2E!n{C@Lzzk#Wynrf`c!7j4(TN>sIHtFkn@-cU$Jzl`H;s+MFhBAizvsFATwcBgP&H z!up{gtRE6%k0^ZGy(`Q0}As++6?T z=+VVUkQcf};R&D!6g$^lDf(Ws*;vYwGZQet#>V=0i;IhYf}A9N#dZ)q8-|UKv*ybT z46w1WzBWI9EHKyzBaZ+N1G@;nqS}bmIn!*`m&eVsFE!DA7@$(AJlQ`E!|?Y>&Yuam zdb;|obttM*6l4yVi*emjbW4O)6S3O(qVZ$eoDU3Ksd!I=eO;7SN3@m6q-?A3C792` z(7!Q0pr^#Z)lzlA8a|0VRiu^bim{w+TyAV8aZdzXsnpJ)`i_Xim93kCtXb?Y^qTiQ z6%1xx(c{oQ>)p?+Ekw?TVf|cY;MXd(j}+b-k!3}YKuvTl2!dhAk#b$PAl7+NQFqiz z30ztV>u;w9?wr@YAK*lTDB{D*370TVrBZbv=g7OjKx1T8pKmrBt8sDv*h?5OF6bU= zOVoKKX!_T(fbOaDhflk1Z3)${puOE3krEIKJg!?i(7TjdOA~_aR}j>%f^@f(_Mc)# zDAOVIzfj`#QdJ9;a_zT&142~`BFQRjV&G0mJDief-0X=x_t%yX)$5vYsU{^+o!E!N gsivB0s{euh258(a; + + + + + diff --git a/app/src/main/res/drawable/icon_tab_home_unselected.xml b/app/src/main/res/drawable/icon_tab_home_unselected.xml new file mode 100644 index 0000000..3f2f84f --- /dev/null +++ b/app/src/main/res/drawable/icon_tab_home_unselected.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_tab_instrument_selected.xml b/app/src/main/res/drawable/icon_tab_instrument_selected.xml new file mode 100644 index 0000000..d6f2d7b --- /dev/null +++ b/app/src/main/res/drawable/icon_tab_instrument_selected.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/icon_tab_instrument_unselected.xml b/app/src/main/res/drawable/icon_tab_instrument_unselected.xml new file mode 100644 index 0000000..f09212c --- /dev/null +++ b/app/src/main/res/drawable/icon_tab_instrument_unselected.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/icon_tab_me_selected.xml b/app/src/main/res/drawable/icon_tab_me_selected.xml new file mode 100644 index 0000000..43a12b7 --- /dev/null +++ b/app/src/main/res/drawable/icon_tab_me_selected.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/icon_tab_me_unselected.xml b/app/src/main/res/drawable/icon_tab_me_unselected.xml new file mode 100644 index 0000000..7dd3f85 --- /dev/null +++ b/app/src/main/res/drawable/icon_tab_me_unselected.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index f5d8dde..99e6914 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -1,9 +1,9 @@ + app:layout_constraintTop_toTopOf="parent" + tools:text="请登录" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="某工程" /> @@ -141,10 +141,10 @@ android:id="@+id/tvLoginOut" android:layout_width="match_parent" android:layout_height="48dp" - android:text="@string/login_out" android:layout_marginTop="8dp" - android:gravity="center" android:background="@color/white" + android:gravity="center" + android:text="@string/login_out" android:textColor="@color/text_color_20" android:textSize="15sp" /> @@ -152,7 +152,7 @@ android:id="@+id/tvVersion" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="1.0.0"/> + tools:text="1.0.0" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_no_data.xml b/app/src/main/res/layout/layout_no_data.xml new file mode 100644 index 0000000..c2afc58 --- /dev/null +++ b/app/src/main/res/layout/layout_no_data.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file