diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9aaed04..904657b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,9 +65,7 @@ - + - + () + navigatePageTo(taskId) } //标识器补全 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9aaed04..904657b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,9 +65,7 @@ - + () + navigatePageTo(taskId) } //标识器补全 diff --git a/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt index bfa7af5..384ea89 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt @@ -1,19 +1,17 @@ package com.casic.common.detector.gd.view import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.view.Gravity import android.view.View -import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.amap.api.location.AMapLocation +import com.casic.common.detector.gd.R import com.casic.common.detector.gd.adapter.EditableImageAdapter import com.casic.common.detector.gd.callback.OnGetLocationListener import com.casic.common.detector.gd.callback.OnImageCompressListener import com.casic.common.detector.gd.databinding.ActivityUploadEventBinding import com.casic.common.detector.gd.extensions.compressImage +import com.casic.common.detector.gd.extensions.initImmersionBar import com.casic.common.detector.gd.model.EventModel import com.casic.common.detector.gd.utils.LocaleConstant import com.casic.common.detector.gd.utils.LocationKit @@ -23,14 +21,15 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File class UploadEventActivity : KotlinBaseActivity() { @@ -47,7 +46,16 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } override fun observeRequestState() { @@ -66,22 +74,14 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = LinearLayout.LayoutParams.WRAP_CONTENT - window.attributes = params - - taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] - - taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String + taskId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") as String binding.userNameView.text = userName binding.uploadTimeView.text = System.currentTimeMillis().timestampToCompleteDate() + taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + locationKit.getCurrentLocation(true, object : OnGetLocationListener { override fun onSuccess(location: AMapLocation) { binding.lngView.text = "${location.longitude}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9aaed04..904657b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,9 +65,7 @@ - + () + navigatePageTo(taskId) } //标识器补全 diff --git a/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt index bfa7af5..384ea89 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/UploadEventActivity.kt @@ -1,19 +1,17 @@ package com.casic.common.detector.gd.view import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.view.Gravity import android.view.View -import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.amap.api.location.AMapLocation +import com.casic.common.detector.gd.R import com.casic.common.detector.gd.adapter.EditableImageAdapter import com.casic.common.detector.gd.callback.OnGetLocationListener import com.casic.common.detector.gd.callback.OnImageCompressListener import com.casic.common.detector.gd.databinding.ActivityUploadEventBinding import com.casic.common.detector.gd.extensions.compressImage +import com.casic.common.detector.gd.extensions.initImmersionBar import com.casic.common.detector.gd.model.EventModel import com.casic.common.detector.gd.utils.LocaleConstant import com.casic.common.detector.gd.utils.LocationKit @@ -23,14 +21,15 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File class UploadEventActivity : KotlinBaseActivity() { @@ -47,7 +46,16 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } override fun observeRequestState() { @@ -66,22 +74,14 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = LinearLayout.LayoutParams.WRAP_CONTENT - window.attributes = params - - taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] - - taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String + taskId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") as String binding.userNameView.text = userName binding.uploadTimeView.text = System.currentTimeMillis().timestampToCompleteDate() + taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + locationKit.getCurrentLocation(true, object : OnGetLocationListener { override fun onSuccess(location: AMapLocation) { binding.lngView.text = "${location.longitude}" diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml index 2280965..5185031 100644 --- a/app/src/main/res/layout/activity_upload_event.xml +++ b/app/src/main/res/layout/activity_upload_event.xml @@ -1,219 +1,203 @@ - + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> + + + + - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -