From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期三, 25 六月 2025 19:49:48 +0800 Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑,增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑,提高容错性 - 改进支付方式获取方法,增加错误处理和日志记录 -调整充值接口调用参数,确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型,改为字符串处理 --- baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java index 95b5e0d..cb62a5f 100644 --- a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java +++ b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java @@ -5,11 +5,17 @@ import android.content.pm.Signature; import android.os.Bundle; import android.util.Log; +import android.view.View; import androidx.appcompat.app.AppCompatActivity; +import androidx.room.RoomDatabase; +import com.dayu.baselibrary.R; import com.dayu.baselibrary.dao.AppDatabase; import com.dayu.baselibrary.dao.BaseDaoSingleton; +import com.dayu.baselibrary.view.TitleBar; + +import java.lang.reflect.Field; /** * Created by zuoxiao on 2018/12/20. @@ -22,6 +28,9 @@ public AppDatabase baseBaseDao; + + public TitleBar titleBar = null; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -31,7 +40,27 @@ this.finish(); } baseBaseDao = BaseDaoSingleton.getInstance(this); + } + + @Override + public void setContentView(View layoutResID) { + super.setContentView(layoutResID); + try { + int id = getResources().getIdentifier("titleBar", "id", getPackageName()); + View view = findViewById(id); + if (view != null && view instanceof TitleBar) { + titleBar = (TitleBar) view; + titleBar.setOnItemclickListner(TitleBar.ClickType_LEFT_IMAGE, new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + } catch (Exception e) { + e.printStackTrace(); + } } -- Gitblit v1.8.0