diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
index 7e468ff..9b8c089 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
@@ -74,35 +74,29 @@ public class App extends Application {
}
}
- PendingIntent pendingIntent =
- PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
- Cactus.getInstance()
- .isDebug(true)
- //可选，设置通知栏点击事件
- .setPendingIntent(pendingIntent)
-// .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-// .setMusicId(R.raw.main) //可选，设置音乐
-// .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-// .addCallback(new CactusCallback())//可选，运行时回调
- .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
- .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
- .setTitle("大河好运")
- .setSmallIcon(R.drawable.diver_logo)
- .addBackgroundCallback(new CactusBackgroundCallback() {
- @Override
- public void onBackground(boolean b) {
-// String s = "";
- if (b){
- ToastUtils.showToast(mApplication,"推到后台了");
- getBillLocation();
- }
-
-// else
-// s = "跑到前台啦";
-// ToastUtils.showToast(mApplication,s);
- }
- })
- .register(this);
+// PendingIntent pendingIntent =
+// PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+// Cactus.getInstance()
+// .isDebug(true)
+// //可选，设置通知栏点击事件
+// .setPendingIntent(pendingIntent)
+//// .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
+//// .setMusicId(R.raw.main) //可选，设置音乐
+//// .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
+//// .addCallback(new CactusCallback())//可选，运行时回调
+// .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+// .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+// .setTitle("大河好运")
+// .setSmallIcon(R.drawable.diver_logo)
+// .addBackgroundCallback(new CactusBackgroundCallback() {
+// @Override
+// public void onBackground(boolean b) {
+// if (b){
+// getBillLocation();
+// }
+// }
+// })
+// .register(this);
}
public static App getApp() {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
index c82b81c..74e6744 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
@@ -133,7 +133,8 @@ class MainActivity : BaseAppCompatActivity() {
PermissionX.init(this)
.permissions(Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION,
- Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+ Manifest.permission.ACCESS_BACKGROUND_LOCATION,
+ Manifest.permission.CAMERA)
.request { allGranted, grantedList, deniedList ->
if (allGranted) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java
index c95f19a..a488425 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java
@@ -19,8 +19,8 @@ import java.util.Set;
* @description:
*/
public class Md5Util {
- static String app_key="3d4c1b5592f9ae09";
- static String appSecret="642cc46b385264595df7cce271250a1cb782b39c";
+ static String app_key="1000055";
+ static String appSecret="4e0d1be81540c4d1f0868d329b3229467f071f6c";
static String[] strs={"app_key","deviceId","longitude","latitude","keyword","timestamp","format","v","sign_method","session","sign"};
static String[] strsDel={"app_key","deviceId","openshopid","timestamp","format","v","sign_method","session","sign"};
public static String resUrl(String longitude,String latitude,String keyword){
@@ -35,7 +35,7 @@ public class Md5Util {
requestParam.put("format", "json");
requestParam.put("v", "1");
requestParam.put("sign_method", "MD5");
- requestParam.put("session", "cb2007c78d055247f7f242760173268caef1183a");
+ requestParam.put("session", "c1fc1773a27d47e988725bc6df150626dbda0b4d");
requestParam.put("sign", generateSign(requestParam,appSecret,"MD5"));
str+="?";
for(int i=0;i
+ android:src="@drawable/icon_home_2" />
-
+ android:background="@drawable/bg_banner"
+ android:orientation="vertical">
+ android:layout_margin="@dimen/dp_25"
+ android:layout_marginTop="@dimen/dp_12" />
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_m_12">
+ android:layout_marginLeft="@dimen/dp_8"
+ android:layout_weight="1"
+ android:background="@mipmap/icon_home_3"
+ android:scaleType="fitXY" />
+ android:layout_weight="1"
+ android:background="@mipmap/icon_home_4"
+ android:scaleType="fitXY" />
-
+
+
+
+ android:background="#999999" />
+ android:layout_marginBottom="@dimen/dp_14"
+ android:overScrollMode="never" />
-
+
-
+
+
+
+
+
+
+
+
+
+
+ android:layout_marginLeft="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginRight="@dimen/dp_20">
+ android:text="执行中运单"
+ android:textColor="#ff333333"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_alignParentRight="true"
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mylibrary/build.gradle b/mylibrary/build.gradle
index 1e77988..2622a62 100644
--- a/mylibrary/build.gradle
+++ b/mylibrary/build.gradle
@@ -58,7 +58,7 @@ dependencies {
api rootProject.ext.dependencies["okhttp"]
api rootProject.ext.dependencies["logging-interceptor"]
api rootProject.ext.dependencies["recyclerview"]
- api rootProject.ext.dependencies["AutoSize"]
+// api rootProject.ext.dependencies["AutoSize"]
api rootProject.ext.dependencies["statusbaruitl"]
api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
api rootProject.ext.dependencies["PhotoPicker"]
diff --git a/mylibrary/src/main/AndroidManifest.xml b/mylibrary/src/main/AndroidManifest.xml
index 2f43892..9775637 100644
--- a/mylibrary/src/main/AndroidManifest.xml
+++ b/mylibrary/src/main/AndroidManifest.xml
@@ -13,12 +13,12 @@
android:supportsRtl="true">
-
-
+
+
+
+
+
+