Merge remote-tracking branch 'origin/master'

tj

2 天以前 93775e1f3d79a1e11b839abbf24201dafcd9e646

 app/src/main/java/com/example/firstapp/utils/CodeUtils.kt

@@ -23,7 +23,7 @@
        val existingCode = Core.code.queryByTypeAndCodeAndDate(
            code.category,
            code.code,
            code.createTime
            code.smsTimestamp
        )

        return if (existingCode == null) {
@@ -51,7 +51,8 @@
        company: String?,
        pickupCode: String?,
        address: String?,
        time: String?
        time: String?,
        smsTimestamp: Long = 0
    ): Code {
//        val secondLevel = if (company.isNullOrEmpty()) "未知" else company
        return Code(
@@ -69,7 +70,8 @@
            pickupTime = "",
            overTime = "",
            address = address ?: "",
            remarks = time ?: ""
            remarks = time ?: "",
            smsTimestamp = smsTimestamp
        )
    }

@@ -85,7 +87,8 @@
        date: String?,
        address: String?,
        minAmount: String?,
        number: String?
        number: String?,
        smsTimestamp: Long = 0
    ): Code {
        return Code(
            id = 0,
@@ -102,7 +105,8 @@
            pickupTime = "",
            overTime = date ?: "",
            address = address ?: "",
            remarks = "最小还款金额${minAmount ?: ""}还款卡号${number ?: ""}"
            remarks = "最小还款金额${minAmount ?: ""}还款卡号${number ?: ""}",
            smsTimestamp = smsTimestamp
        )
    }

@@ -116,7 +120,8 @@
        amount: String?,
        datetime: String?,
        address: String?,
        balance: String?
        balance: String?,
        smsTimestamp: Long = 0
    ): Code {
        return Code(
            id = 0,
@@ -133,7 +138,8 @@
            pickupTime = "",
            overTime = datetime ?: "",
            address = address ?: "",
            remarks = "余额${balance ?: ""}"
            remarks = "余额${balance ?: ""}",
            smsTimestamp = smsTimestamp
        )
    }

@@ -148,7 +154,8 @@
        end: String?,
        seat: String?,
        time: String?,
        address: String?
        address: String?,
        smsTimestamp: Long = 0
    ): Code {
        return Code(
            id = 0,
@@ -165,7 +172,8 @@
            pickupTime = "",
            overTime = time ?: "",
            address = address ?: "",
            remarks = seat ?: ""
            remarks = seat ?: "",
            smsTimestamp = smsTimestamp
        )
    }

@@ -179,7 +187,8 @@
        seat: String?,
        time: String?,
        address: String?,
        trips: String?
        trips: String?,
        smsTimestamp: Long = 0
    ): Code {
        return Code(
            id = 0,
@@ -196,7 +205,8 @@
            pickupTime = "",
            overTime = time ?: "",
            address = address ?: "",
            remarks = trips ?: ""
            remarks = trips ?: "",
            smsTimestamp = smsTimestamp
        )
    }
}