diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_verify.png b/app/src/main/res/mipmap-xxxhdpi/total_verify.png new file mode 100755 index 0000000..6b4eb4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_verify.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_verify.png b/app/src/main/res/mipmap-xxxhdpi/total_verify.png new file mode 100755 index 0000000..6b4eb4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_verify.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/update.png b/app/src/main/res/mipmap-xxxhdpi/update.png new file mode 100755 index 0000000..9ccbc68 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/update.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_verify.png b/app/src/main/res/mipmap-xxxhdpi/total_verify.png new file mode 100755 index 0000000..6b4eb4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_verify.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/update.png b/app/src/main/res/mipmap-xxxhdpi/update.png new file mode 100755 index 0000000..9ccbc68 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/update.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/verified.png b/app/src/main/res/mipmap-xxxhdpi/verified.png new file mode 100755 index 0000000..ba925b7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/verified.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_verify.png b/app/src/main/res/mipmap-xxxhdpi/total_verify.png new file mode 100755 index 0000000..6b4eb4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_verify.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/update.png b/app/src/main/res/mipmap-xxxhdpi/update.png new file mode 100755 index 0000000..9ccbc68 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/update.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/verified.png b/app/src/main/res/mipmap-xxxhdpi/verified.png new file mode 100755 index 0000000..ba925b7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/verified.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/visitor.png b/app/src/main/res/mipmap-xxxhdpi/visitor.png new file mode 100755 index 0000000..77efae2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/visitor.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b520164..43afd00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt index 1f08118..5b890af 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/HomeGridAdapter.kt @@ -4,9 +4,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R +import com.casic.xz.meterage.utils.LocaleConstant /** * 主页功能，九宫格Adapter @@ -21,6 +23,7 @@ ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) holder.homeFunctionView.text = dataRows[position] holder.itemView.setOnClickListener { clickListener?.onItemClick(position) @@ -40,6 +43,7 @@ } class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt index 75f2104..d61a8b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt @@ -55,7 +55,7 @@ holder.trainHourView.text = "${rowsBean.trainHour}课时" val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.processId, 100f.dp2px(context), 100f.dp2px(context) + rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) ) holder.qrCodeView.setImageBitmap(codeBitmap) holder.trainTimeView.text = rowsBean.trainTime diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 77afd2a..b60890d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter @@ -10,6 +11,7 @@ import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo +import com.qmuiteam.qmui.util.QMUIDisplayHelper import kotlinx.android.synthetic.main.fragment_home.* class HomePageFragment : KotlinBaseFragment() { @@ -41,7 +43,7 @@ "仪器设备" -> requireContext().navigatePageTo() "标准装置" -> requireContext().navigatePageTo() // "证书报告" -> requireContext().navigatePageTo() -// "委托需求" -> requireContext().navigatePageTo() + "委托需求" -> requireContext().navigatePageTo() // "访客" -> requireContext().navigatePageTo() // "标准规范" -> requireContext().navigatePageTo() "能力列表" -> requireContext().navigatePageTo() @@ -68,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index de0181c..82258c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,9 +1,8 @@ package com.casic.xz.meterage.fragment import android.view.View +import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.xz.meterage.R import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.notice.NoticeListActivity @@ -12,7 +11,12 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* +import kotlinx.android.synthetic.main.fragment_mine.noticeCountView +import kotlinx.android.synthetic.main.fragment_mine.noticeLayout +import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -66,6 +70,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index afa0759..e7367f4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.xz.meterage.fragment.sample.TotalTaskFragment import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_sample.* +import kotlinx.android.synthetic.main.fragment_sample.statusBarView class SamplePageFragment : KotlinBaseFragment() { @@ -40,6 +44,10 @@ } override fun setupTopBarLayout() { - + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(requireContext()) + val params = statusBarView.layoutParams as LinearLayout.LayoutParams + params.height = statusBarHeight + statusBarView.requestLayout() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index 443d6dd..2d50d0a 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.utils import android.Manifest +import com.casic.xz.meterage.R object LocaleConstant { @@ -15,6 +16,20 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) + val HOME_FUNC_IMAGE = intArrayOf( + R.mipmap.equipment, + R.mipmap.standard_device, + R.mipmap.certificate_report, + R.mipmap.entrust, + R.mipmap.visitor, + R.mipmap.standard_specification, + R.mipmap.capability, + R.mipmap.meterage_train, + R.mipmap.contract_invoice, + R.mipmap.business_statistics, + R.mipmap.customer, + R.mipmap.outfield_detection + ) val HOME_FUNC_OPERATE = arrayOf( "仪器设备", "标准装置", "证书报告", "委托需求", "访客", "标准规范", "能力列表", "计量培训", "合同发票", "业务统计", "客户列表", "外场检测" diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 209b011..28836e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -11,9 +11,7 @@ import com.casic.xz.meterage.fragment.SamplePageFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_main.* class MainActivity : KotlinBaseActivity() { @@ -83,7 +81,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainBackground.convertColor(this)) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class EntrustActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_entrust + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/home_selector.xml b/app/src/main/res/drawable/home_selector.xml index 7c8ec4f..82d1e85 100644 --- a/app/src/main/res/drawable/home_selector.xml +++ b/app/src/main/res/drawable/home_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 2716057..5fcc445 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/mine_selector.xml b/app/src/main/res/drawable/mine_selector.xml index b9b0110..eee86d3 100644 --- a/app/src/main/res/drawable/mine_selector.xml +++ b/app/src/main/res/drawable/mine_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sample_selector.xml b/app/src/main/res/drawable/sample_selector.xml index e9a47ef..124eaf8 100644 --- a/app/src/main/res/drawable/sample_selector.xml +++ b/app/src/main/res/drawable/sample_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_entrust.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fb1b2bd..5c7c717 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,21 +6,27 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:paddingHorizontal="@dimen/dp_10"> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/qr_code" /> + android:layout_width="@dimen/pngSize" + android:layout_height="@dimen/pngSize" + android:src="@mipmap/message_blue" /> + android:orientation="vertical"> + + android:layout_height="@dimen/dp_150" + android:background="@mipmap/mine_top" + android:orientation="vertical"> - + + android:layout_height="match_parent" + android:orientation="horizontal"> - + + + android:layout_gravity="center_vertical" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> - - - - - + android:layout_marginBottom="@dimen/dp_7"> - - + android:textSize="@dimen/sp_22" /> - + + + + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="@dimen/dp_15"> - - - - - - - - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - - + + - + - + - + - + - - + + + - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_solid_layout_white_radius_10" + android:orientation="vertical"> - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 2df9f57..4143eb8 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -6,6 +6,12 @@ android:background="@color/mainBackground" android:orientation="vertical"> + + + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/overtime" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/verified" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_verify" /> + android:layout_width="@dimen/homePngSize" + android:layout_height="@dimen/homePngSize" + android:src="@mipmap/total_sample" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/about.png b/app/src/main/res/mipmap-xxxhdpi/about.png new file mode 100755 index 0000000..5dc1670 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/about.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/account.png b/app/src/main/res/mipmap-xxxhdpi/account.png new file mode 100755 index 0000000..4e0740b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/account.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/back.png b/app/src/main/res/mipmap-xxxhdpi/back.png new file mode 100755 index 0000000..eb00a54 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/back.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/business_statistics.png b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png new file mode 100755 index 0000000..ec1237a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/business_statistics.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/capability.png b/app/src/main/res/mipmap-xxxhdpi/capability.png new file mode 100755 index 0000000..568de96 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/capability.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/certificate_report.png b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png new file mode 100755 index 0000000..ada104c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/certificate_report.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/collection.png b/app/src/main/res/mipmap-xxxhdpi/collection.png new file mode 100755 index 0000000..c6402b2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/collection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png new file mode 100755 index 0000000..1635cc6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/contract_invoice.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/customer.png b/app/src/main/res/mipmap-xxxhdpi/customer.png new file mode 100755 index 0000000..b831b42 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/customer.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/entrust.png b/app/src/main/res/mipmap-xxxhdpi/entrust.png new file mode 100755 index 0000000..cd4adb0 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/entrust.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/equipment.png b/app/src/main/res/mipmap-xxxhdpi/equipment.png new file mode 100755 index 0000000..b7f6f58 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/equipment.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/help.png b/app/src/main/res/mipmap-xxxhdpi/help.png new file mode 100755 index 0000000..2f896b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/help.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png new file mode 100755 index 0000000..a2e0a6d --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png new file mode 100755 index 0000000..e088303 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/home_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png new file mode 100755 index 0000000..2bc45dc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_blue.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png new file mode 100755 index 0000000..3d92934 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/message_white.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/meterage_train.png b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png new file mode 100755 index 0000000..bf5f7bc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/meterage_train.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png new file mode 100755 index 0000000..44e4896 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png new file mode 100755 index 0000000..eea2d7f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png new file mode 100755 index 0000000..95f09eb --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/mine_top.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png new file mode 100755 index 0000000..2c22ac7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/outfield_detection.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/overtime.png b/app/src/main/res/mipmap-xxxhdpi/overtime.png new file mode 100755 index 0000000..2e64dc4 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/overtime.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy.png b/app/src/main/res/mipmap-xxxhdpi/privacy.png new file mode 100755 index 0000000..351c516 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/privacy.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/push_setting.png b/app/src/main/res/mipmap-xxxhdpi/push_setting.png new file mode 100755 index 0000000..c022392 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/push_setting.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png new file mode 100755 index 0000000..deb4ad3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/qr_code.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample.png b/app/src/main/res/mipmap-xxxhdpi/sample.png new file mode 100755 index 0000000..bb1f41c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sample_selected.png b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png new file mode 100755 index 0000000..4f7f450 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/sample_selected.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_device.png b/app/src/main/res/mipmap-xxxhdpi/standard_device.png new file mode 100755 index 0000000..4fb76a1 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_device.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/standard_specification.png b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png new file mode 100755 index 0000000..a4225f6 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/standard_specification.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_sample.png b/app/src/main/res/mipmap-xxxhdpi/total_sample.png new file mode 100755 index 0000000..80221d9 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_sample.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/total_verify.png b/app/src/main/res/mipmap-xxxhdpi/total_verify.png new file mode 100755 index 0000000..6b4eb4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/total_verify.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/update.png b/app/src/main/res/mipmap-xxxhdpi/update.png new file mode 100755 index 0000000..9ccbc68 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/update.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/verified.png b/app/src/main/res/mipmap-xxxhdpi/verified.png new file mode 100755 index 0000000..ba925b7 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/verified.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/visitor.png b/app/src/main/res/mipmap-xxxhdpi/visitor.png new file mode 100755 index 0000000..77efae2 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/visitor.png Binary files differ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a811954..786ec55 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ - + 10sp 12sp @@ -47,4 +47,8 @@ 255dp + + + 80px + 128px \ No newline at end of file