diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt index eef55bc..2010085 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -3,14 +3,12 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.show -class NewMarkerDetailDialog(context: Context, private val markerId: String) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class NewMarkerDetailDialog(context: Context, private val markerId: String) : Dialog(context) { private val binding: DialogNewMarkerDetailBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt index eef55bc..2010085 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -3,14 +3,12 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.show -class NewMarkerDetailDialog(context: Context, private val markerId: String) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class NewMarkerDetailDialog(context: Context, private val markerId: String) : Dialog(context) { private val binding: DialogNewMarkerDetailBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt index 303df7a..8d0385d 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt @@ -23,9 +23,10 @@ import com.pengxh.kt.lite.extensions.sp2px import kotlin.math.cos import kotlin.math.sin +import androidx.core.graphics.toColorInt -class RadarScanView constructor(context: Context, attrs: AttributeSet) : View(context, attrs) { +class RadarScanView(context: Context, attrs: AttributeSet) : View(context, attrs) { private val kTag = "RadarScanView" @@ -100,7 +101,7 @@ init { val type = context.obtainStyledAttributes(attrs, R.styleable.RadarScanView) borderColor = type.getColor( - R.styleable.RadarScanView_radar_borderColor, Color.parseColor("#8000FFF0") + R.styleable.RadarScanView_radar_borderColor, "#8000FFF0".toColorInt() ) border = type.getDimensionPixelOffset(R.styleable.RadarScanView_radar_border, 1) circleCount = type.getInt(R.styleable.RadarScanView_radar_circleCount, 4) diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt index eef55bc..2010085 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -3,14 +3,12 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.show -class NewMarkerDetailDialog(context: Context, private val markerId: String) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class NewMarkerDetailDialog(context: Context, private val markerId: String) : Dialog(context) { private val binding: DialogNewMarkerDetailBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt index 303df7a..8d0385d 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt @@ -23,9 +23,10 @@ import com.pengxh.kt.lite.extensions.sp2px import kotlin.math.cos import kotlin.math.sin +import androidx.core.graphics.toColorInt -class RadarScanView constructor(context: Context, attrs: AttributeSet) : View(context, attrs) { +class RadarScanView(context: Context, attrs: AttributeSet) : View(context, attrs) { private val kTag = "RadarScanView" @@ -100,7 +101,7 @@ init { val type = context.obtainStyledAttributes(attrs, R.styleable.RadarScanView) borderColor = type.getColor( - R.styleable.RadarScanView_radar_borderColor, Color.parseColor("#8000FFF0") + R.styleable.RadarScanView_radar_borderColor, "#8000FFF0".toColorInt() ) border = type.getDimensionPixelOffset(R.styleable.RadarScanView_radar_border, 1) circleCount = type.getInt(R.styleable.RadarScanView_radar_circleCount, 4) diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt index 1bda78e..149cac1 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt @@ -3,7 +3,6 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogRtkConfigBinding import com.casic.common.detector.gd.utils.LocaleConstant import com.pengxh.kt.lite.extensions.binding @@ -11,8 +10,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues -class RtkConfigDialog(private val context: Context) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class RtkConfigDialog(private val context: Context) : Dialog(context) { private val binding: DialogRtkConfigBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt index eef55bc..2010085 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -3,14 +3,12 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.show -class NewMarkerDetailDialog(context: Context, private val markerId: String) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class NewMarkerDetailDialog(context: Context, private val markerId: String) : Dialog(context) { private val binding: DialogNewMarkerDetailBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt index 303df7a..8d0385d 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt @@ -23,9 +23,10 @@ import com.pengxh.kt.lite.extensions.sp2px import kotlin.math.cos import kotlin.math.sin +import androidx.core.graphics.toColorInt -class RadarScanView constructor(context: Context, attrs: AttributeSet) : View(context, attrs) { +class RadarScanView(context: Context, attrs: AttributeSet) : View(context, attrs) { private val kTag = "RadarScanView" @@ -100,7 +101,7 @@ init { val type = context.obtainStyledAttributes(attrs, R.styleable.RadarScanView) borderColor = type.getColor( - R.styleable.RadarScanView_radar_borderColor, Color.parseColor("#8000FFF0") + R.styleable.RadarScanView_radar_borderColor, "#8000FFF0".toColorInt() ) border = type.getDimensionPixelOffset(R.styleable.RadarScanView_radar_border, 1) circleCount = type.getInt(R.styleable.RadarScanView_radar_circleCount, 4) diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt index 1bda78e..149cac1 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt @@ -3,7 +3,6 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogRtkConfigBinding import com.casic.common.detector.gd.utils.LocaleConstant import com.pengxh.kt.lite.extensions.binding @@ -11,8 +10,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues -class RtkConfigDialog(private val context: Context) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class RtkConfigDialog(private val context: Context) : Dialog(context) { private val binding: DialogRtkConfigBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt index a6ede2a..deb4294 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt @@ -12,7 +12,7 @@ import com.casic.common.detector.gd.R import com.pengxh.kt.lite.extensions.getScreenWidth -class SamplePopupWindow constructor(context: Context) : PopupWindow() { +class SamplePopupWindow(context: Context) : PopupWindow() { private var clickListener: OnPopupWindowClickListener? = null private var showPosition = -1 diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt index 88535fb..0f6cdea 100644 --- a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -2,14 +2,14 @@ import android.app.Dialog import android.graphics.Color -import android.graphics.drawable.ColorDrawable +import androidx.core.graphics.drawable.toDrawable import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth import kotlin.math.roundToInt fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt index 69daeb3..6631224 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocationKit.kt @@ -14,7 +14,7 @@ import com.casic.common.detector.gd.callback.OnGetAddressListener import com.casic.common.detector.gd.callback.OnGetLocationListener -class LocationKit constructor(context: Context) { +class LocationKit(context: Context) { private val kTag = "LocationKit" private val locationClient by lazy { AMapLocationClient(context) } diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt index 81a2697..3b5144f 100644 --- a/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt +++ b/app/src/main/java/com/casic/common/detector/gd/utils/RTK.kt @@ -15,7 +15,6 @@ import com.pengxh.kt.lite.utils.SaveKeyValues object RTK { - private const val kTag = "RTK" private val handler by lazy { Handler(Looper.getMainLooper()) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt index eef55bc..2010085 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -3,14 +3,12 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.show -class NewMarkerDetailDialog(context: Context, private val markerId: String) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class NewMarkerDetailDialog(context: Context, private val markerId: String) : Dialog(context) { private val binding: DialogNewMarkerDetailBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt index 303df7a..8d0385d 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RadarScanView.kt @@ -23,9 +23,10 @@ import com.pengxh.kt.lite.extensions.sp2px import kotlin.math.cos import kotlin.math.sin +import androidx.core.graphics.toColorInt -class RadarScanView constructor(context: Context, attrs: AttributeSet) : View(context, attrs) { +class RadarScanView(context: Context, attrs: AttributeSet) : View(context, attrs) { private val kTag = "RadarScanView" @@ -100,7 +101,7 @@ init { val type = context.obtainStyledAttributes(attrs, R.styleable.RadarScanView) borderColor = type.getColor( - R.styleable.RadarScanView_radar_borderColor, Color.parseColor("#8000FFF0") + R.styleable.RadarScanView_radar_borderColor, "#8000FFF0".toColorInt() ) border = type.getDimensionPixelOffset(R.styleable.RadarScanView_radar_border, 1) circleCount = type.getInt(R.styleable.RadarScanView_radar_circleCount, 4) diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt index 1bda78e..149cac1 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/RtkConfigDialog.kt @@ -3,7 +3,6 @@ import android.app.Dialog import android.content.Context import android.os.Bundle -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.databinding.DialogRtkConfigBinding import com.casic.common.detector.gd.utils.LocaleConstant import com.pengxh.kt.lite.extensions.binding @@ -11,8 +10,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues -class RtkConfigDialog(private val context: Context) : - Dialog(context, R.style.UserDefinedDialogStyle) { +class RtkConfigDialog(private val context: Context) : Dialog(context) { private val binding: DialogRtkConfigBinding by binding() diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt index a6ede2a..deb4294 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt @@ -12,7 +12,7 @@ import com.casic.common.detector.gd.R import com.pengxh.kt.lite.extensions.getScreenWidth -class SamplePopupWindow constructor(context: Context) : PopupWindow() { +class SamplePopupWindow(context: Context) : PopupWindow() { private var clickListener: OnPopupWindowClickListener? = null private var showPosition = -1 diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt index a5319bf..b9613b8 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt @@ -9,13 +9,10 @@ import android.location.Location import android.location.LocationListener import android.location.LocationManager -import android.os.Build import android.os.Bundle import android.util.Log -import androidx.annotation.RequiresApi import androidx.core.app.ActivityCompat import com.amap.api.location.AMapLocation -import com.casic.common.detector.gd.R import com.casic.common.detector.gd.adapter.SatelliteRecyclerAdapter import com.casic.common.detector.gd.callback.OnGetLocationListener import com.casic.common.detector.gd.databinding.DialogSatelliteStatusBinding @@ -28,9 +25,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.TitleBarView -@RequiresApi(Build.VERSION_CODES.N) -class SatelliteStatusDialog(private val context: Context) : - Dialog(context, R.style.UserDefinedDialogStyle), LocationListener { +class SatelliteStatusDialog(private val context: Context) : Dialog(context), LocationListener { private val kTag = "SatelliteStatusDialog" private val locationManager by lazy { context.getSystemService(Context.LOCATION_SERVICE) as LocationManager }