diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 22b9e42..4f9c2da 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 22b9e42..4f9c2da 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 22b9e42..4f9c2da 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 22b9e42..4f9c2da 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> (R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 605dba4..4653f8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -53,7 +52,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index b209398..179ef85 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -52,7 +51,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index c163f99..3299f0a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -51,7 +50,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index cf84af3..8f6451b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation @@ -62,7 +61,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 7d7b57c..42cce73 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -28,11 +27,7 @@ import com.casic.app.smartwell.vm.WellListViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel -import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.obtainScreenHeight import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.EasyPopupWindow import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -176,7 +171,6 @@ //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) - homeView.homeRecyclerView.layoutManager = GridLayoutManager(requireContext(), 3) homeView.homeRecyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnGridItemClickListener(object : HomeRecycleAdapter.OnGridItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 93d65b1..0f58a8d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -2,7 +2,6 @@ import android.os.CountDownTimer import android.os.Handler -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.NoticeDataAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -119,7 +118,6 @@ } else { emptyView!!.hide() noticeDataAdapter = NoticeDataAdapter(requireContext(), dataBeans) - noticeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) noticeRecyclerView!!.adapter = noticeDataAdapter noticeDataAdapter.setOnItemClickListener(object : NoticeDataAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index b9ba109..df89ee4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - completedOrderView!!.layoutManager = LinearLayoutManager(requireContext()) completedOrderView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index ae01520..f341b9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -121,7 +120,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - inHandleView!!.layoutManager = LinearLayoutManager(requireContext()) inHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 753eca4..7f1a260 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -104,7 +103,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 72140e4..beaf4c5 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -126,7 +125,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 488108a..ee70413 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -129,7 +128,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 52bf876..c9dbad1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -107,7 +106,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index bd3adf3..58ba4d8 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,25 +6,30 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -75,7 +80,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 196fe19..c574564 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,15 +8,13 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import com.casic.app.smartwell.model.NoticeLocaleBean; - -import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; +import java.util.Map; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -36,7 +34,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index eae1c85..e608096 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,13 +3,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import com.casic.app.smartwell.model.NoticeLocaleBean; + import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; -import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; - -import com.casic.app.smartwell.model.NoticeLocaleBean; +import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index bc18b26..16817af 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SearchResultAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -175,7 +174,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 38f6e0b..7ac89fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter @@ -156,7 +155,6 @@ } else { emptyView!!.hide() wellListAdapter = WellListAdapter(this, dataBeans) - wellListView!!.layoutManager = LinearLayoutManager(this) wellListView!!.adapter = wellListAdapter wellListAdapter.setOnItemClickListener(object : WellListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 8799e63..ea70c86 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -2,7 +2,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage @@ -58,9 +57,7 @@ } } else { emptyView!!.hide() - val sensorListAdapter = SensorListAdapter(this, it.data!!) - sensorListView!!.layoutManager = LinearLayoutManager(this) - sensorListView!!.adapter = sensorListAdapter + sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index b6fa48f..947b549 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter @@ -193,7 +192,6 @@ } else { emptyView!!.hide() wellOperationAdapter = WellOperationAdapter(this, dataBeans) - operationListView!!.layoutManager = LinearLayoutManager(this) operationListView!!.adapter = wellOperationAdapter wellOperationAdapter.setOnItemClickListener(object : WellOperationAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 22b9e42..4f9c2da 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R import com.casic.app.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index c6512d5..c1bb352 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index a695043..dbb2f8c 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -1,5 +1,6 @@ + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d6ddbb1..69f8894 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -72,7 +72,9 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml index bae0342..95c2200 100644 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ b/app/src/main/res/layout/item_search_result_rv.xml @@ -124,7 +124,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:nestedScrollingEnabled="false" - android:scrollbars="none" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />