finish

lmw

2023-04-04 87e6b991718d604841bf5319725b10de468b6294

finish

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.zhaoyang.driver"
        minSdkVersion 21
        targetSdkVersion 28
        versionCode 20
        versionName "1.4.9"
        versionCode 1
        versionName "1.0"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/AndroidManifest.xml

@@ -174,7 +174,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="1111276329" />
                <data android:scheme="102047428" />
            </intent-filter>
        </activity>
        <activity

 app/src/main/java/com/zhaoyang/driver/base/MyApplication.kt

@@ -76,8 +76,8 @@
            ""
        )
        registerActivityLifecycleCallbacks(this)
        PlatformConfig.setWeixin("wx97c33c052b2222f7", "3cb8f3db9cd20b8ec276fe2e28979aaf")
        PlatformConfig.setQQZone("1111276329", "JuAotVjQcUiesxgp") //qq互联
        PlatformConfig.setWeixin("wx6078319d54d38c66", "c3ef243fae93fb0fd093d457ada38b4c")
        PlatformConfig.setQQZone("102047428", "qcBXgbJo6B2f5HF0") //qq互联
//        CrashReport.initCrashReport(getApplicationContext(), "444bb776ed", false);
        LogUtils.OpenLog(true)
        initUpPoint()

 app/src/main/java/com/zhaoyang/driver/base/local/BaseLoginActivity.kt

@@ -105,7 +105,7 @@
            }
            view.tv_yx.clickDelay {
                view.tv_yx.textColor(this, R.color.white)
                view.tv_yh.textColor(this, R.color.main_login_orange)
                view.tv_yh.textColor(this, R.color.main_blue)
                view.tv_yx.setBackgroundResource(R.drawable.bg_login_top_left)
                view.tv_yh.setBackgroundResource(R.drawable.bg_logion_top_right)
                callys {
@@ -113,7 +113,7 @@
                }
            }
            view.tv_yh.clickDelay {
                view.tv_yx.textColor(this, R.color.main_login_orange)
                view.tv_yx.textColor(this, R.color.main_blue)
                view.tv_yh.textColor(this, R.color.white)
                view.tv_yx.setBackgroundResource(R.drawable.bg_logion_top_left)
                view.tv_yh.setBackgroundResource(R.drawable.bg_login_top_left_select)

 app/src/main/java/com/zhaoyang/driver/netUtls/Api.java

@@ -9,15 +9,15 @@
public class Api {

    //39.108.148.228 测试服务器
//    public static final String BASE_URL = "http://122.9.134.230:8081/driver/";
    public static final String BASE_URL = "http://192.168.110.50:80/driver/";
    public static final String BASE_URL = "https://www.zycx.ztrbkj.com/driver/";
//    public static final String BASE_URL = "http://192.168.110.50:80/driver/";

//    public static final String SOCKET_SERVER = "122.9.134.230";
    public static final String SOCKET_SERVER = "192.168.110.50";
    public static final String SOCKET_SERVER = "47.108.137.172";
//    public static final String SOCKET_SERVER = "192.168.110.50";
    public static final int SOCKET_PORT = 8888;
    public static final int SUCCESS = 200;

    public static final String strShare = "http://122.9.134.230/share/index.html";
    public static final String strShare = "https://www.zycx.ztrbkj.com/share/shareIndex.html";
    public static final String strShareDriver = "http://122.9.134.230:8080/driverShare/qr.html";
      public static final int WXLAUID =  WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;


 app/src/main/java/com/zhaoyang/driver/ui/mine/MineActivity.kt

@@ -70,7 +70,7 @@
            tv_order_num.text = it.orderNum
            tv_star.text = getFormatOne(it.score)
            tv_money.text = "¥" + getFormatTwo(it.balance + it.laveBusinessMoney + it.laveBusinessNextWeekMoney)
            ll_qr.visibility = if (data.qrCodeIsOpen) View.VISIBLE else View.GONE
//            ll_qr.visibility = if (data.qrCodeIsOpen) View.VISIBLE else View.GONE
            view_qr.visibility = if (data.qrCodeIsOpen) View.VISIBLE else View.GONE

        }

 app/src/main/java/com/zhaoyang/driver/ui/mine/ShareActivity.kt

@@ -1,6 +1,5 @@
package com.zhaoyang.driver.ui.mine

import android.R.attr.bitmap
import android.app.Activity
import android.graphics.Bitmap
import android.util.Log
@@ -10,7 +9,6 @@
import com.zhaoyang.driver.base.MyBaseActivity
import com.zhaoyang.driver.netUtls.Api
import com.zhaoyang.driver.ui.DialogUtil
import com.zhaoyang.driver.utils.BitmapUtil
import com.zhaoyang.driver.utils.Cache.CacheKey
import com.zhaoyang.driver.utils.QRCodeUtil
import com.scwang.smartrefresh.layout.util.SmartUtil

 app/src/main/java/com/zhaoyang/driver/wxapi/WXEntryActivity.java

@@ -49,7 +49,7 @@
    private static final String TAG = WXEntryActivity.class.getSimpleName();
    private static IWXAPI api;
    private BaseResp mResp = null;
    public static String WX_APP_ID = "wx97c33c052b2222f7";
    public static String WX_APP_ID = "wx6078319d54d38c66";
//    private String WX_APP_SECRET = "24652a2c90268579c8ccd927edc5a5e4";
    private int type;


 app/src/main/res/drawable/bg_login_top_left.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#F07207"/>
    <solid android:color="@color/main_blue"/>
    <corners android:topLeftRadius="@dimen/dp_8"/>
</shape>

 app/src/main/res/drawable/bg_login_top_left_select.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#F07207"/>
    <solid android:color="@color/main_blue"/>
    <corners android:topRightRadius="@dimen/dp_8"/>
</shape>

 app/src/main/res/drawable/bg_logion_top_left.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <stroke android:width="1dp" android:color="#fff07207" />
    <stroke android:width="1dp" android:color="@color/main_blue" />
    <solid android:color="#ffffffff" />
    <corners android:topLeftRadius="8dp"
        android:topRightRadius="0dp"

 app/src/main/res/drawable/bg_logion_top_right.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <stroke android:width="1dp" android:color="#fff07207" />
    <stroke android:width="1dp" android:color="@color/main_blue" />
    <solid android:color="#ffffffff" />
    <corners android:topLeftRadius="0dp" android:topRightRadius="8dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>

 app/src/main/res/layout/item_ys.xml

@@ -45,7 +45,7 @@
                    android:background="@drawable/bg_logion_top_right"
                    android:gravity="center"
                    android:text="用户协议"
                    android:textColor="@color/main_login_orange"
                    android:textColor="@color/main_blue"
                    android:textSize="15dp"
                    android:textStyle="bold" />

@@ -111,7 +111,7 @@
                    android:layout_gravity="center_horizontal"
                    android:layout_marginStart="4dp"
                    android:layout_toRightOf="@+id/tv_none"
                    android:background="@drawable/bg_right_login_agreen"
                    android:background="@drawable/bg_login"
                    android:gravity="center"
                    android:text="同意"
                    android:textColor="@color/write"

 app/src/main/res/mipmap-xxhdpi/car_trip.png