From c75cedf381f9f7909b9a06a2d932d1fe48773912 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 13 四月 2023 17:44:29 +0800
Subject: [PATCH] 显示二维码分享
---
app/src/main/java/com/zhaoyang/driver/ui/mine/ChangeCarActivity.kt | 2 --
app/src/main/res/layout/activity_forget_pwd.xml | 7 ++++---
/dev/null | 0
app/src/main/java/com/zhaoyang/driver/ui/main/MainActivity.kt | 6 +++---
app/src/main/res/layout/driver_two.xml | 1 +
app/src/main/res/layout/activity_server_phone.xml | 1 +
app/src/main/res/layout/driver_one.xml | 1 +
app/src/main/java/com/zhaoyang/driver/ui/pub/ForgetPwdActivity.kt | 5 ++++-
app/src/main/java/com/zhaoyang/driver/ui/pub/BecomeDriverActivity.kt | 16 ++++++++--------
app/src/main/java/com/zhaoyang/driver/utils/MyUtils.java | 5 -----
app/src/main/java/com/zhaoyang/driver/ui/mine/setting/SettingActivity.kt | 4 ++--
app/src/main/res/layout/activity_mine.xml | 1 -
12 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/main/MainActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/main/MainActivity.kt
index 407f674..57e0d62 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/main/MainActivity.kt
@@ -168,10 +168,10 @@
}
}
- if (!MyUtils.canBackgroundStart(this)) {
- DialogUtil.getDelAndSureDialog(this, "前往开启", "退出", "您暂未开启手机权限“后台弹出界面”，可能导致无法接单，是否前往开启？", {
- onBackPressed()
+ if (!MyUtils.canBackgroundStart(this)&&SPUtils.getString("canBackground").isEmpty()) {
+ DialogUtil.getDelAndSureDialog(this, "前往开启", "暂不开启", "您暂未开启手机权限“后台弹出界面”，可能导致无法接单，是否前往开启？", {
}) {
+ SPUtils.save("canBackground","can")
MyUtils.toSettingPro(this)
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/mine/ChangeCarActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/mine/ChangeCarActivity.kt
index f615b2f..74d6e53 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/mine/ChangeCarActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/mine/ChangeCarActivity.kt
@@ -42,7 +42,6 @@
if (!bean.data.car.isNullOrEmpty()){
tv_car_info.text = bean.data.car
ll_car_now.visible()
- tv_add_car.text = "更换车辆"
when (bean.data.authState){
"1" -> {
tv_statue.text = "审核中"
@@ -57,7 +56,6 @@
}
}else{
ll_car_now.gone()
- tv_add_car.text = "添加车辆"
}
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/mine/setting/SettingActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/mine/setting/SettingActivity.kt
index 4641517..42ef97e 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/mine/setting/SettingActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/mine/setting/SettingActivity.kt
@@ -105,7 +105,7 @@
// map["id"] = CacheKey.getUserId()
callNet(Api.queryNewData, map) {
var data = gson.fromJson<VersionBean>(it, VersionBean::class.java)
- if (data.data.version != "" && data.data.version != Utils.getAppVersion(this)) {
+ if (data.data.version != "" && data.data.version > Utils.getAppVersion(this)) {
if (data.data.mandatory == 2) {
DialogUtil.getDelAndSureDialog(this, "新版本更新",data.data.content, {}, {
DownloadUtil(this).downloadAPK(data.data.url, "昭阳出行司机端")
@@ -121,7 +121,7 @@
// toast("已经是最新版本")
}
} else {
-// toast("已经是最新版本")
+ toast("已经是最新版本")
}
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/pub/BecomeDriverActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/pub/BecomeDriverActivity.kt
index 1737611..24227c8 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/pub/BecomeDriverActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/pub/BecomeDriverActivity.kt
@@ -63,18 +63,18 @@
override fun initView() {
setTitleText("填写资料")
- tv_Right.text = "跳过"
- tv_Right.gone()
+ tv_Right.text = "下一步"
}
override fun setOnclick() {
tv_Right.setOnClickListener {
- if (uid.isEmpty()){
- toast("请稍等，或重试")
- return@setOnClickListener
- }
- startActivity<AddCarRegisterActivity>("uid" to uid)
- registerSuccess()
+// if (uid.isEmpty()){
+// toast("请稍等，或重试")
+// return@setOnClickListener
+// }
+// startActivity<AddCarRegisterActivity>("uid" to uid)
+// registerSuccess()
+ next()
}
tv_next.clickDelay {
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/pub/ForgetPwdActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/pub/ForgetPwdActivity.kt
index 307a923..5baa167 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/pub/ForgetPwdActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/pub/ForgetPwdActivity.kt
@@ -53,9 +53,12 @@
first = true
var map = getMapByAny()
map["code"] = adcode
- callNet(Api.queryPhone,map){
+ callNet(Api.queryPhone,map,{
var data: QueryPhoneBean = gson.fromJson(it,QueryPhoneBean::class.java)
tv_hint_phone.text = "若手机不能使用，请联系客服："+data.data.phone
+ }){
+
+ tv_hint_phone.text = "若手机不能使用，请联系客服：4008-099-881"
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/utils/MyUtils.java b/app/src/main/java/com/zhaoyang/driver/utils/MyUtils.java
index 56553de..68c28ac 100644
--- a/app/src/main/java/com/zhaoyang/driver/utils/MyUtils.java
+++ b/app/src/main/java/com/zhaoyang/driver/utils/MyUtils.java
@@ -1,17 +1,14 @@
package com.zhaoyang.driver.utils;
-import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AppOpsManager;
-import android.content.ActivityNotFoundException;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@@ -19,7 +16,6 @@
import android.net.Uri;
import android.os.Build;
import android.os.Process;
-import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.Log;
import android.util.TypedValue;
@@ -28,7 +24,6 @@
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
-import androidx.core.app.ActivityCompat;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
diff --git a/app/src/main/res/layout/activity_forget_pwd.xml b/app/src/main/res/layout/activity_forget_pwd.xml
index 6612cef..720216a 100644
--- a/app/src/main/res/layout/activity_forget_pwd.xml
+++ b/app/src/main/res/layout/activity_forget_pwd.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:background="@color/white"
android:layout_height="match_parent">
@@ -39,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginStart="14dp"
- android:text="若手机不能使用，请联系客服：15828702770"
+ tools:text="若手机不能使用，请联系客服：4008-099-881"
android:textColor="#ff666666"
android:textSize="12sp"
/>
diff --git a/app/src/main/res/layout/activity_mine.xml b/app/src/main/res/layout/activity_mine.xml
index fcd6b41..f61d962 100644
--- a/app/src/main/res/layout/activity_mine.xml
+++ b/app/src/main/res/layout/activity_mine.xml
@@ -545,7 +545,6 @@
<RelativeLayout
android:id="@+id/ll_qr"
- android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="43dp">
diff --git a/app/src/main/res/layout/activity_server_phone.xml b/app/src/main/res/layout/activity_server_phone.xml
index 00e1526..47b9a73 100644
--- a/app/src/main/res/layout/activity_server_phone.xml
+++ b/app/src/main/res/layout/activity_server_phone.xml
@@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="50dp"
+ android:visibility="gone"
android:orientation="horizontal">
<TextView
diff --git a/app/src/main/res/layout/driver_one.xml b/app/src/main/res/layout/driver_one.xml
index 687cefa..66af3a4 100644
--- a/app/src/main/res/layout/driver_one.xml
+++ b/app/src/main/res/layout/driver_one.xml
@@ -25,6 +25,7 @@
android:layout_marginEnd="14dp"
android:background="@drawable/bg_login"
android:textSize="14sp"
+ android:visibility="gone"
android:layout_height="40dp"/>
diff --git a/app/src/main/res/layout/driver_two.xml b/app/src/main/res/layout/driver_two.xml
index 6d68b82..f9e3c8a 100644
--- a/app/src/main/res/layout/driver_two.xml
+++ b/app/src/main/res/layout/driver_two.xml
@@ -487,6 +487,7 @@
android:text="下一步"
android:textColor="#ffffffff"
android:gravity="center"
+ android:visibility="gone"
android:layout_marginTop="20dp"
android:layout_marginStart="14dp"
android:layout_marginBottom="14dp"
diff --git "a/\345\220\257\345\212\250\343\200\201\345\274\225\345\257\274\351\241\265.zip" "b/\345\220\257\345\212\250\343\200\201\345\274\225\345\257\274\351\241\265.zip"
deleted file mode 100644
index b90cc81..0000000
--- "a/\345\220\257\345\212\250\343\200\201\345\274\225\345\257\274\351\241\265.zip"
+++ /dev/null
Binary files differ
--
Gitblit v1.7.1