diff --git a/app/build.gradle b/app/build.gradle index 6235f7d..bbad36f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 24 targetSdkVersion 30 - versionCode 70 - versionName "3.4.0" + versionCode 71 + versionName "3.4.1" flavorDimensions "CHANNEL_VALUE" flavorDimensions "app_icon" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -105,7 +105,8 @@ android { JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可. ] buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"") - buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"") + buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8080/api/\"") +// buildConfigField("String", "BASE_URL", "\"http://linux.local:8080/api/\"") buildConfigField "boolean", "isTest", "true" //APP名称，可以在androidMainfest中引用 resValue "string", "appName", "司机测试" diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 05a42e6..0dbded9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -796,7 +796,7 @@ public class HomeFragment extends BaseFragment { order_state.setText("" + sob.getData().getWaybillStatus()); try { Intent serviceIn = new Intent(con, TrackService.class); - getActivity().startActivity(serviceIn); + getActivity().startService(serviceIn); } catch (Exception e) { e.printStackTrace(); } @@ -1090,7 +1090,7 @@ public class HomeFragment extends BaseFragment { // } public void initAlct() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { PermissionX.init(getActivity()) .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java index f2a9184..fd58095 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java @@ -118,13 +118,13 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show(); customDialog.dismiss(); // EsignSdk.getInstance().startH5Activity(act, (String) bb.getData()); - if (null==bb.getData()){ + if (null == bb.getData()) { UiAuxiliary.homeRequest("接单"); Intent in = new Intent(con, StartYunDanActivity.class); in.putExtra("id", "0"); startActivity(in); finish(); - }else{ + } else { Intent intent = new Intent(this, H5Activity.class); intent.putExtra("url", (String) bb.getData()); intent.putExtra("view_file", false); @@ -263,9 +263,9 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { }); totalFreight.setText("****"); checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> { - if (isChecked){ + if (isChecked) { totalFreight.setText(hyd.getData().getTotalFreight()); - }else{ + } else { totalFreight.setText("****"); } // totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance()); @@ -418,7 +418,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { // }, 2500); - // new Handler().postDelayed(() -> { // // @@ -483,32 +482,46 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { * 先判断安联用户信息验证，随后接单 */ private void reOrder() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - PermissionX.init(this) - .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_COARSE_LOCATION) - .request((allGranted, grantedList, deniedList) -> { - if (allGranted) { - customDialog = new CustomDialog(con, "正在接单..."); - customDialog.show(); - //验证安联用户是否通过 - ALProcess.verification(con, hd); - } else { - boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION"); - boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE"); - if (accessCoarseLocation | contains) { - new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> { - Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - Uri uri = Uri.fromParts("package", getPackageName(), null); - intent.setData(uri); - startActivity(intent); - }); - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + try { + PermissionX.init(this) + .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION) + .request((allGranted, grantedList, deniedList) -> { + if (allGranted) { + customDialog = new CustomDialog(con, "正在接单..."); + customDialog.show(); + //验证安联用户是否通过 + ALProcess.verification(con, hd); + } else { + boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION"); + boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE"); + if (accessCoarseLocation | contains) { + new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法接单,去开启！", "取消", "确认", () -> { + Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + Uri uri = Uri.fromParts("package", getPackageName(), null); + intent.setData(uri); + startActivity(intent); + }); + } - } - }); + } + }); + } catch (Exception e) { + e.printStackTrace(); + customDialog = new CustomDialog(con, "正在接单..."); + customDialog.show(); + //验证安联用户是否通过 + ALProcess.verification(con, hd); + } + + } else { + customDialog = new CustomDialog(con, "正在接单..."); + customDialog.show(); + //验证安联用户是否通过 + ALProcess.verification(con, hd); }