denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kotlin java冲突处理

Browse Source
This commit is contained in:
lijia 2024-01-30 10:15:53 +08:00
parent 434e59db97
commit 91656850c5
20 changed files with 803 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/misc.xml
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">

23
app/build.gradle
View File

@ -6,6 +6,20 @@ def releaseTime() {
return new Date().format("yyyyMMddHHmm", TimeZone.getTimeZone("GMT+08:00"))
}
android {
signingConfigs {
config {
keyAlias 'key0'
keyPassword '210419'
storeFile file('gldriver.jks')
storePassword '210419'
v1SigningEnabled true
v2SigningEnabled true
}
}
compileSdk rootProject.ext.android["compileSdkVersion"]
defaultConfig {
@ -23,6 +37,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.config
}
debug {
signingConfig signingConfigs.config
}
}
compileOptions {
@ -37,6 +55,11 @@ android {
viewBinding = true
}
lintOptions {
checkReleaseBuilds false
abortOnError false
}
sourceSets {
main {
jniLibs.srcDir 'libs'

19
app/src/main/AndroidManifest.xml
View File

@ -138,6 +138,25 @@
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".ui.waybill.activity.WaybillSuccActivity"
android:configChanges="keyboardHidden|orientation|locale"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".ui.waybill.activity.WaybillLoadActivity"
android:configChanges="keyboardHidden|orientation|locale"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".ui.waybill.activity.WaybillUnlLoadActivity"
android:configChanges="keyboardHidden|orientation|locale"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<!-- 运单相关end -->
</application>

1
app/src/main/java/com/dahe/gldriver/base/AppConfig.kt
View File

@ -12,5 +12,6 @@ object AppConfig {
const val ID = "DA_HE_ID"
const val PWD = "DA_HE_PHONE"
const val CODE = "DA_HE_PHONE"
const val SUCCESS_TYPE = "DA_HE_SUCCESS_TYPE"
}

5
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt
View File

@ -3,8 +3,10 @@ package com.dahe.gldriver.ui.waybill.activity
import android.graphics.Color
import android.os.Bundle
import com.dahe.gldriver.R
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.databinding.ActivityWaybillDetailBinding
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.utils.ActivityUtils
/**
* @ClassName WaybillDetailActivity
@ -14,6 +16,9 @@ import com.dahe.mylibrary.base.BaseActivity
*/
class WaybillDetailActivity :BaseActivity<ActivityWaybillDetailBinding>(){
override fun initView(savedInstanceState: Bundle?) {
binding.btnReceiving.setOnClickListener {
ActivityUtils.startActivity(mContext,WaybillSuccActivity::class.java,Bundle().apply { putInt(AppConfig.SUCCESS_TYPE,0) })
}
}
override fun initDate() {

27
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt Normal file
View File

@ -0,0 +1,27 @@
package com.dahe.gldriver.ui.waybill.activity
import android.os.Bundle
import com.dahe.gldriver.R
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.databinding.ActivityWaybillLoadBinding
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.utils.ActivityUtils
/**
* @ClassName WaybillLoadActivity
* @Author john
* @Date 2024/1/29 16:52
* @Description 运单装货
*/
class WaybillLoadActivity : BaseActivity<ActivityWaybillLoadBinding>() {
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)
}
}
override fun initDate() {
}
}

92
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillSuccActivity.kt Normal file
View File

@ -0,0 +1,92 @@
package com.dahe.gldriver.ui.waybill.activity
import android.os.Bundle
import com.dahe.gldriver.R
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.databinding.ActivityWaybillSuccBinding
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.utils.ActivityUtils
import com.dahe.mylibrary.utils.AppUtils
import com.dahe.mylibrary.utils.BaseUtils
import com.dahe.mylibrary.utils.ToastUtils
/**
* @ClassName WaybillSuccActivity
* @Author john
* @Date 2024/1/29 16:42
* @Description TODO
*/
class WaybillSuccActivity : BaseActivity<ActivityWaybillSuccBinding>() {
override fun initView(savedInstanceState: Bundle?) {
setStatusBarColor(R.color.white)
val type = intent.extras?.getInt(AppConfig.SUCCESS_TYPE)
changeType(type)
setTitleBar("接单成功", true)
binding.run {
btnLeft.setOnClickListener {
goLeftOrRight(type,true)
}
btnRight.setOnClickListener {
goLeftOrRight(type,false)
ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
}
}
}
override fun initDate() {
}
/**
* type: 0->接单成功（默认）， 1->装货成功 ， 2->卸货成功
*/
private fun changeType(type: Int?) {
when (type) {
1 -> {
binding.run {
ivSucc.layoutParams.run {
width = BaseUtils.dip2px(mContext, 220f)
height = BaseUtils.dip2px(mContext, 150f)
ivSucc.layoutParams = this
ivSucc
}.setBackgroundResource(R.drawable.icon_succ_load)
tvSucc.text = "恭喜您，装货成功"
btnLeft.text = "返回首页"
btnRight.text = "查看运单"
}
}
2 -> {
binding.run {
ivSucc.layoutParams.run {
width = BaseUtils.dip2px(mContext, 220f)
height = BaseUtils.dip2px(mContext, 150f)
ivSucc.layoutParams = this
ivSucc
}.setBackgroundResource(R.drawable.icon_succ_unload)
tvSucc.text = "恭喜您，卸货成功"
btnLeft.text = "返回首页"
btnRight.text = "查看运单"
}
}
}
}
/*
*
* */
private fun goLeftOrRight(type: Int?, isLeft: Boolean) {
if (isLeft){
}else{
when(type){
0->ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
1->ActivityUtils.startActivity(mContext, WaybillUnlLoadActivity::class.java)
2->ActivityUtils.startActivity(mContext, WaybillLoadActivity::class.java)
}
}
}
}

25
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt Normal file
View File

@ -0,0 +1,25 @@
package com.dahe.gldriver.ui.waybill.activity
import android.os.Bundle
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
/**
* @ClassName WaybillLoadActivity
* @Author john
* @Date 2024/1/29 16:52
* @Description 运单卸货
*/
class WaybillUnlLoadActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
override fun initView(savedInstanceState: Bundle?) {
ActivityUtils.startActivity(mContext,WaybillSuccActivity::class.java,Bundle().apply { putInt(
AppConfig.SUCCESS_TYPE,2) })
}
override fun initDate() {
}
}

BIN
app/src/main/res/drawable-xxhdpi/icon_load_pic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_location.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_position.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_rece.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_succ_load.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_succ_unload.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 KiB

BIN
app/src/main/res/drawable-xxhdpi/success.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 133 KiB

3
app/src/main/res/layout/activity_waybill_detail.xml
View File

@ -116,11 +116,12 @@
android:textSize="@dimen/sp_16" />
<ImageView
android:layout_alignTop="@+id/tvUnload"
android:id="@+id/ivUnload"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_below="@+id/ivLoad"
android:layout_marginTop="@dimen/dp_74"
android:background="@drawable/icon_unload" />
<TextView

261
app/src/main/res/layout/activity_waybill_load.xml Normal file
View File

@ -0,0 +1,261 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rlTop"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_240"
android:background="@drawable/home_top_bg"
android:paddingTop="@dimen/dp_48">
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="装货"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_4"
android:background="@drawable/left"
android:baselineAlignBottom="@+id/tvTitle" />
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_m_140"
android:layout_weight="1"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/tvLocation"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:background="@drawable/icon_location" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:text="当前位置"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:layout_alignBottom="@+id/tvLocation"
android:layout_toLeftOf="@+id/tvPosi"
android:background="@drawable/icon_position" />
<TextView
android:id="@+id/tvPosi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/tvLocation"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/dp_4"
android:text="重新定位"
android:textColor="@color/main_blue"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tvLocation"
android:layout_marginTop="@dimen/dp_16"
android:text="河南省郑州市金水区农业路经三路东南角银 丰商务A座"
android:textColor="@color/black"
android:textSize="@dimen/sp_16" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/ivLoad"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_2"
android:background="@drawable/icon_load_pic" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_24"
android:text="装货照片"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/ivAdd"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_40"
android:background="@drawable/head_defaut" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_40"
android:layout_toRightOf="@+id/ivAdd"
android:text="上传回单"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/ivAdd"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivAdd"
android:text="请按照要求上传装货回单"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/ivRece"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_2"
android:background="@drawable/icon_rece" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_24"
android:text="装货回单"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/ivHead"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_40"
android:background="@drawable/head_defaut" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_40"
android:layout_toRightOf="@+id/ivHead"
android:text="上传回单"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/ivHead"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivHead"
android:text="请按照要求上传装货回单"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<View
android:layout_width="0dp"
android:layout_height="@dimen/dp_10"
android:background="@android:color/transparent" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_74"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_14"
android:paddingTop="@dimen/dp_9"
android:paddingRight="@dimen/dp_14"
android:paddingBottom="@dimen/dp_9">
<Button
android:id="@+id/btnLoad"
android:layout_width="@dimen/dp_320"
android:layout_height="@dimen/dp_45"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/bg_btn"
android:text="立即提交"
android:textColor="@color/white"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
</LinearLayout>

65
app/src/main/res/layout/activity_waybill_succ.xml Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<include layout="@layout/common_toolbar"></include>
<ImageView
android:id="@+id/ivSucc"
android:layout_width="@dimen/dp_150"
android:layout_height="@dimen/dp_150"
android:layout_marginTop="@dimen/dp_50"
android:background="@drawable/success" />
<TextView
android:id="@+id/tvSucc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:text="恭喜您，接单成功"
android:textColor="@color/black"
android:textSize="@dimen/sp_17" />
<TextView
android:id="@+id/tvTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:text="接单时间：2023-12-28 10:08"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_17" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/dp_52"
android:orientation="horizontal">
<Button
android:id="@+id/btnLeft"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_36"
android:background="@drawable/shape_btn_empty_bg"
android:text="查看运单"
android:textColor="@color/main_red"
android:textSize="@dimen/sp_17" />
<Button
android:id="@+id/btnRight"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_36"
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/bg_btn"
android:text="立即装货"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
</LinearLayout>
</LinearLayout>

261
app/src/main/res/layout/activity_waybill_unload.xml Normal file
View File

@ -0,0 +1,261 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rlTop"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_240"
android:background="@drawable/home_top_bg"
android:paddingTop="@dimen/dp_48">
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="卸货"
android:textColor="@color/white"
android:textSize="@dimen/sp_17" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_4"
android:background="@drawable/left"
android:baselineAlignBottom="@+id/tvTitle" />
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_m_140"
android:layout_weight="1"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/tvLocation"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:background="@drawable/icon_location" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:text="当前位置"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:layout_alignBottom="@+id/tvLocation"
android:layout_toLeftOf="@+id/tvPosi"
android:background="@drawable/icon_position" />
<TextView
android:id="@+id/tvPosi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/tvLocation"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/dp_4"
android:text="重新定位"
android:textColor="@color/main_blue"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tvLocation"
android:layout_marginTop="@dimen/dp_16"
android:text="河南省郑州市金水区农业路经三路东南角银 丰商务A座"
android:textColor="@color/black"
android:textSize="@dimen/sp_16" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/ivLoad"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_2"
android:background="@drawable/icon_load_pic" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_24"
android:text="卸货照片"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/ivAdd"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_40"
android:background="@drawable/head_defaut" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_40"
android:layout_toRightOf="@+id/ivAdd"
android:text="上传卸货照片"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/ivAdd"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivAdd"
android:text="请按照要求上传装货回单"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_16">
<ImageView
android:id="@+id/ivRece"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_2"
android:background="@drawable/icon_rece" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_24"
android:text="卸货回单"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/ivHead"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_40"
android:background="@drawable/head_defaut" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_40"
android:layout_toRightOf="@+id/ivHead"
android:text="上传回单"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/ivHead"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivHead"
android:text="请按照要求上传装货回单"
android:textColor="@color/color_9"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<View
android:layout_width="0dp"
android:layout_height="@dimen/dp_10"
android:background="@android:color/transparent" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_74"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_14"
android:paddingTop="@dimen/dp_9"
android:paddingRight="@dimen/dp_14"
android:paddingBottom="@dimen/dp_9">
<Button
android:id="@+id/btnUnload"
android:layout_width="@dimen/dp_320"
android:layout_height="@dimen/dp_45"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/bg_btn"
android:text="立即卸货"
android:textColor="@color/white"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
</LinearLayout>

44
mylibrary/build.gradle
View File

@ -7,29 +7,29 @@ plugins {
android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
defaultConfig {
minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"]
versionCode rootProject.ext.android["versionCode"]
versionName rootProject.ext.android["versionName"]
// defaultConfig {
// minSdkVersion rootProject.ext.android["minSdkVersion"]
// targetSdkVersion rootProject.ext.android["targetSdkVersion"]
// versionCode rootProject.ext.android["versionCode"]
// versionName rootProject.ext.android["versionName"]
//
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// consumerProguardFiles "consumer-rules.pro"
// }
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '11'
}
// buildTypes {
// release {
// minifyEnabled false
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
// }
// }
// compileOptions {
// sourceCompatibility JavaVersion.VERSION_11
// targetCompatibility JavaVersion.VERSION_11
// }
// kotlinOptions {
// jvmTarget = '11'
// }
}
dependencies {