fengjingqi/CkCollar_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
fengjignqi
2026-08-14 08:50:25 +08:00
parent c2dfa9145a
commit 969338f3bd
19 changed files with 91 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -29,10 +29,10 @@
</activity>
<activity
android:name=".ui.act.welcome.WelcomeActivity"
android:theme="@style/Theme.CkCollar_app.NoActionBar"></activity>
android:theme="@style/Theme.CkCollar_app.NoActionBar"/>
<activity
android:name=".ui.act.welcome.PermisstionActivity"
android:theme="@style/Theme.CkCollar_app.NoActionBar"></activity>
android:theme="@style/Theme.CkCollar_app.NoActionBar"/>
<activity
android:name=".ui.act.login.LoginActivity"
android:launchMode="singleTask"

11
app/src/main/java/com/ck/ckcollar/app/CKApp.kt
View File

@@ -54,13 +54,10 @@ class CKApp : Application() {
Glide.init(this, GlideBuilder().setDefaultRequestOptions(defaultOptions))
//SkinManager.getInstance().init(this);
UMConfigure.setLogEnabled(true)
MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.MANUAL);
UMConfigure.preInit(this, "6a618cf0e88ae439bf379f37", "UM");
UMConfigure.init(this, "6a618cf0e88ae439bf379f37", "UM", UMConfigure.DEVICE_TYPE_PHONE, "");
// UMConfigure.setLogEnabled(true)
// MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.MANUAL);
// UMConfigure.preInit(this, "6a618cf0e88ae439bf379f37", "UM");
// UMConfigure.init(this, "6a618cf0e88ae439bf379f37", "UM", UMConfigure.DEVICE_TYPE_PHONE, "");
TTLog.isLogEable(true)
}

2
app/src/main/java/com/ck/ckcollar/app/ui/act/home/MainActivity.kt
View File

@@ -156,7 +156,7 @@ class MainActivity : CKLHBaseActivity(),View.OnClickListener {
// }
// }).show()
checkUpdate()
// checkUpdate()
}

35
app/src/main/java/com/ck/ckcollar/app/ui/act/order/PayOrderActivity.kt
View File

@@ -116,6 +116,7 @@ class PayOrderActivity : CKBaseActivity() {
}else{
binding.image3.setImageResource(R.mipmap.image_address_check_narmal)
}
clearExternalPaymentIfNotNeeded()
}
binding.btnPoints.setOnClickListener {
if ((memberModel?.points ?: 0.0) <= 0.0) {
@@ -129,6 +130,7 @@ class PayOrderActivity : CKBaseActivity() {
}else{
binding.image4.setImageResource(R.mipmap.image_address_check_narmal)
}
clearExternalPaymentIfNotNeeded()
}
@@ -435,6 +437,33 @@ class PayOrderActivity : CKBaseActivity() {
.setScale(2, RoundingMode.HALF_UP)
}
private fun isInternalPaymentSufficient(): Boolean {
var internalAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP)
if (selectBalance) {
internalAmount = internalAmount.add(
BigDecimal.valueOf(memberModel?.balance ?: 0.0)
.setScale(2, RoundingMode.HALF_UP)
)
}
if (selectPoints) {
internalAmount = internalAmount.add(
calculatePointsDeduction() ?: BigDecimal.ZERO
)
}
val payAmount = BigDecimal.valueOf(model.payAmount)
.setScale(2, RoundingMode.HALF_UP)
return internalAmount >= payAmount
}
private fun clearExternalPaymentIfNotNeeded() {
if (!isInternalPaymentSufficient()) return
payType = ""
binding.image1.setImageResource(R.mipmap.image_address_check_narmal)
binding.image2.setImageResource(R.mipmap.image_address_check_narmal)
}
fun aliPay(orderStr: String) {
GlobalScope.launch(Dispatchers.IO) {
@@ -491,6 +520,12 @@ class PayOrderActivity : CKBaseActivity() {
var payClick = object : View.OnClickListener {
override fun onClick(v: View?) {
if (isInternalPaymentSufficient()) {
clearExternalPaymentIfNotNeeded()
toast("当前支付方式无需使用三方支付")
return
}
binding.image1.setImageResource(R.mipmap.image_address_check_narmal)
binding.image2.setImageResource(R.mipmap.image_address_check_narmal)
when (v?.id) {

3
app/src/main/java/com/ck/ckcollar/app/ui/act/setting/SettingActivity.kt
View File

@@ -12,6 +12,8 @@ import com.ck.ckcollar.app.ui.act.login.AgreementActivity
import com.ck.ckcollar.app.ui.act.login.LoginActivity
import com.ck.ckcollar.app.ui.base.CKBaseActivity
import com.ck.ckcollar.app.ui.dialog.CKAlertDialog
import com.ck.ckcollar.app.utils.Const
import com.cyclone.shadowsocks.utils.PreferencesUtils
import com.tt.kit.model.Data
import com.tt.kit.model.DataCollection
@@ -48,6 +50,7 @@ class SettingActivity : CKBaseActivity(), View.OnClickListener {
R.id.btnLogout -> CKAlertDialog(this, getString(R.string.logout), getString(R.string.logout_alert), object : CKAlertDialog.AlertClickListener {
override fun onBack(isConfirm: Boolean) {
if (isConfirm) {
PreferencesUtils.putString(this@SettingActivity, Const.MESSAGE,"[]")
CKApp.app.clearLoginState()
startActivity(Intent(this@SettingActivity, MainActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)

45
app/src/main/java/com/ck/ckcollar/app/ui/act/shop/OrderActivity.kt
View File

@@ -132,6 +132,7 @@ class OrderActivity : CKBaseActivity() {
}else{
binding.image3.setImageResource(R.mipmap.image_address_check_narmal)
}
clearExternalPaymentIfNotNeeded()
}
binding.btnPoints.setOnClickListener {
if ((memberModel?.points ?: 0.0) <= 0.0) {
@@ -145,6 +146,7 @@ class OrderActivity : CKBaseActivity() {
}else{
binding.image4.setImageResource(R.mipmap.image_address_check_narmal)
}
clearExternalPaymentIfNotNeeded()
}
binding.contentAddress.setOnClickListener {
@@ -318,6 +320,7 @@ class OrderActivity : CKBaseActivity() {
param.put("buyerNote", "")
param.put("items", items)
param.put("payPassword", payPassword)
param.put("orderId", model.orderId)
showProgeassDialog(getString(R.string.order))
TTHttpClient.postJson(this, "下单", param.toString(), object : ICallback {
@@ -358,10 +361,11 @@ class OrderActivity : CKBaseActivity() {
toast(msg)
//原有【不足】的字符串判断条件
if (code.equals("502")){
toActivity(
MyOrderActivity::class.java,
DataCollection().apply { add(Data("pos", "1")) })
finish()
var a = 0;
// toActivity(
// MyOrderActivity::class.java,
// DataCollection().apply { add(Data("pos", "1")) })
// finish()
}
}
})
@@ -568,8 +572,41 @@ class OrderActivity : CKBaseActivity() {
.setScale(2, RoundingMode.HALF_UP)
}
private fun isInternalPaymentSufficient(): Boolean {
var internalAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP)
if (selectBalance) {
internalAmount = internalAmount.add(
BigDecimal.valueOf(memberModel?.balance ?: 0.0)
.setScale(2, RoundingMode.HALF_UP)
)
}
if (selectPoints) {
internalAmount = internalAmount.add(
calculatePointsDeduction() ?: BigDecimal.ZERO
)
}
val payAmount = BigDecimal.valueOf(model.payAmount)
.setScale(2, RoundingMode.HALF_UP)
return internalAmount >= payAmount
}
private fun clearExternalPaymentIfNotNeeded() {
if (!isInternalPaymentSufficient()) return
payType = ""
binding.image1.setImageResource(R.mipmap.image_address_check_narmal)
binding.image2.setImageResource(R.mipmap.image_address_check_narmal)
}
var payClick = object : View.OnClickListener {
override fun onClick(v: View?) {
if (isInternalPaymentSufficient()) {
clearExternalPaymentIfNotNeeded()
toast("当前支付方式无需使用三方支付")
return
}
binding.image1.setImageResource(R.mipmap.image_address_check_narmal)
binding.image2.setImageResource(R.mipmap.image_address_check_narmal)
when (v?.id) {

3
app/src/main/res/layout/activity_login.xml
View File

@@ -172,7 +172,8 @@
android:layout_marginTop="10dp"
android:background="@drawable/bg_login_button"
android:text="临时快捷登录"
android:textColor="@color/buttonTextColor" />
android:textColor="@color/buttonTextColor"
android:visibility="gone"/>
<com.ck.ckcollar.app.widget.CKLinearLayout
android:layout_width="match_parent"

6
app/src/main/res/layout/dialog_update_alert.xml
View File

@@ -45,7 +45,7 @@
android:textColor="@color/textColor"
android:textSize="14sp"
android:layout_marginBottom="12dp"
android:text="立即升级"></com.ck.ckcollar.app.widget.CKButton>
android:text="立即升级"/>
<com.ck.ckcollar.app.widget.CKButton
android:id="@+id/btnCenlel"
@@ -56,7 +56,7 @@
android:textColor="@color/textSecondColor"
android:textSize="14sp"
android:layout_marginBottom="12dp"
android:text="暂不升级"></com.ck.ckcollar.app.widget.CKButton>
android:text="暂不升级"/>
</com.ck.ckcollar.app.widget.CKLinearLayout>
@@ -67,5 +67,5 @@
android:src="@mipmap/image_update"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
></com.ck.ckcollar.app.widget.CKImageView>
/>
</com.ck.ckcollar.app.widget.CKRelativeLayout>