diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 8d81632..d79880b 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,5 +1,12 @@ + + + + diff --git a/app/build.gradle b/app/build.gradle index 7a9c2f0..a36fd2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ def releaseTime() { return new Date().format("yyyyMMddHHmm", TimeZone.getTimeZone("GMT+08:00")) } android { - + namespace 'com.dahe.gldriver' signingConfigs { config { keyAlias 'key0' @@ -48,6 +48,7 @@ android { signingConfig signingConfigs.config } } + compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 @@ -142,4 +143,8 @@ dependencies { //定位功能 // implementation 'com.amap.api:location:6.4.2'//6.4.2 implementation 'com.amap.api:search:9.7.0' + + //易签宝 + implementation files('libs/EsignSDK.aar') +// implementation(name: 'EsignSDK', ext: 'aar') } \ No newline at end of file diff --git a/app/libs/EsignSDK.aar b/app/libs/EsignSDK.aar new file mode 100644 index 0000000..6fdd9a2 Binary files /dev/null and b/app/libs/EsignSDK.aar differ diff --git a/app/src/main/java/com/dahe/gldriver/base/App.kt b/app/src/main/java/com/dahe/gldriver/base/App.kt index c9a228f..88a10dc 100644 --- a/app/src/main/java/com/dahe/gldriver/base/App.kt +++ b/app/src/main/java/com/dahe/gldriver/base/App.kt @@ -3,13 +3,12 @@ package com.dahe.gldriver.base import android.app.Application import android.content.Context import com.dahe.gldriver.BuildConfig -import com.dahe.gldriver.base.App -import com.dahe.mylibrary.CommonBaseLibrary import com.dahe.gldriver.net.Api import com.dahe.gldriver.oss.OssServiceUtil +import com.dahe.mylibrary.CommonBaseLibrary +import com.esign.esignsdk.EsignSdk import com.github.gzuliyujiang.dialog.DialogConfig import com.github.gzuliyujiang.dialog.DialogStyle -import java.lang.Exception import java.security.SecureRandom import java.security.cert.X509Certificate import javax.net.ssl.HttpsURLConnection @@ -35,6 +34,9 @@ class App : Application() { OssServiceUtil.getInstance().init(); + + EsignSdk.getInstance().init(AppConfig.E_KEY, AppConfig.E_LICENSE) + // PendingIntent pendingIntent = // PendingIntent.getActivity(this, 0, new Intent(this, HomeActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); // Cactus.getInstance() diff --git a/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt b/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt index e2c54be..fa5842e 100644 --- a/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt +++ b/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt @@ -19,5 +19,7 @@ object AppConfig { const val CODE = "DA_HE_PHONE" const val REFRSH = "DA_HE_REFRSH" const val SUCCESS_TYPE = "DA_HE_SUCCESS_TYPE" + const val E_KEY = "19ac0aa74338e487e45057faf7212401" + const val E_LICENSE = "HF41uGxM/1i3CtW98DimoA97BlNTAnQ+DiEAihYmZ2jR1jqC4be253joEJbOJgFDIzp5aIoeuXSWWHFaDVfaHL2Pksbq5f8M8EqsVhP9q/i1xGYSYf6MJVlHdMAVLWgR0Kra+n8dVzkSDuZeyJuDsskAmZaGFQN1CqnWYCI1tmV1Tk4A57e9LQMed0U11QWjdshdU2DGqBXKmGE419PdW3NmIxOR2u9iB1OKBmvzCUT8RAYyBzSn/yhU++YJ25g5a8Pb5kOvi+eOh+PEFEcQL6oOp/CF4Iw5nadlsLhc+XEnVJpwL2myZBoSlVcKxrJKbRn1/DIgXBueKKnqhyHKdJlpqI9eghAlRF0p2Q4f23m89mWRZf4nhKzTeXGIjCTFO4TNVucrlGU7tyJcrRCDVdfV24fziH+hB3QGckpuYzzjefr7hZalLRJ/w8dPw/8dCY1wnWq3AJ3zw2g1PzMxl51q7AgdKvwc1ERcGBns0zb8PK6vGKCnJq3uHiJEnslbTI0MEosje+h+OPO7hf2QofErewjI19wHEOv4dTvuFLh3VmGFMObAmov5kI47705fjSxCvAPGATBrfUSwim+5EQ1hanc5IcXe0/nOTiRUNEpZ+x65zVydqAs7490yqQiIUQvPazEwcal7vH2OD54lCcgpxKxqdmGc5/bp5UnqB45+n+iuInV/Q9DMOQVk15uaVZmhS8VaCqH21CmfH/ZGLb9wiEpaRLrPZLKX3bK7MT9Z0/OlDnb2QUKU8LMMIhLuQQntzsf0Wn4kA/0e9QAJJQ==" } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_waybill_list.xml b/app/src/main/res/layout/fragment_waybill_list.xml index 249601e..2868871 100644 --- a/app/src/main/res/layout/fragment_waybill_list.xml +++ b/app/src/main/res/layout/fragment_waybill_list.xml @@ -20,6 +20,7 @@