电话动态权限，bugly添加，优化卸货逻辑

app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java

@@ -23,6 +23,7 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.gyf.cactus.Cactus;
 import com.gyf.cactus.callback.CactusBackgroundCallback;
 import com.gyf.cactus.callback.CactusCallback;
+import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.commonsdk.UMConfigure;
 
 import cn.jiguang.verifysdk.api.JVerificationInterface;
@@ -46,6 +47,7 @@ public class App extends Application {
         mApplication = this;
         con = getBaseContext();
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
+        CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", true);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
         if ("1".equals(state)) {
             try {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java

@@ -224,27 +224,6 @@ public class H5Activity extends AppCompatActivity {
 
             Uri uri = Uri.parse(url);
             Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
-
-
-//            if (url.contains("callback")) {
-//                // 实名认证结束 返回按钮/倒计时返回/暂不认证
-//                boolean status = uri.getBooleanQueryParameter("passed", false);
-//                if (status) {
-//
-//                    new Handler().postDelayed(() -> {
-//                        FaceEvent he = new FaceEvent("刷脸成功");
-//                        EventBus.getDefault().post(he);
-//                        finish();
-//                    }, 4000);
-//                }else{
-//                    if (mWebView.canGoBack()) {
-//                        mWebView.goBack();
-//                    }
-//                    Toast.makeText(H5Activity.this, "认证失败,请重新刷脸认证", Toast.LENGTH_SHORT).show();
-//                }
-//                return true;
-//            }
-
             if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) {
                 view.loadUrl(url);
                 return true;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt

@@ -1,11 +1,18 @@
 package com.arpa.hndahesudintocctmsdriver.cuspop
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.view.View
+import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
 import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil
+import com.dahe.mylibrary.utils.ToastUtils
 import com.lxj.xpopup.core.CenterPopupView
+import com.lxj.xpopup.util.XPermission
+import com.permissionx.guolindev.PermissionX
 import kotlinx.android.synthetic.main.load.view.*
 import kotlinx.android.synthetic.main.pop_message_center.view.*
 
@@ -48,11 +55,16 @@ class MessagePop(context: Context) : CenterPopupView(context), View.OnClickListe
             }
             R.id.tvOk,R.id.tvPhone -> {
                 dismiss()
-                val toString = tvPhone.text.toString()
+                if (XPermission.create(context).isGranted(Manifest.permission.CALL_PHONE)){
-                val intent = Intent(Intent.ACTION_DIAL)
+                    val toString = tvPhone.text.toString()
-                val data = Uri.parse("tel:$toString")
+                    val intent = Intent(Intent.ACTION_DIAL)
-                intent.data = data
+                    val data = Uri.parse("tel:$toString")
-                context.startActivity(intent)
+                    intent.data = data
+                    context.startActivity(intent)
+                }else{
+                    ToastUtils.showToast(context,"请开启电话权限")
+                }
+
 //                BaseUtils.callPhone(content as Activity, tvPhone.text.toString())
             }
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt

@@ -138,6 +138,7 @@ class MainActivity : BaseAppCompatActivity() {
                 Manifest.permission.ACCESS_BACKGROUND_LOCATION,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.CALL_PHONE,
                 Manifest.permission.RECORD_AUDIO,
                 Manifest.permission.CAMERA)
             .request { allGranted, grantedList, deniedList ->

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java

@@ -387,21 +387,21 @@ public class StartYunDanActivity extends BaseActivity {
                     for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
                         if (sob.getData().getWayChildren().get(i).getType() == 1) {
                             zInfo = sob.getData().getWayChildren().get(i);
-                            int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
+                            if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) {
-                            if (dis > 5) {
+                                int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
-                                if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) {
+                                if (dis > 5) {//大于五分钟可以接单
                                     Intent in = new Intent(con, ShangChuangImgActivity.class);
                                     in.putExtra("type", type);
                                     in.putExtra("wid", wid);
                                     in.putExtra("sob", gson.toJson(sob));
                                     in.putExtra("keys", key);
                                     startActivity(in);
-                                    break;
                                 } else {
-                                    ToastUtils.showToast(StartYunDanActivity.this, "请先上传出货单,再进行卸货操作!");
+                                    ToastUtils.showToast(StartYunDanActivity.this, "请到卸货地再进行卸货操作!");
                                 }
-                            } else {//大于五分钟可以接单
+                                break;
-                                ToastUtils.showToast(StartYunDanActivity.this, "装卸货时间间隔过短,请稍后重试!");
+                            } else {
+                                ToastUtils.showToast(StartYunDanActivity.this, "请先上传出货单,再进行卸货操作!");
                             }
                             break;
                         }

mylibrary/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     api rootProject.ext.dependencies["Xpopup"]
     api rootProject.ext.dependencies["Countdownview"]
 //    api rootProject.ext.dependencies["CheckVersionLib"]
-//    api rootProject.ext.dependencies["Bugly"]
+    api rootProject.ext.dependencies["Bugly"]
 //    api rootProject.ext.dependencies["Zxing"]
     api rootProject.ext.dependencies["Multidex"]
 //    api rootProject.ext.dependencies["FlycoTabLayout"]