diff --git a/app/build.gradle b/app/build.gradle index ee5939e..7ad8eb2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,7 +49,7 @@ android { ndk { //选择要添加的对应 cpu 类型的 .so 库。 - abiFilters 'armeabi', 'armeabi-v7a' + abiFilters 'armeabi-v7a', 'arm64-v8a' // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' , 'arm64-v8a' } @@ -69,6 +69,12 @@ android { VIVO_APPID : "vivo的APPID" ] } +// sourceSets { +// main { +// jniLibs.srcDirs = ['libs'] +// } +// } + sourceSets { main { jniLibs.srcDirs = ['libs'] @@ -143,6 +149,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'com.caverock:androidsvg-aar:1.3' + //当引入的与之前引入的库有重复冲突部分的时候，使用compileOnly + implementation files('libs\\mdp_sdk.jar') //压缩工具 implementation 'top.zibin:Luban:1.1.3' //角标 @@ -157,9 +165,10 @@ dependencies { implementation 'com.github.jenly1314.AppUpdater:app-dialog:1.1.0' //轮播插件 implementation 'com.github.zhpanvip:BannerViewPager:3.5.4' - //弹出框 + // // implementation 'com.lxj:xpopup:2.2.8' -// implementation 'com.github.li-xiaojun:XPopup:2.8.15' + //工具类 + //implementation 'cn.hutool:hutool-all:5.7.11' //交通厅 implementation 'com.lzy.net:okgo:3.0.4' implementation 'com.alibaba:fastjson:1.2.61' @@ -167,12 +176,12 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.5' implementation (name:'locationgd-androidx_2.1.0', ext:'aar')//交通厅 //安联 +// implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.loopj.android:android-async-http:1.4.9' implementation 'com.j256.ormlite:ormlite-android:4.48' implementation 'com.j256.ormlite:ormlite-core:4.48' - implementation "org.permissionsdispatcher:permissionsdispatcher:4.6.0" - kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0" - + compileOnly 'com.github.hotchemi:permissionsdispatcher:2.3.1' + annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:2.3.1' //极光认证 implementation 'cn.jiguang.sdk:jverification:2.7.1' // 此处以2.7.1 版本为例。a implementation 'cn.jiguang.sdk:jpush:4.2.4' // 此处以JPush 4.2.4 版本为例。 @@ -184,24 +193,30 @@ dependencies { implementation 'com.umeng.umsdk:asms:1.4.1'// 必选 implementation 'com.umeng.umsdk:apm:1.4.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选 implementation 'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选 - + //动态权限获取 + implementation "org.permissionsdispatcher:permissionsdispatcher:4.6.0" + kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0" //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:3.1.1' //EventBus implementation 'org.greenrobot:eventbus:3.1.1' + //易签宝 + implementation(name:'EsignSDK', ext:'aar') + implementation'pub.devrel:easypermissions:1.3.0' + + implementation "com.squareup.retrofit2:retrofit:2.4.0" +// implementation "com.squareup.retrofit2:converter-gson:2.4.0" + implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0" +// implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' + + implementation "io.reactivex.rxjava2:rxjava:2.1.5" + implementation "io.reactivex.rxjava2:rxandroid:2.0.1" //pdf展示 implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1' - //工具类 - //implementation 'cn.hutool:hutool-all:5.7.11' + // implementation 'com.github.getActivity:XToast:8.2' - //易签宝 - implementation(name:'EsignSDK', ext:'aar') - - //当引入的与之前引入的库有重复冲突部分的时候，使用compileOnly - implementation files('libs\\mdp_sdk.jar') - implementation project(path: ':mylibrary') } \ No newline at end of file diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so new file mode 100644 index 0000000..4d7ea83 Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so new file mode 100644 index 0000000..0bdae20 Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so differ diff --git a/app/libs/arm64-v8a/libindoor.so b/app/libs/arm64-v8a/libindoor.so new file mode 100644 index 0000000..f8e8ca8 Binary files /dev/null and b/app/libs/arm64-v8a/libindoor.so differ diff --git a/app/libs/arm64-v8a/liblocSDK7b.so b/app/libs/arm64-v8a/liblocSDK7b.so new file mode 100644 index 0000000..6bab09a Binary files /dev/null and b/app/libs/arm64-v8a/liblocSDK7b.so differ diff --git a/app/libs/armeabi/libBaiduMapSDK_base_v5_1_0.so b/app/libs/armeabi/libBaiduMapSDK_base_v5_1_0.so deleted file mode 100644 index 1496543..0000000 Binary files a/app/libs/armeabi/libBaiduMapSDK_base_v5_1_0.so and /dev/null differ diff --git a/app/libs/armeabi/libBaiduMapSDK_map_v5_1_0.so b/app/libs/armeabi/libBaiduMapSDK_map_v5_1_0.so deleted file mode 100644 index 83b3b84..0000000 Binary files a/app/libs/armeabi/libBaiduMapSDK_map_v5_1_0.so and /dev/null differ diff --git a/app/libs/armeabi/libindoor.so b/app/libs/armeabi/libindoor.so deleted file mode 100644 index cd2a548..0000000 Binary files a/app/libs/armeabi/libindoor.so and /dev/null differ diff --git a/app/libs/armeabi/liblocSDK7b.so b/app/libs/armeabi/liblocSDK7b.so deleted file mode 100644 index 1a9a34a..0000000 Binary files a/app/libs/armeabi/liblocSDK7b.so and /dev/null differ diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java index 77e908b..624dbbb 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java @@ -358,14 +358,14 @@ public class StartYunDanActivity extends BaseActivity { }else{ Toast.makeText(con,"您还没有装货",Toast.LENGTH_SHORT).show(); } - }else if(sdw.getStatus()==1){ + }else if(sdw.getStatus()==1){//装货回单 Intent in=new Intent(con, ShangChuangImgActivity.class); in.putExtra("type",2); in.putExtra("wid",wid); in.putExtra("h_type",type); in.putExtra("sob",gson.toJson(sob)); startActivity(in); - }else if(sdw.getStatus()==2){ + }else if(sdw.getStatus()==2){//上传收货单(卸货回单) Intent in=new Intent(con, ShangChuangImgActivity.class); in.putExtra("type",2); in.putExtra("wid",wid); @@ -377,7 +377,7 @@ public class StartYunDanActivity extends BaseActivity { Intent in=new Intent(con, GetShangChuanActivity.class); in.putExtra("sdwStr",gson.toJson(sdw)); startActivity(in); - }else{ + }else{//卸货照片 Intent in=new Intent(con, ShangChuangImgActivity.class); in.putExtra("type",type); in.putExtra("wid",wid); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java index 62e7615..a83b7da 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java @@ -348,7 +348,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { } break; case 2: - if(imgIds!=null && imgIds.size()>0){ + if(imgIds!=null && imgIds.size()>0){//卸货回单 //上传回单 urib.setLatitude(lgdu.getLatitude()+""); urib.setLongitude(lgdu.getLongitude()+""); @@ -367,7 +367,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { receipt_image(); } hyr.receipt(urib); - }{ + }else{ Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show(); } }else{