fix

lmw

2023-03-14 de0f0e2607ef84c1dead2e03649fa996f726dba8

fix

 app/.gitignore

@@ -1 +1,2 @@
/build
/release

 app/src/main/AndroidManifest.xml

@@ -114,7 +114,7 @@
        <activity android:name="com.fuban.driver.ui.main.HistoryOrderActivity" />
        <activity android:name="com.fuban.driver.ui.main.event.MineEventActivity" />
        <activity android:name="com.fuban.driver.ui.card.AddCardActivity"/>
        <activity android:name="com.fuban.driver.ui.main.major.MajorSureMoneyActivity"/>
        <activity android:name="com.fuban.driver.ui.main.major.MajorSureMoneyActivity" android:windowSoftInputMode="adjustPan"/>
        <activity android:name="com.fuban.driver.ui.main.major.MajorMoneyDetailActivity"/>
        <activity android:name="com.fuban.driver.ui.main.event.HistoryEventActivity" />
        <activity android:name="com.fuban.driver.ui.card.VerifyCardPwdActivity"/>

 app/src/main/java/com/fuban/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_yellow_qia)
                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_yellow_qia)
                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/fuban/driver/bean/HomeDataBean.java

@@ -114,7 +114,7 @@
        }

        public int getWork() {
            return work; //1上班 2下班
            return work; //1上班 2收车
        }

        public void setWork(int work) {

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

@@ -8,7 +8,7 @@

public class Api {

    public static boolean isTest = true;
    public static boolean isTest = false;
    //内网https://okyueche.com:443/driver/
//    public static final String BASE_URL = "http://192.168.0.80:80/driver/";
//    public static final String SOCKET_SERVER = "192.168.0.80";
@@ -25,8 +25,8 @@
    public static final int SOCKET_PORT = 9999;
    public static final int SUCCESS = 200;

    public static final String strShare = "http://116.204.107.178:82/share/shareIndex.html";
    public static final String strShareDriver = "http://116.204.107.178:82/driverShare/qr.html";
    public static final String strShare = "https://fuban.net/sharePage/share/shareIndex.html";
    public static final String strShareDriver = "https://fuban.net/sharePage/driverShare/qr.html";
      public static final int WXLAUID =  WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;

//    public static final String strShare = "http://39.108.148.228:8080/share/shareIndex.html";
@@ -50,7 +50,7 @@
     */
    public static String queryHomeData = "api/driver/queryHomeData"; ///api/driver/queryHomeData获取首页统计数据
    public static String queryMyBusiness = "api/driver/queryMyBusiness"; ///api/driver/queryMyBusiness 上班时选择的业务类型 登录操作
    public static String work = "api/driver/work"; ///api/driver/work 司机上下班操作
    public static String work = "api/driver/work"; ///api/driver/work 司机上收车操作
    public static String queryMyAllOrder = "api/order/queryMyAllOrder"; ///api/order/queryMyAllOrder 获取我的订单列表
    public static String queryOrderList = "api/order/queryOrderList"; ////api/order/queryOrderList 获取首页订单列表
    public static String grabOrder = "api/order/grabOrder"; /////api/order/grabOrder 司机抢单操作

 app/src/main/java/com/fuban/driver/ui/adapter/LetterAdapter.kt

@@ -20,7 +20,7 @@
            it.itemView.tv_letter.text = item
            if(it.adapterPosition == selectPosition){
                it.itemView.tv_letter.textColor(context,R.color.white)
                it.itemView.tv_letter.setBackgroundResource(R.drawable.bg_event_btn_one)
                it.itemView.tv_letter.setBackgroundResource(R.drawable.bg_main_4dp)
            }else{
                it.itemView.tv_letter.textColor(context,R.color.black_666666)
                it.itemView.tv_letter.setBackgroundResource(R.drawable.bg_letter_gray_city)

 app/src/main/java/com/fuban/driver/ui/adapter/TripItemAdapter.kt

@@ -88,7 +88,7 @@
                }
                6,7,8,9 -> {
                    it.itemView.tv_wait_up.text = "已送达"
                    it.itemView.tv_wait_up.textColor(context, R.color.black)
                    it.itemView.tv_wait_up.textColor(context, R.color.color_F85460)
                    it.itemView.clickDelay {
                        context.startActivity<CityOrderOverActivity>("orderType" to 3,"orderId" to item.orderId.toString()
                            ,"seatNumber" to item.seatNumber,"money" to doubleTwo(item.payMoney))

 app/src/main/java/com/fuban/driver/ui/main/GetOrderFragment.kt

@@ -23,7 +23,7 @@
class GetOrderFragment : DialogActivity() {

//    1.上班：您正在上班中 或者 xx出行，美好生活
//    2.下班：您已下班
//    2.收车：您已收车
//    3.收到订单：您收到新的【专车/出租车】【实时/预约】订单，距您xx公里，从xx出发，全程约xx公里
//    4.修改终点：请注意，乘客已修改终点


 app/src/main/java/com/fuban/driver/ui/main/MainActivity.kt

@@ -170,12 +170,12 @@
            tv_task.text = data.data.activity.toString()
            tv_car_num.text = data.data.licensePlate
            tv_lien_name.text = data.data.brand.toString()
            tv_car.text = if (data.data.work == 1) "下班" else "出车"
            tv_car.text = if (data.data.work == 1) "收车" else "出车"
            if (data.data.work == 1){
                MyApplication.getTTsManager().setVideoText("您正在上班中")
                beOnDuty(true)
            }else{
                MyApplication.getTTsManager().setVideoText("您已下班")
                MyApplication.getTTsManager().setVideoText("您已收车")
                beOnDuty(false)
            }
            tv_time.text = DateUtil.getTime(
@@ -245,7 +245,7 @@
                    homeDataBean?.data?.work = 2
                    tv_car.text = "出车"
                    beOnDuty(false)
                    MyApplication.getTTsManager().setVideoText("您已下班")
                    MyApplication.getTTsManager().setVideoText("您已收车")
                }
            } else {
                callNet(Api.queryMyBusiness, getMapByAny()){

 app/src/main/java/com/fuban/driver/ui/main/TripActivity.kt

@@ -503,7 +503,7 @@
        val carView = createView(R.layout.item_map_market, this)
        carView.iv_img.setImageResource(R.mipmap.car_trip)
        carView.tv_hint.visible()
        carView.tv_hint.setColorBuild(this,content,R.color.main_yellow,4,content.length)
        carView.tv_hint.setColorBuild(this,content,R.color.main_yellow_qia,4,content.length)
        return carView
    }


 app/src/main/java/com/fuban/driver/ui/main/add_order/AddCityOrderActivity.kt

@@ -86,6 +86,8 @@
    var currentSiteType = 0 //1：上车点 2：下车点
    var selectCityLocation = 0 //1：起点 2：2终点

    var money = 0.0//订单金额


    override fun setContentView() {
        setContentView(R.layout.activity_add_city_order)
@@ -156,6 +158,7 @@
                map["travelTime"] = DateUtil.getTime(DateUtil.TYPE0, System.currentTimeMillis())
                callNet(Api.orderCrossCity, map) {
                    var bean = gson.fromJson<AddOrderBean>(it, AddOrderBean::class.java)
                    money = bean.data.amount
                    showPatTypeDialog(bean.data.id.toString())
                }
            }
@@ -374,7 +377,7 @@
            }
            if (paytype == "3" || paytype.isEmpty()) {
                var data = gson.fromJson<AlipayBean2>(it, AlipayBean2::class.java)
                startActivity<PayQrCodeActivity>("url" to data.data.code_url)
                startActivity<PayQrCodeActivity>("url" to data.data.code_url,"money" to money)
                finish()
            }
        }

 app/src/main/java/com/fuban/driver/ui/main/add_order/PayQrCodeActivity.kt

@@ -21,6 +21,7 @@
    override fun initView() {
        setTitleText("扫码支付")
        tv_Right.text = "分享二维码"
        tv_money.text = "¥%.2f".format(intent.getDoubleExtra("money",0.0))
        var bit = QRCodeUtil.createQRCodeBitmap(url, dp2px(220f), dp2px(220f))
        iv_qr_code.setImageBitmap(bit)
    }

 app/src/main/java/com/fuban/driver/ui/mine/QrCodeActivity.kt

@@ -67,7 +67,7 @@

    }

    var content = "广西本土网约车品牌。已经获得广西交通厅颁发的线上服务能力认定。现在广西柳州落地运营。"
    var content = "福伴出行为客户提供安全、便捷、优质的个性化商旅出行用车体验，并带领客户探秘当地人文地理、风俗民情、户外运动、商务活动及相关代订业务的综合性服务平台。"
    var shareUrl = Api.strShareDriver+"?driverId="
    fun showShareDialog() {
        var dialog = DialogUtil.getDialog(mContext, R.layout.pop_share)

 app/src/main/java/com/fuban/driver/ui/to_city/TripCityActivity.kt

@@ -332,7 +332,7 @@
            }
            overAdapter.data.addAll(orderBean.data.orders)
            overAdapter.notifyDataSetChanged()
            tv_all_money_num.text = getAllByOrder()
            tv_all_money_num.text = "¥"+getAllByOrder()
        }
    }


 app/src/main/res/drawable/android_icon.png

 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="#4A4C59"/>
    <solid android:color="@color/main_yellow_qia"/>
    <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="#4A4C59"/>
    <solid android:color="@color/main_yellow_qia"/>
    <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="#6BA341" />
    <stroke android:width="1dp" android:color="@color/main_yellow_qia" />
    <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="#4A4C59" />
    <stroke android:width="1dp" android:color="@color/main_yellow_qia" />
    <solid android:color="#ffffffff" />
    <corners android:topLeftRadius="0dp" android:topRightRadius="8dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="4dp"/>
    <solid android:color="@color/main_yellow_qia"/>
</shape>

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="10dp"/>
    <stroke android:color="@color/main_yellow_qia" android:width="11dp"/>
</shape>

 app/src/main/res/drawable/bg_right_login_agreen.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="#ff4a4c59" />
    <solid android:color="@color/main_yellow_qia" />
    <corners android:radius="4dp" />
</shape>

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

@@ -1,30 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical"
    android:background="@color/white"
    android:layout_height="match_parent">

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        android:text="订单金额"
        android:id="@+id/tv_1"
        android:layout_marginTop="30dp"
        android:textColor="@color/textColor"
        android:textStyle="bold"
        android:textSize="16sp"/>
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/tv_money"
        app:layout_constraintTop_toBottomOf="@id/tv_1"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginTop="4dp"
        android:textColor="@color/red_price"
        android:textSize="32sp"
        android:textStyle="bold"/>
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_marginStart="50dp"
        android:layout_marginEnd="50dp"
        android:orientation="vertical"
        android:background="@drawable/bg_white_round_5"
        android:background="@drawable/bg_qr_code"
        android:gravity="center_horizontal"
        android:layout_marginTop="13dp"
        android:paddingTop="20dp"
        android:paddingBottom="20dp"
        android:elevation="4dp"
        android:layout_height="wrap_content">
        android:layout_marginTop="23dp"
        android:layout_marginHorizontal="22dp"
        app:layout_constraintTop_toBottomOf="@id/tv_money"
        android:layout_height="0dp"
        app:layout_constraintDimensionRatio="1:1">

        <ImageView
            android:id="@+id/iv_qr_code"
            android:layout_width="140dp"
            android:layout_height="140dp"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_margin="35dp"
            android:src="@mipmap/bg"/>


    </LinearLayout>

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,12 +6,13 @@
    android:layout_height="match_parent">

    <ImageView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginTop="180dp"
        android:scaleType="centerCrop"
        android:src="@mipmap/splash"/>
        android:src="@mipmap/icon"/>

</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -39,7 +39,7 @@
            android:layout_alignParentEnd="true"
            android:gravity="center_vertical"
            android:text="获取验证码"
            android:textColor="@color/color_81AD5A"
            android:textColor="@color/main_yellow_qia"
            android:textSize="14sp" />

    </RelativeLayout>

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

@@ -30,7 +30,7 @@
            android:layout_gravity="center_horizontal"
            android:layout_marginTop="10dp"
            android:text="￥200.00"
            android:textColor="@color/color_81AD5A"
            android:textColor="@color/red_price"
            android:textSize="36sp" />



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

@@ -11,7 +11,7 @@
        android:layout_marginStart="14dp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="系统提示"
        android:text="平台公告"
        android:textColor="#ff000000"
        android:textSize="14sp"
        />
@@ -31,8 +31,10 @@
        android:layout_marginTop="11dp"
        android:layout_marginStart="14dp"
        android:layout_below="@+id/tv_title"
        android:layout_width="347dp"
        android:layout_width="match_parent"
        android:layout_toStartOf="@id/iv_img"
        android:alpha="0.6"
        android:layout_marginEnd="10dp"
        android:layout_height="17dp"
        android:text="您呼叫的专车司机已经到达预约地点，请前往乘车"
        android:textColor="#ff000000"
@@ -47,7 +49,7 @@
        android:layout_height="wrap_content"
        android:layout_alignParentEnd="true"
        android:text="2019-05-02 10:48"
        android:textColor="#ff000000"
        android:textColor="@color/textColorHint"
        android:textSize="12sp"
        />


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

@@ -46,7 +46,7 @@
        android:layout_height="wrap_content"
        android:layout_alignParentEnd="true"
        android:text="2019-05-02 10:48"
        android:textColor="#ff000000"
        android:textColor="@color/textColorHint"
        android:textSize="12sp"
        />


 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_yellow_qia"
                    android:textSize="15dp"
                    android:textStyle="bold" />


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

@@ -58,6 +58,7 @@
            android:background="@null"
            android:padding="5dp"
            android:text="微信支付"
            android:visibility="gone"
            android:textColor="@color/black"
            android:textSize="@dimen/textSize" />