diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 410e0ac..f59c8c3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -77,7 +77,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index d00d676..f57c684 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,11 @@ android {
flavorDimensions "CHANNEL_VALUE"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+ ndk {
+ //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
+ abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86","x86_64"
+ }
}
buildTypes {
@@ -130,4 +135,7 @@ dependencies {
implementation project(path: ':mylibrary')
+
+ //高德地图
+ implementation 'com.amap.api:map2d:6.0.0'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bd2bb54..95c7cd0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,18 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.dahe.gldriver">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
index b417f6b..d8e4a77 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
@@ -1,27 +1,65 @@
package com.dahe.gldriver.ui.waybill.activity
import android.os.Bundle
-import com.dahe.gldriver.R
+import android.view.View
+import com.amap.api.maps2d.AMap
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.databinding.ActivityWaybillLoadBinding
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.utils.ActivityUtils
+import com.dahe.mylibrary.utils.ToastUtils
+
/**
* @ClassName WaybillLoadActivity
* @Author john
* @Date 2024/1/29 16:52
- * @Description 运单装货
+ * @Description 运单详情-装货
*/
class WaybillLoadActivity : BaseActivity() {
+
+ var aMap: AMap? = null
override fun initView(savedInstanceState: Bundle?) {
- binding.btnLoad.setOnClickListener {
- ActivityUtils.startActivity(mContext,WaybillSuccActivity::class.java,Bundle().apply { putInt(
- AppConfig.SUCCESS_TYPE,1) })
-// ActivityUtils.startActivity(mContext,WaybillUnlLoadActivity::class.java)
+
+ setTitleBar("运单详情", View.OnClickListener { finish() }, true, "查看单据") {
+ ToastUtils.showToast(mContext, "查看单据")
+ }
+
+ binding.run {
+ mapView.onCreate(savedInstanceState)
+ if (aMap == null) mapView.map
+
+ btnRight.setOnClickListener {
+ ActivityUtils.startActivity(
+ mContext,
+ WaybillUpPicActivity::class.java,
+ Bundle().apply { putInt(AppConfig.SUCCESS_TYPE, 1) })
+ }
}
}
override fun initDate() {
}
+
+ override fun onResume() {
+ super.onResume()
+ binding.mapView.onResume();
+ }
+
+ override fun onPause() {
+ super.onPause()
+ binding.mapView.onPause();
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ binding.mapView.onSaveInstanceState(outState);
+ }
+
+ override fun onDestroy() {
+ if (binding.mapView != null)
+ binding.mapView.onDestroy();
+ super.onDestroy()
+
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillSuccActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillSuccActivity.kt
index 52d6a1a..7a2b2f2 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillSuccActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillSuccActivity.kt
@@ -14,22 +14,20 @@ import com.dahe.mylibrary.utils.ToastUtils
* @ClassName WaybillSuccActivity
* @Author john
* @Date 2024/1/29 16:42
- * @Description TODO
+ * @Description 接单 装货 卸货成功页面
*/
class WaybillSuccActivity : BaseActivity() {
override fun initView(savedInstanceState: Bundle?) {
setStatusBarColor(R.color.white)
val type = intent.extras?.getInt(AppConfig.SUCCESS_TYPE)
-
- changeType(type)
setTitleBar("接单成功", true)
+ changeType(type)
binding.run {
btnLeft.setOnClickListener {
goLeftOrRight(type,true)
}
btnRight.setOnClickListener {
goLeftOrRight(type,false)
- ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
}
}
}
@@ -44,6 +42,7 @@ class WaybillSuccActivity : BaseActivity() {
private fun changeType(type: Int?) {
when (type) {
1 -> {
+ setTitleBar("装货成功")
binding.run {
ivSucc.layoutParams.run {
width = BaseUtils.dip2px(mContext, 220f)
@@ -59,6 +58,7 @@ class WaybillSuccActivity : BaseActivity() {
}
2 -> {
+ setTitleBar("卸货成功")
binding.run {
ivSucc.layoutParams.run {
width = BaseUtils.dip2px(mContext, 220f)
@@ -79,12 +79,15 @@ class WaybillSuccActivity : BaseActivity() {
* */
private fun goLeftOrRight(type: Int?, isLeft: Boolean) {
if (isLeft){
-
- }else{
when(type){
0->ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
+ 1,2->ActivityUtils.startHomeActivity(mContext)
+ }
+ }else{
+ when(type){
+ 0->ActivityUtils.startActivity(mContext, WaybillUpPicActivity::class.java,Bundle().apply { putInt(AppConfig.SUCCESS_TYPE,1) })
1->ActivityUtils.startActivity(mContext, WaybillUnlLoadActivity::class.java)
- 2->ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
+ 2->ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
}
}
}
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt
index de4921a..a40635a 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt
@@ -1,25 +1,68 @@
package com.dahe.gldriver.ui.waybill.activity
import android.os.Bundle
+import android.view.View
+import com.amap.api.maps2d.AMap
import com.dahe.gldriver.R
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.databinding.ActivityWaybillLoadBinding
import com.dahe.gldriver.databinding.ActivityWaybillUnloadBinding
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.utils.ActivityUtils
+import com.dahe.mylibrary.utils.ToastUtils
/**
* @ClassName WaybillLoadActivity
* @Author john
* @Date 2024/1/29 16:52
- * @Description 运单卸货
+ * @Description 运单详情-卸货
*/
class WaybillUnlLoadActivity : BaseActivity() {
+
+ var aMap: AMap? = null
override fun initView(savedInstanceState: Bundle?) {
- ActivityUtils.startActivity(mContext,WaybillSuccActivity::class.java,Bundle().apply { putInt(
- AppConfig.SUCCESS_TYPE,2) })
+
+ setTitleBar("运单详情", { finish() }, true, "查看单据") {
+ ToastUtils.showToast(mContext, "查看单据")
+ }
+ binding.run {
+ mapView.onCreate(savedInstanceState)
+ if (aMap == null) mapView.map
+
+ btnRight.setOnClickListener {
+ ActivityUtils.startActivity(
+ mContext,
+ WaybillUpPicActivity::class.java,
+ Bundle().apply { putInt(AppConfig.SUCCESS_TYPE, 2) })
+ }
+ }
+
}
override fun initDate() {
}
+
+
+ override fun onResume() {
+ super.onResume()
+ binding.mapView.onResume();
+ }
+
+ override fun onPause() {
+ super.onPause()
+ binding.mapView.onPause();
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ binding.mapView.onSaveInstanceState(outState);
+ }
+
+ override fun onDestroy() {
+ if (binding.mapView != null)
+ binding.mapView.onDestroy();
+ super.onDestroy()
+
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt
new file mode 100644
index 0000000..a416515
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt
@@ -0,0 +1,43 @@
+package com.dahe.gldriver.ui.waybill.activity
+
+import android.os.Bundle
+import com.dahe.gldriver.base.AppConfig
+import com.dahe.gldriver.databinding.ActivityWaybillUppicBinding
+import com.dahe.mylibrary.base.BaseActivity
+import com.dahe.mylibrary.utils.ActivityUtils
+
+/**
+ * @ClassName WaybillUpPicActivity
+ * @Author john
+ * @Date 2024/1/30 15:56
+ * @Description 上传照片：装卸货以及回单照片
+ */
+class WaybillUpPicActivity : BaseActivity() {
+ override fun initView(savedInstanceState: Bundle?) {
+ var type = intent.extras?.getInt(AppConfig.SUCCESS_TYPE, 0)
+ if (1 == type) {
+ binding.run {
+ tvTitle.text = "装货"
+ tvPicTitle.text = "装货照片"
+ tvRece.text = "装货回单"
+ }
+ }
+
+ binding.btnUnload.setOnClickListener {
+ if (1 == type) {
+ ActivityUtils.startActivity(
+ mContext,
+ WaybillSuccActivity::class.java,
+ Bundle().apply { putInt(AppConfig.SUCCESS_TYPE, 1) })
+ }else{
+ ActivityUtils.startActivity(
+ mContext,
+ WaybillSuccActivity::class.java,
+ Bundle().apply { putInt(AppConfig.SUCCESS_TYPE, 2) })
+ }
+ }
+ }
+
+ override fun initDate() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_waybill_load.xml b/app/src/main/res/layout/activity_waybill_load.xml
index 700fca9..0a00293 100644
--- a/app/src/main/res/layout/activity_waybill_load.xml
+++ b/app/src/main/res/layout/activity_waybill_load.xml
@@ -8,35 +8,24 @@
android:orientation="vertical">
+ android:layout_height="@dimen/dp_80"
+ android:background="@drawable/waybill_top_bg"
+ android:gravity="bottom">
-
-
-
+
+
+
@@ -45,6 +34,10 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -220,14 +91,441 @@
android:layout_alignBottom="@+id/ivHead"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivHead"
- android:text="请按照要求上传装货回单"
+ android:text="交易200 好评率89%"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_waybill_unload.xml b/app/src/main/res/layout/activity_waybill_unload.xml
index b33dcae..586777a 100644
--- a/app/src/main/res/layout/activity_waybill_unload.xml
+++ b/app/src/main/res/layout/activity_waybill_unload.xml
@@ -8,35 +8,24 @@
android:orientation="vertical">
+ android:layout_height="@dimen/dp_80"
+ android:background="@drawable/waybill_top_bg"
+ android:gravity="bottom">
-
-
-
+
+
+
@@ -45,6 +34,10 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -220,14 +91,441 @@
android:layout_alignBottom="@+id/ivHead"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivHead"
- android:text="请按照要求上传装货回单"
+ android:text="交易200 好评率89%"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+