parent
							
								
									41665bb037
								
							
						
					
					
						commit
						9b7f8a4edf
					
				
				 14 changed files with 358 additions and 140 deletions
			
			
		| @ -1,34 +0,0 @@ | ||||
| package com.project.survey.model | ||||
| 
 | ||||
| import androidx.annotation.Keep | ||||
| 
 | ||||
| /** | ||||
|  * { | ||||
|  *     "KZW_TYPE_CODE": "02", | ||||
|  *     "SY_CREATEUSERID": "c1c843dd971f416da307f5fefa9d782e", | ||||
|  *     "KZW_TYPE_NAME": "专用", | ||||
|  *     "KZW_APPROVALSTATUS": "", | ||||
|  *     "KZW_VERSION": "2024-09-2704", | ||||
|  *     "SY_GROUP_COMPANY_ID": "", | ||||
|  *     "KZW_MEASUREMENTLEVEL": "2", | ||||
|  *     "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM", | ||||
|  *     "KZW_FILE": "", | ||||
|  *     "SY_CREATEUSERNAME": "zlh", | ||||
|  *     "KZW_MEASUREMENTUNIT": "", | ||||
|  *     "KZW_REMARK": "", | ||||
|  *     "BD_KZW_ID": "14faecf400d74001ad37ca7b349e9de7", | ||||
|  *     "SY_CREATETIME": "2024-09-27 15:36:26", | ||||
|  *     "SY_ORG_ID": "systemdepartment", | ||||
|  *     "": "2024-09-27", | ||||
|  *     "KZW_LCMC": "专用控制网测试2", | ||||
|  *     "KZW_MEASUREMENTUNIT_ID": "", | ||||
|  *     "KZW_NAME": "专用", | ||||
|  *     "BD_XMXX_ID": "" | ||||
|  * } | ||||
|  */ | ||||
| @Keep | ||||
| data class ControlNetBean( | ||||
|     val KZW_NAME:String, | ||||
|     val KZW_MEASUREMENTLEVEL:String, | ||||
|     val KZW_MEASUREMENTTIME:String | ||||
| ) | ||||
| @ -0,0 +1,53 @@ | ||||
| package com.project.survey.model | ||||
| 
 | ||||
| import androidx.annotation.Keep | ||||
| 
 | ||||
| /** | ||||
|  * { | ||||
|  *         "SY_MODIFYORGID": "XX5DVbDl1Jl7FDtJJtX", | ||||
|  *         "KZW_TYPE_CODE": "02", | ||||
|  *         "SY_MODIFYTIME": "2024-09-06 13:42:57", | ||||
|  *         "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM", | ||||
|  *         "$TABLE_CODE$": null, | ||||
|  *         "SY_CREATEUSERNAME": "管理员", | ||||
|  *         "BD_KZWZBCG_ID": "9db3f927274246f0913443e7c3fd4a61", | ||||
|  *         "SY_ORDERINDEX": 2, | ||||
|  *         "KZWZBCG_BZ": "125", | ||||
|  *         "SY_MODIFYUSERID": "116d15ddbe62412aa32aafb5dc8f13bb", | ||||
|  *         "SY_GROUP_COMPANY_NAME": "", | ||||
|  *         "KZWZBCG_XCOORDINATE": "32", | ||||
|  *         "SY_COMPANY_NAME": "某某公司", | ||||
|  *         "BD_XMXX_ID": "123", | ||||
|  *         "KZW_NAME": "专用", | ||||
|  *         "SY_CREATEORGID": "XX5DVbDl1Jl7FDtJJtX", | ||||
|  *         "SY_STATUS": "1", | ||||
|  *         "SY_CREATEUSERID": "116d15ddbe62412aa32aafb5dc8f13bb", | ||||
|  *         "KZW_TYPE_NAME": "", | ||||
|  *         "SY_GROUP_COMPANY_ID": "", | ||||
|  *         "SY_MODIFYORGNAME": "系统管理部", | ||||
|  *         "BD_KZW_ID": "a67961a4b61441b19b27fc56572e7517", | ||||
|  *         "SY_CREATEORGNAME": "系统管理部", | ||||
|  *         "SY_CREATETIME": "2024-09-06 13:36:27", | ||||
|  *         "SY_ORG_ID": "systemdepartment", | ||||
|  *         "KZW_MEASUREMENTTIME": "", | ||||
|  *         "KZWZBCG_YCOORDINATE": "12", | ||||
|  *         "SY_MODIFYUSERNAME": "管理员", | ||||
|  *         "KZWZBCG_HCOORDINATE": "56", | ||||
|  *         "KZWZBCG_VERSION": "", | ||||
|  *         "KZWZBCG_POINTNAME": "dmc" | ||||
|  *       } | ||||
|  */ | ||||
| @Keep | ||||
| data class ControlNetworkBean( | ||||
|     val KZW_NAME: String, //	控制网名称 | ||||
|     val KZW_TYPE_CODE: String, //控制网类型 | ||||
|     val KZW_TYPE_NAME: String, //控制网类型_name | ||||
|     val KZW_MEASUREMENTTIME: String, //	施测时间 | ||||
| 
 | ||||
|     val KZWZBCG_POINTNAME: String, //点名称 | ||||
|     val KZWZBCG_XCOORDINATE: String, //x | ||||
|     val KZWZBCG_YCOORDINATE: String, //y | ||||
|     val KZWZBCG_HCOORDINATE: String, //h | ||||
|     val KZWZBCG_BZ: String, //备注 | ||||
| 
 | ||||
| ) | ||||
| @ -0,0 +1,49 @@ | ||||
| package com.project.survey.model | ||||
| 
 | ||||
| import androidx.annotation.Keep | ||||
| 
 | ||||
| /** | ||||
|  * { | ||||
|  *         "values": { | ||||
|  *           "SY_MODIFYORGID": null, | ||||
|  *           "KZW_TYPE_CODE": "02", | ||||
|  *           "SY_MODIFYTIME": null, | ||||
|  *           "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM", | ||||
|  *           "SY_CREATEUSERNAME": "管理员", | ||||
|  *           "BD_KZWZBCG_ID": "13365023de99403b9a07fdf8079d72c7", | ||||
|  *           "SY_ORDERINDEX": 1, | ||||
|  *           "KZWZBCG_BZ": "备注二", | ||||
|  *           "SY_MODIFYUSERID": null, | ||||
|  *           "SY_GROUP_COMPANY_NAME": "", | ||||
|  *           "SY_COMPANY_NAME": "某某公司", | ||||
|  *           "KZWZBCG_XCOORDINATE": "11.25", | ||||
|  *           "BD_XMXX_ID": null, | ||||
|  *           "KZW_NAME": "专用", | ||||
|  *           "SY_CREATEORGID": "XX5DVbDl1Jl7FDtJJtX", | ||||
|  *           "SY_STATUS": null, | ||||
|  *           "SY_CREATEUSERID": "116d15ddbe62412aa32aafb5dc8f13bb", | ||||
|  *           "KZW_TYPE_NAME": null, | ||||
|  *           "SY_GROUP_COMPANY_ID": "", | ||||
|  *           "SY_MODIFYORGNAME": null, | ||||
|  *           "SY_CREATETIME": "2024-09-11", | ||||
|  *           "SY_CREATEORGNAME": "系统管理部", | ||||
|  *           "BD_KZW_ID": "53ed633f946545aa836160fd30f3c2a2", | ||||
|  *           "SY_ORG_ID": "systemdepartment", | ||||
|  *           "KZW_MEASUREMENTTIME": null, | ||||
|  *           "KZWZBCG_YCOORDINATE": "21.56", | ||||
|  *           "SY_MODIFYUSERNAME": null, | ||||
|  *           "KZWZBCG_VERSION": null, | ||||
|  *           "KZWZBCG_HCOORDINATE": "6.36", | ||||
|  *           "KZWZBCG_POINTNAME": "点位二" | ||||
|  *         }, | ||||
|  *         "tenantIdField": "SY_TENANT_ID", | ||||
|  *         "tenantNameField": "SY_TENANT_NAME", | ||||
|  *         "tableCode": null, | ||||
|  *         "pkValue": null, | ||||
|  *         "pkCode": null | ||||
|  *       } | ||||
|  */ | ||||
| @Keep | ||||
| data class ControlNetworkInfoBean( | ||||
|     val values: ControlNetworkBean | ||||
| ) | ||||
| @ -1,27 +0,0 @@ | ||||
| package com.project.survey.ui.controlnet.adapter | ||||
| 
 | ||||
| import android.content.Context | ||||
| import android.view.ViewGroup | ||||
| import com.chad.library.adapter4.BaseQuickAdapter | ||||
| import com.chad.library.adapter4.viewholder.QuickViewHolder | ||||
| import com.project.survey.R | ||||
| import com.project.survey.model.ControlNetBean | ||||
| 
 | ||||
| class ControlNetSpecialAdapter : BaseQuickAdapter<ControlNetBean, QuickViewHolder>() { | ||||
| 
 | ||||
|     override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: ControlNetBean?) { | ||||
|         item?.let { bean -> | ||||
|             holder.setText(R.id.tvName, bean.KZW_NAME) | ||||
|                 .setText(R.id.tvLevel, bean.KZW_MEASUREMENTLEVEL) | ||||
|                 .setText(R.id.tvTime, bean.KZW_MEASUREMENTTIME) | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     override fun onCreateViewHolder( | ||||
|         context: Context, | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int | ||||
|     ): QuickViewHolder { | ||||
|         return QuickViewHolder(R.layout.item_control_net_special, parent) | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,31 @@ | ||||
| package com.project.survey.ui.controlnet.adapter | ||||
| 
 | ||||
| import android.content.Context | ||||
| import android.view.ViewGroup | ||||
| import com.chad.library.adapter4.BaseQuickAdapter | ||||
| import com.chad.library.adapter4.viewholder.QuickViewHolder | ||||
| import com.project.survey.R | ||||
| import com.project.survey.model.ControlNetworkBean | ||||
| 
 | ||||
| class SpecialControlNetworkAdapter : BaseQuickAdapter<ControlNetworkBean, QuickViewHolder>() { | ||||
| 
 | ||||
|     override fun onBindViewHolder( | ||||
|         holder: QuickViewHolder, | ||||
|         position: Int, | ||||
|         item: ControlNetworkBean? | ||||
|     ) { | ||||
|         if (item == null) return | ||||
| 
 | ||||
|         holder.setText(R.id.tvName, item.KZW_NAME) | ||||
|             .setText(R.id.tvLevel, "") //TODO | ||||
|             .setText(R.id.tvTime, item.KZW_MEASUREMENTTIME) | ||||
|     } | ||||
| 
 | ||||
|     override fun onCreateViewHolder( | ||||
|         context: Context, | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int | ||||
|     ): QuickViewHolder { | ||||
|         return QuickViewHolder(R.layout.item_special_control_network, parent) | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,35 @@ | ||||
| package com.project.survey.ui.controlnet.adapter | ||||
| 
 | ||||
| import android.content.Context | ||||
| import android.view.ViewGroup | ||||
| import com.chad.library.adapter4.BaseQuickAdapter | ||||
| import com.chad.library.adapter4.viewholder.QuickViewHolder | ||||
| import com.project.survey.R | ||||
| import com.project.survey.model.ControlNetworkInfoBean | ||||
| 
 | ||||
| class SpecialControlNetworkInfoAdapter : | ||||
|     BaseQuickAdapter<ControlNetworkInfoBean, QuickViewHolder>() { | ||||
| 
 | ||||
|     override fun onBindViewHolder( | ||||
|         holder: QuickViewHolder, | ||||
|         position: Int, | ||||
|         item: ControlNetworkInfoBean? | ||||
|     ) { | ||||
|         if (item == null) return | ||||
| 
 | ||||
|         holder.setText(R.id.tvPointName, item.values.KZWZBCG_POINTNAME) | ||||
|             .setText(R.id.tvX, item.values.KZWZBCG_XCOORDINATE) | ||||
|             .setText(R.id.tvY, item.values.KZWZBCG_YCOORDINATE) | ||||
|             .setText(R.id.tvZ, item.values.KZWZBCG_HCOORDINATE) | ||||
|             .setText(R.id.tvTime, item.values.KZW_MEASUREMENTTIME) | ||||
|             .setText(R.id.tvRemark, item.values.KZWZBCG_BZ) | ||||
|     } | ||||
| 
 | ||||
|     override fun onCreateViewHolder( | ||||
|         context: Context, | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int | ||||
|     ): QuickViewHolder { | ||||
|         return QuickViewHolder(R.layout.item_control_net_first, parent) | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,86 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:orientation="vertical"> | ||||
| 
 | ||||
|     <!--    <include--> | ||||
|     <!--        android:id="@+id/ilToolBar"--> | ||||
|     <!--        layout="@layout/sh_toolbar" />--> | ||||
| 
 | ||||
|     <com.google.android.material.appbar.MaterialToolbar | ||||
|         android:id="@+id/toolbar" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="?actionBarSize" | ||||
|         android:background="@color/transparent" | ||||
|         app:navigationIcon="@drawable/icon_toolbar_back" | ||||
|         app:popupTheme="@style/ThemeOverlay.AppCompat.Light" | ||||
|         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||||
|         app:titleCentered="true" | ||||
|         app:titleTextAppearance="@style/ToolbarTextAppearance" /> | ||||
| 
 | ||||
|     <!--    <include--> | ||||
|     <!--        android:id="@+id/ilSearch"--> | ||||
|     <!--        layout="@layout/item_search_control_net" />--> | ||||
| 
 | ||||
|     <androidx.constraintlayout.widget.ConstraintLayout | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:gravity="center_vertical" | ||||
|         android:orientation="horizontal"> | ||||
| 
 | ||||
|         <FrameLayout | ||||
|             android:id="@+id/llSpinner" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="30dp" | ||||
|             android:layout_marginStart="16dp" | ||||
|             android:layout_marginTop="7dp" | ||||
|             android:background="@drawable/bg_search" | ||||
|             app:layout_constraintEnd_toStartOf="@id/searchWidget" | ||||
|             app:layout_constraintHorizontal_weight="1" | ||||
|             app:layout_constraintStart_toStartOf="parent" | ||||
|             app:layout_constraintTop_toTopOf="parent"> | ||||
| 
 | ||||
|             <com.project.survey.widget.materialspinner.MaterialSpinner | ||||
|                 android:id="@+id/spinner" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:layout_marginVertical="7dp" /> | ||||
| 
 | ||||
|         </FrameLayout> | ||||
| 
 | ||||
|         <View | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="2dp" | ||||
|             android:layout_marginTop="7dp" | ||||
|             android:background="@drawable/bg_search_shadow_2" | ||||
|             app:layout_constraintEnd_toEndOf="@id/llSpinner" | ||||
|             app:layout_constraintStart_toStartOf="parent" | ||||
|             app:layout_constraintTop_toBottomOf="@id/llSpinner" /> | ||||
| 
 | ||||
|         <com.project.survey.widget.SearchWidget | ||||
|             android:id="@+id/searchWidget" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             app:layout_constraintEnd_toEndOf="parent" | ||||
|             app:layout_constraintHorizontal_weight="2" | ||||
|             app:layout_constraintStart_toEndOf="@id/llSpinner" | ||||
|             app:layout_constraintTop_toTopOf="parent" | ||||
|             app:sw_hint="请输入控制网名称" /> | ||||
|     </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| 
 | ||||
|     <com.scwang.smart.refresh.layout.SmartRefreshLayout | ||||
|         android:id="@+id/smartRefreshLayout" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
| 
 | ||||
|         <androidx.recyclerview.widget.RecyclerView | ||||
|             android:id="@+id/recyclerView" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             android:padding="@dimen/sw_12dp" | ||||
|             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> | ||||
|     </com.scwang.smart.refresh.layout.SmartRefreshLayout> | ||||
| 
 | ||||
| </LinearLayout> | ||||
					Loading…
					
					
				
		Reference in new issue