diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 787b6db..2563eaf 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -1,6 +1,7 @@ package com.casic.smarttube.view import android.content.Context +import android.content.Intent import android.graphics.Color import android.os.CountDownTimer import android.os.Handler @@ -171,29 +172,54 @@ }).build().show() } - //TODO 地图选点 + locationImageView.setOnClickListener { -// selectLocationLauncher.launch(Intent(this, SelectLocationActivity::class.java)) - LoadingDialogHub.show(this, "定位中，请稍后...") - LocationHelper.obtainCurrentLocation(this, - object : LocationHelper.ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - LoadingDialogHub.dismiss() - if (aMapLocation == null) { - longitudeView.text = "定位失败" - latitudeView.text = "定位失败" + BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(arrayListOf("自动定位", "手动选点")) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + when (position) { + 0 -> { + LoadingDialogHub.show(this@AddDeviceActivity, "定位中，请稍后...") + LocationHelper.obtainCurrentLocation(context, + object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation?) { + LoadingDialogHub.dismiss() + if (aMapLocation == null) { + longitudeView.text = "定位失败" + latitudeView.text = "定位失败" - longitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - longitudeView.text = aMapLocation.longitude.toString() - latitudeView.text = aMapLocation.latitude.toString() + longitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + } else { + longitudeView.text = + aMapLocation.longitude.toString() + latitudeView.text = aMapLocation.latitude.toString() - longitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) + longitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + } + } + }) + } + //TODO 地图选点 + 1 -> selectLocationLauncher.launch( + Intent(context, SelectLocationActivity::class.java) + ) } } - }) + }).build().show() } imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 787b6db..2563eaf 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -1,6 +1,7 @@ package com.casic.smarttube.view import android.content.Context +import android.content.Intent import android.graphics.Color import android.os.CountDownTimer import android.os.Handler @@ -171,29 +172,54 @@ }).build().show() } - //TODO 地图选点 + locationImageView.setOnClickListener { -// selectLocationLauncher.launch(Intent(this, SelectLocationActivity::class.java)) - LoadingDialogHub.show(this, "定位中，请稍后...") - LocationHelper.obtainCurrentLocation(this, - object : LocationHelper.ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - LoadingDialogHub.dismiss() - if (aMapLocation == null) { - longitudeView.text = "定位失败" - latitudeView.text = "定位失败" + BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(arrayListOf("自动定位", "手动选点")) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + when (position) { + 0 -> { + LoadingDialogHub.show(this@AddDeviceActivity, "定位中，请稍后...") + LocationHelper.obtainCurrentLocation(context, + object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation?) { + LoadingDialogHub.dismiss() + if (aMapLocation == null) { + longitudeView.text = "定位失败" + latitudeView.text = "定位失败" - longitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - longitudeView.text = aMapLocation.longitude.toString() - latitudeView.text = aMapLocation.latitude.toString() + longitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + } else { + longitudeView.text = + aMapLocation.longitude.toString() + latitudeView.text = aMapLocation.latitude.toString() - longitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) + longitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + } + } + }) + } + //TODO 地图选点 + 1 -> selectLocationLauncher.launch( + Intent(context, SelectLocationActivity::class.java) + ) } } - }) + }).build().show() } imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 11830bc..d7c462b 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -35,7 +35,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "选择设备实际位置" + titleView.text = "手动选点" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 787b6db..2563eaf 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -1,6 +1,7 @@ package com.casic.smarttube.view import android.content.Context +import android.content.Intent import android.graphics.Color import android.os.CountDownTimer import android.os.Handler @@ -171,29 +172,54 @@ }).build().show() } - //TODO 地图选点 + locationImageView.setOnClickListener { -// selectLocationLauncher.launch(Intent(this, SelectLocationActivity::class.java)) - LoadingDialogHub.show(this, "定位中，请稍后...") - LocationHelper.obtainCurrentLocation(this, - object : LocationHelper.ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation?) { - LoadingDialogHub.dismiss() - if (aMapLocation == null) { - longitudeView.text = "定位失败" - latitudeView.text = "定位失败" + BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(arrayListOf("自动定位", "手动选点")) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + when (position) { + 0 -> { + LoadingDialogHub.show(this@AddDeviceActivity, "定位中，请稍后...") + LocationHelper.obtainCurrentLocation(context, + object : LocationHelper.ILocationListener { + override fun onAMapLocationGet(aMapLocation: AMapLocation?) { + LoadingDialogHub.dismiss() + if (aMapLocation == null) { + longitudeView.text = "定位失败" + latitudeView.text = "定位失败" - longitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - longitudeView.text = aMapLocation.longitude.toString() - latitudeView.text = aMapLocation.latitude.toString() + longitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.redTextColor.convertColor(context) + ) + } else { + longitudeView.text = + aMapLocation.longitude.toString() + latitudeView.text = aMapLocation.latitude.toString() - longitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) - latitudeView.setTextColor(R.color.mainTextColor.convertColor(context)) + longitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + latitudeView.setTextColor( + R.color.mainTextColor.convertColor(context) + ) + } + } + }) + } + //TODO 地图选点 + 1 -> selectLocationLauncher.launch( + Intent(context, SelectLocationActivity::class.java) + ) } } - }) + }).build().show() } imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 11830bc..d7c462b 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -35,7 +35,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "选择设备实际位置" + titleView.text = "手动选点" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml index e0b4146..0dbe3dc 100644 --- a/app/src/main/res/layout/activity_add_device.xml +++ b/app/src/main/res/layout/activity_add_device.xml @@ -125,7 +125,7 @@ android:id="@+id/longitudeView" style="@style/RelativeTextViewStyle" android:layout_alignParentEnd="true" - android:hint="请点击右边定位获取" + android:hint="点击右边定位获取" android:textColorHint="@color/hintTextColor" /> @@ -141,7 +141,7 @@ android:id="@+id/latitudeView" style="@style/RelativeTextViewStyle" android:layout_alignParentEnd="true" - android:hint="请点击右边定位获取" + android:hint="点击右边定位获取" android:textColorHint="@color/hintTextColor" />