denghuan/river-lucky-driver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小米适配，刷脸bug修复

Browse Source
This commit is contained in:
lijia 2022-12-09 10:44:59 +08:00
parent 1ba81f4de4
commit 4ceefc82ab
9 changed files with 226 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
View File

@ -74,35 +74,29 @@ public class App extends Application {
} }
} }
PendingIntent pendingIntent = // PendingIntent pendingIntent =
PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); // PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
Cactus.getInstance() // Cactus.getInstance()
.isDebug(true) // .isDebug(true)
//可选，设置通知栏点击事件 // //可选，设置通知栏点击事件
.setPendingIntent(pendingIntent) // .setPendingIntent(pendingIntent)
// .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐 //// .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
// .setMusicId(R.raw.main) //可选，设置音乐 //// .setMusicId(R.raw.main) //可选，设置音乐
// .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件 //// .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
// .addCallback(new CactusCallback())//可选，运行时回调 //// .addCallback(new CactusCallback())//可选，运行时回调
.setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启 // .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
.setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启 // .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
.setTitle("大河好运") // .setTitle("大河好运")
.setSmallIcon(R.drawable.diver_logo) // .setSmallIcon(R.drawable.diver_logo)
.addBackgroundCallback(new CactusBackgroundCallback() { // .addBackgroundCallback(new CactusBackgroundCallback() {
@Override // @Override
public void onBackground(boolean b) { // public void onBackground(boolean b) {
// String s = ""; // if (b){
if (b){ // getBillLocation();
ToastUtils.showToast(mApplication,"推到后台了"); // }
getBillLocation(); // }
} // })
// .register(this);
// else
// s = "跑到前台啦";
// ToastUtils.showToast(mApplication,s);
}
})
.register(this);
} }
public static App getApp() { public static App getApp() {

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

@ -133,7 +133,8 @@ class MainActivity : BaseAppCompatActivity() {
PermissionX.init(this) PermissionX.init(this)
.permissions(Manifest.permission.ACCESS_FINE_LOCATION, .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_BACKGROUND_LOCATION) Manifest.permission.ACCESS_BACKGROUND_LOCATION,
Manifest.permission.CAMERA)
.request { allGranted, grantedList, deniedList -> .request { allGranted, grantedList, deniedList ->
if (allGranted) { if (allGranted) {

6
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java
View File

@ -19,8 +19,8 @@ import java.util.Set;
* @description: * @description:
*/ */
public class Md5Util { public class Md5Util {
static String app_key="3d4c1b5592f9ae09"; static String app_key="1000055";
static String appSecret="642cc46b385264595df7cce271250a1cb782b39c"; static String appSecret="4e0d1be81540c4d1f0868d329b3229467f071f6c";
static String[] strs={"app_key","deviceId","longitude","latitude","keyword","timestamp","format","v","sign_method","session","sign"}; 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"}; static String[] strsDel={"app_key","deviceId","openshopid","timestamp","format","v","sign_method","session","sign"};
public static String resUrl(String longitude,String latitude,String keyword){ public static String resUrl(String longitude,String latitude,String keyword){
@ -35,7 +35,7 @@ public class Md5Util {
requestParam.put("format", "json"); requestParam.put("format", "json");
requestParam.put("v", "1"); requestParam.put("v", "1");
requestParam.put("sign_method", "MD5"); requestParam.put("sign_method", "MD5");
requestParam.put("session", "cb2007c78d055247f7f242760173268caef1183a"); requestParam.put("session", "c1fc1773a27d47e988725bc6df150626dbda0b4d");
requestParam.put("sign", generateSign(requestParam,appSecret,"MD5")); requestParam.put("sign", generateSign(requestParam,appSecret,"MD5"));
str+="?"; str+="?";
for(int i=0;i<requestParam.size();i++){ for(int i=0;i<requestParam.size();i++){

0
app/src/main/res/mipmap-hdpi/icon_home_1.png → app/src/main/res/drawable-xxhdpi/icon_home_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 139 KiB

0
app/src/main/res/mipmap-hdpi/icon_home_2.png → app/src/main/res/drawable-xxhdpi/icon_home_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

4
app/src/main/res/layout/home_top.xml
View File

@ -10,7 +10,7 @@
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_width="@dimen/dp_290" android:layout_width="@dimen/dp_290"
android:layout_height="@dimen/dp_56" android:layout_height="@dimen/dp_56"
android:src="@mipmap/icon_home_1" android:src="@drawable/icon_home_1"
android:scaleType="fitXY"/> android:scaleType="fitXY"/>
<ImageView <ImageView
@ -20,7 +20,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_13" android:layout_marginRight="@dimen/dp_13"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@mipmap/icon_home_2" /> android:src="@drawable/icon_home_2" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

377
app/src/main/res/layout/item_home.xml
View File

@ -1,66 +1,68 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_huoyuan_new"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/item_huoyuan_new"
android:paddingBottom="@dimen/dp_78"> android:paddingBottom="@dimen/dp_78">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_200" android:layout_height="@dimen/dp_200"
android:orientation="vertical" android:background="@drawable/bg_banner"
android:background="@drawable/bg_banner"> android:orientation="vertical">
<com.youth.banner.Banner <com.youth.banner.Banner
android:layout_marginTop="@dimen/dp_12"
android:id="@+id/banner" android:id="@+id/banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="@dimen/dp_25"/> android:layout_margin="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_12" />
</LinearLayout> </LinearLayout>
<RelativeLayout <LinearLayout
android:layout_marginTop="@dimen/dp_m_12"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_m_12">
<ImageView <ImageView
android:id="@+id/fun_left" android:id="@+id/fun_left"
android:layout_marginLeft="@dimen/dp_8"
android:layout_width="@dimen/dp_176" android:layout_width="@dimen/dp_176"
android:layout_height="@dimen/dp_116" android:layout_height="@dimen/dp_116"
android:src="@mipmap/icon_home_3" android:layout_marginLeft="@dimen/dp_8"
android:scaleType="fitXY"/> android:layout_weight="1"
android:background="@mipmap/icon_home_3"
android:scaleType="fitXY" />
<ImageView <ImageView
android:id="@+id/fun_right" android:id="@+id/fun_right"
android:layout_width="@dimen/dp_176" android:layout_width="@dimen/dp_176"
android:layout_height="@dimen/dp_116" android:layout_height="@dimen/dp_116"
android:layout_alignParentRight="true"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:scaleType="fitXY" android:layout_weight="1"
android:src="@mipmap/icon_home_4" /> android:background="@mipmap/icon_home_4"
android:scaleType="fitXY" />
</RelativeLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_23"
android:visibility="gone"> android:visibility="gone">
<View <View
android:layout_width="@dimen/dp_54" android:layout_width="@dimen/dp_54"
android:layout_height="@dimen/dp_3" android:layout_height="@dimen/dp_3"
android:background="#999999" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_centerHorizontal="true"/> android:background="#999999" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
@ -69,188 +71,187 @@
android:orientation="vertical"> android:orientation="vertical">
<com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
android:layout_marginBottom="@dimen/dp_14"
android:id="@+id/brv_function" android:id="@+id/brv_function"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:overScrollMode="never"/> android:layout_marginBottom="@dimen/dp_14"
android:overScrollMode="never" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/auth_box" android:id="@+id/auth_box"
android:layout_marginTop="@dimen/dp_4" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:background="#fff"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/text_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_20"
android:text="认证成功 开始接单"
android:textColor="#ff666666"
android:textSize="@dimen/sp_14" />
<Button
android:id="@+id/btn_auth"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_24"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_7"
android:layout_marginBottom="@dimen/dp_16"
android:background="@drawable/bg_btn"
android:gravity="center"
android:text="去认证"
android:textColor="#ffffffff"
android:textSize="@dimen/sp_10" />
</LinearLayout>
<LinearLayout
android:id="@+id/order_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:background="#fff"
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginLeft="@dimen/dp_20"
android:background="#fff" android:layout_marginTop="@dimen/dp_24"
android:visibility="gone"> android:layout_marginRight="@dimen/dp_20">
<TextView <TextView
android:id="@+id/text_login"
android:layout_marginTop="@dimen/dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="认证成功 开始接单" android:text="执行中运单"
android:textColor="#ff666666" android:textColor="#ff333333"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_16"
android:layout_gravity="center" android:textStyle="bold" />
/>
<Button <LinearLayout
android:id="@+id/btn_auth" android:id="@+id/order_all"
android:layout_marginTop="@dimen/dp_7" android:layout_width="wrap_content"
android:layout_marginBottom="@dimen/dp_16"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_24"
android:text="去认证"
android:background="@drawable/bg_btn"
android:textColor="#ffffffff"
android:textSize="@dimen/sp_10"
android:layout_gravity="center"
android:gravity="center" />
</LinearLayout>
<LinearLayout
android:id="@+id/order_box"
android:layout_marginTop="@dimen/dp_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#fff"
android:visibility="gone">
<RelativeLayout
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="执行中运单"
android:textColor="#ff333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
/>
<LinearLayout
android:id="@+id/order_all"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全部运单"
android:textColor="#ff999999"
android:textSize="@dimen/sp_14"
/>
<ImageView
android:layout_marginLeft="@dimen/dp_4"
android:layout_width="@dimen/dp_7"
android:layout_height="@dimen/dp_12"
android:src="@mipmap/chevron"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
<com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
android:layout_marginBottom="@dimen/dp_12"
android:id="@+id/brv_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<!-- <LinearLayout
android:layout_marginTop="@dimen/dp_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#fff">
<RelativeLayout
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="司机之家"
android:textColor="#ff333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"/>
</RelativeLayout>
<com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_24"
android:id="@+id/brv_driver_home"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="@dimen/dp_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#fff"
android:visibility="gone">
<RelativeLayout
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="司机圈"
android:textColor="#ff333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
/>
<LinearLayout
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="更多精彩"
android:textColor="#ff999999"
android:textSize="@dimen/sp_14"
/>
<ImageView
android:layout_marginLeft="@dimen/dp_4"
android:layout_width="@dimen/dp_7"
android:layout_height="@dimen/dp_12"
android:src="@mipmap/chevron"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
<com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
android:layout_marginTop="@dimen/dp_14"
android:id="@+id/brv_driver_circle"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/version"
android:layout_marginTop="@dimen/dp_5"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="——V2.0.7——" android:layout_alignParentRight="true"
android:textSize="@dimen/sp_13" android:orientation="horizontal">
android:gravity="center"
android:layout_marginBottom="@dimen/dp_5" <TextView
android:alpha="0.6"/> android:layout_width="wrap_content"
</LinearLayout>--> android:layout_height="wrap_content"
<include android:text="全部运单"
layout="@layout/item_order_recommend"/> android:textColor="#ff999999"
android:textSize="@dimen/sp_14" />
<ImageView
android:layout_width="@dimen/dp_7"
android:layout_height="@dimen/dp_12"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_4"
android:src="@mipmap/chevron" />
</LinearLayout>
</RelativeLayout>
<com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
android:id="@+id/brv_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_12" />
</LinearLayout>
<!-- <LinearLayout
android:layout_marginTop="@dimen/dp_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#fff">
<RelativeLayout
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="司机之家"
android:textColor="#ff333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"/>
</RelativeLayout>
<com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_24"
android:id="@+id/brv_driver_home"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="@dimen/dp_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#fff"
android:visibility="gone">
<RelativeLayout
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="司机圈"
android:textColor="#ff333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
/>
<LinearLayout
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="更多精彩"
android:textColor="#ff999999"
android:textSize="@dimen/sp_14"
/>
<ImageView
android:layout_marginLeft="@dimen/dp_4"
android:layout_width="@dimen/dp_7"
android:layout_height="@dimen/dp_12"
android:src="@mipmap/chevron"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
<com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
android:layout_marginTop="@dimen/dp_14"
android:id="@+id/brv_driver_circle"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/version"
android:layout_marginTop="@dimen/dp_5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="——V2.0.7——"
android:textSize="@dimen/sp_13"
android:gravity="center"
android:layout_marginBottom="@dimen/dp_5"
android:alpha="0.6"/>
</LinearLayout>-->
<include layout="@layout/item_order_recommend" />
</LinearLayout> </LinearLayout>

2
mylibrary/build.gradle
View File

@ -58,7 +58,7 @@ dependencies {
api rootProject.ext.dependencies["okhttp"] api rootProject.ext.dependencies["okhttp"]
api rootProject.ext.dependencies["logging-interceptor"] api rootProject.ext.dependencies["logging-interceptor"]
api rootProject.ext.dependencies["recyclerview"] api rootProject.ext.dependencies["recyclerview"]
api rootProject.ext.dependencies["AutoSize"] // api rootProject.ext.dependencies["AutoSize"]
api rootProject.ext.dependencies["statusbaruitl"] api rootProject.ext.dependencies["statusbaruitl"]
api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"] api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
api rootProject.ext.dependencies["PhotoPicker"] api rootProject.ext.dependencies["PhotoPicker"]

12
mylibrary/src/main/AndroidManifest.xml
View File

@ -13,12 +13,12 @@
android:supportsRtl="true"> android:supportsRtl="true">
<meta-data <!-- <meta-data-->
android:name="design_width_in_dp" <!-- android:name="design_width_in_dp"-->
android:value="360" /> <!-- android:value="360" />-->
<meta-data <!-- <meta-data-->
android:name="design_height_in_dp" <!-- android:name="design_height_in_dp"-->
android:value="640" /> <!-- android:value="640" />-->
<meta-data <meta-data
android:name="com.dahe.mylibrary.glide.AppGlideModule" android:name="com.dahe.mylibrary.glide.AppGlideModule"