diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index df5e1df..9d629c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -20,7 +20,6 @@ import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel -import com.casic.birmm.inspect.vm.TaskRecordViewModel import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -94,17 +93,6 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) - // - val taskViewModel = ViewModelProvider(this).get(TaskRecordViewModel::class.java) - taskViewModel.searchByInspection(inspectionId = id) - taskViewModel.resultModel.observe(this@InspectRouteActivity, Observer { taskModel -> - taskModel.data!!.list?.forEach { listBean -> - addMarker(LatLng(listBean.lat, listBean.lng), R.mipmap.jingshi) - } - }) - taskViewModel.loadState.observe(this@InspectRouteActivity, Observer { - "抱歉，无法查询到相关记录".show(this@InspectRouteActivity) - }) //画线 val latLngPoints: ArrayList = ArrayList() pointArray.forEach { point -> @@ -115,9 +103,6 @@ PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) ) }) - detailViewModel.loadState.observe(this, Observer { - "抱歉，无法查询到相关记录".show(this) - }) } fun initEvent() { diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index df5e1df..9d629c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -20,7 +20,6 @@ import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel -import com.casic.birmm.inspect.vm.TaskRecordViewModel import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -94,17 +93,6 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) - // - val taskViewModel = ViewModelProvider(this).get(TaskRecordViewModel::class.java) - taskViewModel.searchByInspection(inspectionId = id) - taskViewModel.resultModel.observe(this@InspectRouteActivity, Observer { taskModel -> - taskModel.data!!.list?.forEach { listBean -> - addMarker(LatLng(listBean.lat, listBean.lng), R.mipmap.jingshi) - } - }) - taskViewModel.loadState.observe(this@InspectRouteActivity, Observer { - "抱歉，无法查询到相关记录".show(this@InspectRouteActivity) - }) //画线 val latLngPoints: ArrayList = ArrayList() pointArray.forEach { point -> @@ -115,9 +103,6 @@ PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) ) }) - detailViewModel.loadState.observe(this, Observer { - "抱歉，无法查询到相关记录".show(this) - }) } fun initEvent() { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index eb91fad..306e6aa 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -21,16 +21,14 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.AMapUtils +import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean import com.casic.birmm.inspect.bean.InspectionBean import com.casic.birmm.inspect.bean.LocationBean -import com.casic.birmm.inspect.extensions.id -import com.casic.birmm.inspect.extensions.show -import com.casic.birmm.inspect.extensions.toDecStringList -import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.* import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -95,6 +93,7 @@ private class WeakReferenceHandler(activity: MapActivity) : Handler() { private val activity: WeakReference = WeakReference(activity) + @SuppressLint("SetTextI18n") override fun handleMessage(msg: Message) { val mapActivity = activity.get() ?: return @@ -111,7 +110,7 @@ } Constant.DISCOVERY_DEVICE -> { val bean = msg.obj as BlueToothBean - if (mapActivity.blueToothBeans.size == 0) { + if (mapActivity.blueToothBeans.size == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } else { //0表示未添加到list的新设备，1表示已经扫描并添加到list的设备 @@ -122,27 +121,32 @@ break } } - if (judge == 0) { + if (judge == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } } } Constant.DISCOVERY_OUT_TIME -> { OtherUtils.dismissLoadingDialog() - val sheetBuilder = - QMUIBottomSheet.BottomListSheetBuilder(mapActivity) - sheetBuilder.setTitle("请选择要连接的设备") - mapActivity.blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (mapActivity.blueToothBeans.size == 0) { + "无可用设备，请确认设备是否已经开启".show(mapActivity) + } else { + val sheetBuilder = + QMUIBottomSheet.BottomListSheetBuilder(mapActivity) + sheetBuilder.setTitle("请选择要连接的设备") + mapActivity.blueToothBeans.forEach { + sheetBuilder.addItem(it.bluetoothDevice.name) + Log.d(Tag, it.bluetoothDevice.name) + } + sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) + .setOnSheetItemClickListener { dialog, _, position, _ -> + dialog.dismiss() + //连接点击的设备 + mapActivity.startConnectDevice( + mapActivity.blueToothBeans[position].bluetoothDevice + ) + }.build().show() } - sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) - .setOnSheetItemClickListener { dialog, _, position, _ -> - dialog.dismiss() - //连接点击的设备 - mapActivity.startConnectDevice( - mapActivity.blueToothBeans[position].bluetoothDevice - ) - }.build().show() } Constant.CONNECT_SUCCESS -> { OtherUtils.dismissLoadingDialog() @@ -403,6 +407,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //显示定位小蓝点 locationStyle = MyLocationStyle() + locationStyle locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle @@ -510,7 +515,7 @@ message.what = Constant.DISCOVERY_OUT_TIME weakReferenceHandler.sendMessage(message) } - }, 5 * 1000) + }, 3 * 1000) } private fun selectInspectMode() { @@ -556,8 +561,9 @@ * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean * */ private fun startInspection() { - Log.d(Tag, "开始巡检") + Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { + aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) if (routes.size <= 2) { routes.add(LocationBean(it.longitude, it.latitude)) } else { diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index df5e1df..9d629c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -20,7 +20,6 @@ import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel -import com.casic.birmm.inspect.vm.TaskRecordViewModel import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -94,17 +93,6 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) - // - val taskViewModel = ViewModelProvider(this).get(TaskRecordViewModel::class.java) - taskViewModel.searchByInspection(inspectionId = id) - taskViewModel.resultModel.observe(this@InspectRouteActivity, Observer { taskModel -> - taskModel.data!!.list?.forEach { listBean -> - addMarker(LatLng(listBean.lat, listBean.lng), R.mipmap.jingshi) - } - }) - taskViewModel.loadState.observe(this@InspectRouteActivity, Observer { - "抱歉，无法查询到相关记录".show(this@InspectRouteActivity) - }) //画线 val latLngPoints: ArrayList = ArrayList() pointArray.forEach { point -> @@ -115,9 +103,6 @@ PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) ) }) - detailViewModel.loadState.observe(this, Observer { - "抱歉，无法查询到相关记录".show(this) - }) } fun initEvent() { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index eb91fad..306e6aa 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -21,16 +21,14 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.AMapUtils +import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean import com.casic.birmm.inspect.bean.InspectionBean import com.casic.birmm.inspect.bean.LocationBean -import com.casic.birmm.inspect.extensions.id -import com.casic.birmm.inspect.extensions.show -import com.casic.birmm.inspect.extensions.toDecStringList -import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.* import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -95,6 +93,7 @@ private class WeakReferenceHandler(activity: MapActivity) : Handler() { private val activity: WeakReference = WeakReference(activity) + @SuppressLint("SetTextI18n") override fun handleMessage(msg: Message) { val mapActivity = activity.get() ?: return @@ -111,7 +110,7 @@ } Constant.DISCOVERY_DEVICE -> { val bean = msg.obj as BlueToothBean - if (mapActivity.blueToothBeans.size == 0) { + if (mapActivity.blueToothBeans.size == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } else { //0表示未添加到list的新设备，1表示已经扫描并添加到list的设备 @@ -122,27 +121,32 @@ break } } - if (judge == 0) { + if (judge == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } } } Constant.DISCOVERY_OUT_TIME -> { OtherUtils.dismissLoadingDialog() - val sheetBuilder = - QMUIBottomSheet.BottomListSheetBuilder(mapActivity) - sheetBuilder.setTitle("请选择要连接的设备") - mapActivity.blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (mapActivity.blueToothBeans.size == 0) { + "无可用设备，请确认设备是否已经开启".show(mapActivity) + } else { + val sheetBuilder = + QMUIBottomSheet.BottomListSheetBuilder(mapActivity) + sheetBuilder.setTitle("请选择要连接的设备") + mapActivity.blueToothBeans.forEach { + sheetBuilder.addItem(it.bluetoothDevice.name) + Log.d(Tag, it.bluetoothDevice.name) + } + sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) + .setOnSheetItemClickListener { dialog, _, position, _ -> + dialog.dismiss() + //连接点击的设备 + mapActivity.startConnectDevice( + mapActivity.blueToothBeans[position].bluetoothDevice + ) + }.build().show() } - sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) - .setOnSheetItemClickListener { dialog, _, position, _ -> - dialog.dismiss() - //连接点击的设备 - mapActivity.startConnectDevice( - mapActivity.blueToothBeans[position].bluetoothDevice - ) - }.build().show() } Constant.CONNECT_SUCCESS -> { OtherUtils.dismissLoadingDialog() @@ -403,6 +407,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //显示定位小蓝点 locationStyle = MyLocationStyle() + locationStyle locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle @@ -510,7 +515,7 @@ message.what = Constant.DISCOVERY_OUT_TIME weakReferenceHandler.sendMessage(message) } - }, 5 * 1000) + }, 3 * 1000) } private fun selectInspectMode() { @@ -556,8 +561,9 @@ * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean * */ private fun startInspection() { - Log.d(Tag, "开始巡检") + Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { + aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) if (routes.size <= 2) { routes.add(LocationBean(it.longitude, it.latitude)) } else { diff --git a/app/src/main/res/drawable/ic_add_black.xml b/app/src/main/res/drawable/ic_add_black.xml deleted file mode 100644 index 4a7fb89..0000000 --- a/app/src/main/res/drawable/ic_add_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index df5e1df..9d629c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -20,7 +20,6 @@ import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel -import com.casic.birmm.inspect.vm.TaskRecordViewModel import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -94,17 +93,6 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) - // - val taskViewModel = ViewModelProvider(this).get(TaskRecordViewModel::class.java) - taskViewModel.searchByInspection(inspectionId = id) - taskViewModel.resultModel.observe(this@InspectRouteActivity, Observer { taskModel -> - taskModel.data!!.list?.forEach { listBean -> - addMarker(LatLng(listBean.lat, listBean.lng), R.mipmap.jingshi) - } - }) - taskViewModel.loadState.observe(this@InspectRouteActivity, Observer { - "抱歉，无法查询到相关记录".show(this@InspectRouteActivity) - }) //画线 val latLngPoints: ArrayList = ArrayList() pointArray.forEach { point -> @@ -115,9 +103,6 @@ PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) ) }) - detailViewModel.loadState.observe(this, Observer { - "抱歉，无法查询到相关记录".show(this) - }) } fun initEvent() { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index eb91fad..306e6aa 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -21,16 +21,14 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.AMapUtils +import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean import com.casic.birmm.inspect.bean.InspectionBean import com.casic.birmm.inspect.bean.LocationBean -import com.casic.birmm.inspect.extensions.id -import com.casic.birmm.inspect.extensions.show -import com.casic.birmm.inspect.extensions.toDecStringList -import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.* import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -95,6 +93,7 @@ private class WeakReferenceHandler(activity: MapActivity) : Handler() { private val activity: WeakReference = WeakReference(activity) + @SuppressLint("SetTextI18n") override fun handleMessage(msg: Message) { val mapActivity = activity.get() ?: return @@ -111,7 +110,7 @@ } Constant.DISCOVERY_DEVICE -> { val bean = msg.obj as BlueToothBean - if (mapActivity.blueToothBeans.size == 0) { + if (mapActivity.blueToothBeans.size == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } else { //0表示未添加到list的新设备，1表示已经扫描并添加到list的设备 @@ -122,27 +121,32 @@ break } } - if (judge == 0) { + if (judge == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } } } Constant.DISCOVERY_OUT_TIME -> { OtherUtils.dismissLoadingDialog() - val sheetBuilder = - QMUIBottomSheet.BottomListSheetBuilder(mapActivity) - sheetBuilder.setTitle("请选择要连接的设备") - mapActivity.blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (mapActivity.blueToothBeans.size == 0) { + "无可用设备，请确认设备是否已经开启".show(mapActivity) + } else { + val sheetBuilder = + QMUIBottomSheet.BottomListSheetBuilder(mapActivity) + sheetBuilder.setTitle("请选择要连接的设备") + mapActivity.blueToothBeans.forEach { + sheetBuilder.addItem(it.bluetoothDevice.name) + Log.d(Tag, it.bluetoothDevice.name) + } + sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) + .setOnSheetItemClickListener { dialog, _, position, _ -> + dialog.dismiss() + //连接点击的设备 + mapActivity.startConnectDevice( + mapActivity.blueToothBeans[position].bluetoothDevice + ) + }.build().show() } - sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) - .setOnSheetItemClickListener { dialog, _, position, _ -> - dialog.dismiss() - //连接点击的设备 - mapActivity.startConnectDevice( - mapActivity.blueToothBeans[position].bluetoothDevice - ) - }.build().show() } Constant.CONNECT_SUCCESS -> { OtherUtils.dismissLoadingDialog() @@ -403,6 +407,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //显示定位小蓝点 locationStyle = MyLocationStyle() + locationStyle locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle @@ -510,7 +515,7 @@ message.what = Constant.DISCOVERY_OUT_TIME weakReferenceHandler.sendMessage(message) } - }, 5 * 1000) + }, 3 * 1000) } private fun selectInspectMode() { @@ -556,8 +561,9 @@ * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean * */ private fun startInspection() { - Log.d(Tag, "开始巡检") + Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { + aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) if (routes.size <= 2) { routes.add(LocationBean(it.longitude, it.latitude)) } else { diff --git a/app/src/main/res/drawable/ic_add_black.xml b/app/src/main/res/drawable/ic_add_black.xml deleted file mode 100644 index 4a7fb89..0000000 --- a/app/src/main/res/drawable/ic_add_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_blue.xml b/app/src/main/res/drawable/ic_add_blue.xml new file mode 100644 index 0000000..415972c --- /dev/null +++ b/app/src/main/res/drawable/ic_add_blue.xml @@ -0,0 +1,9 @@ + + + diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..3cc336b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,22 @@ + + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index 52e71f0..d193439 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -78,6 +78,25 @@ return isDigit && isLetter } +/** + * 判断是否只包含数字 + * + * Returns whether the given CharSequence contains only digits. + * */ +fun String.isDigitOnly(): Boolean { + val len = this.length + var cp: Int + var i = 0 + while (i < len) { + cp = Character.codePointAt(this, i) + if (!Character.isDigit(cp)) { + return false + } + i += Character.charCount(cp) + } + return true +} + fun String.isPhoneNumber(): Boolean { val regExp = "^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt index 56382d6..880487a 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt @@ -76,8 +76,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - startTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + startTime = TimeOrDateUtil.timestampToDate(millsSeconds) startDateView.setText(startTime) } .build().show(supportFragmentManager, "startDate") @@ -92,8 +92,8 @@ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) - .setCallBack { _, millseconds -> - endTime = TimeOrDateUtil.timestampToDate(millseconds) + .setCallBack { _, millsSeconds -> + endTime = TimeOrDateUtil.timestampToDate(millsSeconds) endDateView.setText(endTime) } .build().show(supportFragmentManager, "startDate") diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt index df5e1df..9d629c5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectRouteActivity.kt @@ -20,7 +20,6 @@ import com.casic.birmm.inspect.utils.PageNavigationManager import com.casic.birmm.inspect.utils.StatusBarColorUtil import com.casic.birmm.inspect.vm.InspectDetailViewModel -import com.casic.birmm.inspect.vm.TaskRecordViewModel import com.gyf.immersionbar.ImmersionBar import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_inspect_route.* @@ -94,17 +93,6 @@ addMarker(LatLng(detailData.startLat, detailData.startLng), R.mipmap.qidian) //设置终点 addMarker(LatLng(detailData.endLat, detailData.endLng), R.mipmap.zhongdian) - // - val taskViewModel = ViewModelProvider(this).get(TaskRecordViewModel::class.java) - taskViewModel.searchByInspection(inspectionId = id) - taskViewModel.resultModel.observe(this@InspectRouteActivity, Observer { taskModel -> - taskModel.data!!.list?.forEach { listBean -> - addMarker(LatLng(listBean.lat, listBean.lng), R.mipmap.jingshi) - } - }) - taskViewModel.loadState.observe(this@InspectRouteActivity, Observer { - "抱歉，无法查询到相关记录".show(this@InspectRouteActivity) - }) //画线 val latLngPoints: ArrayList = ArrayList() pointArray.forEach { point -> @@ -115,9 +103,6 @@ PolylineOptions().addAll(latLngPoints).width(10.toFloat()).color(Color.RED) ) }) - detailViewModel.loadState.observe(this, Observer { - "抱歉，无法查询到相关记录".show(this) - }) } fun initEvent() { diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index eb91fad..306e6aa 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -21,16 +21,14 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.AMapUtils +import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MyLocationStyle import com.casic.birmm.inspect.R import com.casic.birmm.inspect.bean.BlueToothBean import com.casic.birmm.inspect.bean.InspectionBean import com.casic.birmm.inspect.bean.LocationBean -import com.casic.birmm.inspect.extensions.id -import com.casic.birmm.inspect.extensions.show -import com.casic.birmm.inspect.extensions.toDecStringList -import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.* import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.* import com.casic.birmm.inspect.utils.callback.ILocationListener @@ -95,6 +93,7 @@ private class WeakReferenceHandler(activity: MapActivity) : Handler() { private val activity: WeakReference = WeakReference(activity) + @SuppressLint("SetTextI18n") override fun handleMessage(msg: Message) { val mapActivity = activity.get() ?: return @@ -111,7 +110,7 @@ } Constant.DISCOVERY_DEVICE -> { val bean = msg.obj as BlueToothBean - if (mapActivity.blueToothBeans.size == 0) { + if (mapActivity.blueToothBeans.size == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } else { //0表示未添加到list的新设备，1表示已经扫描并添加到list的设备 @@ -122,27 +121,32 @@ break } } - if (judge == 0) { + if (judge == 0 && bean.bluetoothDevice.name.isDigitOnly()) { mapActivity.blueToothBeans.add(bean) } } } Constant.DISCOVERY_OUT_TIME -> { OtherUtils.dismissLoadingDialog() - val sheetBuilder = - QMUIBottomSheet.BottomListSheetBuilder(mapActivity) - sheetBuilder.setTitle("请选择要连接的设备") - mapActivity.blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (mapActivity.blueToothBeans.size == 0) { + "无可用设备，请确认设备是否已经开启".show(mapActivity) + } else { + val sheetBuilder = + QMUIBottomSheet.BottomListSheetBuilder(mapActivity) + sheetBuilder.setTitle("请选择要连接的设备") + mapActivity.blueToothBeans.forEach { + sheetBuilder.addItem(it.bluetoothDevice.name) + Log.d(Tag, it.bluetoothDevice.name) + } + sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) + .setOnSheetItemClickListener { dialog, _, position, _ -> + dialog.dismiss() + //连接点击的设备 + mapActivity.startConnectDevice( + mapActivity.blueToothBeans[position].bluetoothDevice + ) + }.build().show() } - sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) - .setOnSheetItemClickListener { dialog, _, position, _ -> - dialog.dismiss() - //连接点击的设备 - mapActivity.startConnectDevice( - mapActivity.blueToothBeans[position].bluetoothDevice - ) - }.build().show() } Constant.CONNECT_SUCCESS -> { OtherUtils.dismissLoadingDialog() @@ -403,6 +407,7 @@ uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 //显示定位小蓝点 locationStyle = MyLocationStyle() + locationStyle locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 aMap.myLocationStyle = locationStyle @@ -510,7 +515,7 @@ message.what = Constant.DISCOVERY_OUT_TIME weakReferenceHandler.sendMessage(message) } - }, 5 * 1000) + }, 3 * 1000) } private fun selectInspectMode() { @@ -556,8 +561,9 @@ * 开始巡检，获取坐标，并且一定已经初始化了inspectionBean * */ private fun startInspection() { - Log.d(Tag, "开始巡检") + Log.d(Tag, "开始巡检[${aMap.maxZoomLevel},${aMap.minZoomLevel}]") aMap.addOnMyLocationChangeListener { + aMap.moveCamera(CameraUpdateFactory.zoomTo(16f)) if (routes.size <= 2) { routes.add(LocationBean(it.longitude, it.latitude)) } else { diff --git a/app/src/main/res/drawable/ic_add_black.xml b/app/src/main/res/drawable/ic_add_black.xml deleted file mode 100644 index 4a7fb89..0000000 --- a/app/src/main/res/drawable/ic_add_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_blue.xml b/app/src/main/res/drawable/ic_add_blue.xml new file mode 100644 index 0000000..415972c --- /dev/null +++ b/app/src/main/res/drawable/ic_add_blue.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_new_event.xml b/app/src/main/res/layout/activity_new_event.xml index 7f9559c..d69e1ee 100644 --- a/app/src/main/res/layout/activity_new_event.xml +++ b/app/src/main/res/layout/activity_new_event.xml @@ -128,13 +128,24 @@ android:layout_margin="@dimen/margin_10dp" android:orientation="vertical"> - + + + + + + - -