소스 검색

1.修改连连钱包的明细列表显示。

shihuiyun 2 년 전
부모
커밋
24a7700e12

+ 137 - 110
app/map.txt

@@ -1,7 +1,7 @@
 # compiler: R8
 # compiler_version: 3.1.66
 # min_api: 23
-# pg_map_id: e0da40a
+# pg_map_id: 07dc523
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"1.0"}
 a2.ContentInfoCompat$Api31Impl$$ExternalSyntheticLambda0 -> a2.c:
@@ -142,8 +142,10 @@ ac.CloundActivity$$ExternalSyntheticLambda0 -> ac.j:
 ac.CloundActivity$$ExternalSyntheticLambda1 -> ac.k:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    com.hdl.xl.activity.CloundActivity com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.f$0 -> a
-    void com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.<init>(com.hdl.xl.activity.CloundActivity) -> <init>
+    com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1 com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.INSTANCE -> a
+    void com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.<clinit>() -> <clinit>
+      # {"id":"com.android.tools.r8.synthesized"}
+    void com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.<init>() -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
     void com.hdl.xl.activity.CloundActivity$$InternalSyntheticLambda$0$cc1e55350e36b406cfd6ad1dd33145cb6045f331a9c5bc9e1a72d550b19da98b$1.onChanged(java.lang.Object) -> b
       # {"id":"com.android.tools.r8.synthesized"}
@@ -200962,13 +200964,12 @@ com.hdl.xl.activity.CloudWithActivity$listeners$1 -> com.hdl.xl.activity.CloudWi
 com.hdl.xl.activity.CloundActivity -> com.hdl.xl.activity.CloundActivity:
 # {"id":"sourceFile","fileName":"CloundActivity.kt"}
     1:1:void <init>():49:49 -> <init>
-    void $r8$lambda$BQaIe4sn-FjReK2vP04PDyByNqw(com.hdl.xl.activity.CloundActivity,java.util.List) -> V
+    void $r8$lambda$6_H5lAO5A9woQB3ErwtaQQXNVOo(java.util.List) -> V
       # {"id":"com.android.tools.r8.synthesized"}
     void $r8$lambda$bE8IffgfvwqdFZNRm-U0kKpRvEo(com.hdl.xl.activity.CloundActivity,java.lang.String) -> W
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void init$lambda-0(com.hdl.xl.activity.CloundActivity,java.lang.String):59:59 -> X
-    1:4:void init$lambda-1(com.hdl.xl.activity.CloundActivity,java.util.List):87:90 -> Y
-    5:7:void init$lambda-1(com.hdl.xl.activity.CloundActivity,java.util.List):92:94 -> Y
+    void init$lambda-1(java.util.List) -> Y
     1:1:com.hdl.xl.databinding.ActivityCloudBinding access$getBinding(com.hdl.xl.activity.CloundActivity):49:49 -> access$getBinding
     1:1:com.hdl.xl.vmodel.CloudVModel access$getVm(com.hdl.xl.activity.CloundActivity):49:49 -> access$getVm
     1:1:androidx.databinding.ViewDataBinding binding():49:49 -> binding
@@ -203084,9 +203085,30 @@ com.hdl.xl.adapter.CloudWalletAdapter -> com.hdl.xl.adapter.CloudWalletAdapter:
     1:1:void convert(com.chad.library.adapter.base.viewholder.BaseViewHolder,java.lang.Object):13:13 -> convert
     1:2:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):17:18 -> e
     3:6:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):21:24 -> e
-    7:9:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):27:29 -> e
+    7:8:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):26:27 -> e
+    9:9:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):29:29 -> e
     10:10:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
-    11:11:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):33:33 -> e
+    11:11:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):36:36 -> e
+    12:12:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    13:13:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):51:51 -> e
+    14:14:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    15:15:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):60:60 -> e
+    16:16:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    17:17:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):39:39 -> e
+    18:18:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    19:19:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):48:48 -> e
+    20:20:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    21:21:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):45:45 -> e
+    22:22:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    23:23:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):54:54 -> e
+    24:24:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    25:25:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):63:63 -> e
+    26:26:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    27:27:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):42:42 -> e
+    28:28:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    29:29:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):57:57 -> e
+    30:30:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):31:31 -> e
+    31:31:void convert(com.chad.library.adapter.base.viewholder.BaseDataBindingHolder,com.hdl.xl.model.AcctList):33:33 -> e
     1:1:com.hdl.xl.vmodel.CloudVModel getVm():13:13 -> f
     1:1:void setVm(com.hdl.xl.vmodel.CloudVModel):13:13 -> g
 com.hdl.xl.adapter.CollectAdapter -> com.hdl.xl.adapter.CollectAdapter:
@@ -211678,40 +211700,47 @@ com.hdl.xl.model.AcctApply -> com.hdl.xl.model.AcctApply:
     1:1:void setUser_id(java.lang.String):9:9 -> setUser_id
 com.hdl.xl.model.AcctInfo -> com.hdl.xl.model.AcctInfo:
 # {"id":"sourceFile","fileName":"AcctInfo.kt"}
-    1:3:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.List):8:10 -> <init>
-    1:1:java.util.List getAcctinfo_list():10:10 -> getAcctinfo_list
-    1:1:java.lang.String getBank_open_flag():9:9 -> getBank_open_flag
-    1:1:java.lang.String getId():10:10 -> getId
-    1:1:java.lang.String getRet_code():10:10 -> getRet_code
-    1:1:java.lang.String getUser_status():9:9 -> getUser_status
-    1:1:void setAcctinfo_list(java.util.List):10:10 -> setAcctinfo_list
-    1:1:void setBank_open_flag(java.lang.String):9:9 -> setBank_open_flag
-    1:1:void setId(java.lang.String):10:10 -> setId
-    1:1:void setRet_code(java.lang.String):10:10 -> setRet_code
-    1:1:void setUser_status(java.lang.String):9:9 -> setUser_status
+    1:4:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.List):9:12 -> <init>
+    5:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.List):14:14 -> <init>
+    1:1:java.util.List getAcctinfo_list():14:14 -> getAcctinfo_list
+    1:1:java.lang.String getBank_open_flag():10:10 -> getBank_open_flag
+    1:1:java.lang.String getId():14:14 -> getId
+    1:1:java.lang.String getRet_code():14:14 -> getRet_code
+    1:1:java.lang.String getTotal_balaval():11:11 -> getTotal_balaval
+    1:1:java.lang.String getTotal_balfrz():11:11 -> getTotal_balfrz
+    1:1:java.lang.String getTotal_money():12:12 -> getTotal_money
+    1:1:java.lang.String getUser_status():10:10 -> getUser_status
+    1:1:void setAcctinfo_list(java.util.List):14:14 -> setAcctinfo_list
+    1:1:void setBank_open_flag(java.lang.String):10:10 -> setBank_open_flag
+    1:1:void setId(java.lang.String):14:14 -> setId
+    1:1:void setRet_code(java.lang.String):14:14 -> setRet_code
+    1:1:void setTotal_balaval(java.lang.String):11:11 -> setTotal_balaval
+    1:1:void setTotal_balfrz(java.lang.String):11:11 -> setTotal_balfrz
+    1:1:void setTotal_money(java.lang.String):12:12 -> setTotal_money
+    1:1:void setUser_status(java.lang.String):10:10 -> setUser_status
 com.hdl.xl.model.AcctInfo$AcctinfoList -> com.hdl.xl.model.AcctInfo$AcctinfoList:
 # {"id":"sourceFile","fileName":"AcctInfo.kt"}
-    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):12:12 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):14:14 -> <init>
-    3:3:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):16:16 -> <init>
-    1:1:java.lang.String getAcct_state():12:12 -> getAcct_state
-    1:1:java.lang.String getAcct_type():12:12 -> getAcct_type
-    1:1:java.lang.String getAmt_balaval():12:12 -> getAmt_balaval
-    1:1:java.lang.String getAmt_balcur():14:14 -> getAmt_balcur
-    1:1:java.lang.String getAmt_balfrz():14:14 -> getAmt_balfrz
-    1:1:java.lang.String getAmt_lastaval():14:14 -> getAmt_lastaval
-    1:1:java.lang.String getAmt_lastbal():16:16 -> getAmt_lastbal
-    1:1:java.lang.String getAmt_lastfrz():16:16 -> getAmt_lastfrz
-    1:1:java.lang.String getOid_acctno():16:16 -> getOid_acctno
-    1:1:void setAcct_state(java.lang.String):12:12 -> setAcct_state
-    1:1:void setAcct_type(java.lang.String):12:12 -> setAcct_type
-    1:1:void setAmt_balaval(java.lang.String):12:12 -> setAmt_balaval
-    1:1:void setAmt_balcur(java.lang.String):14:14 -> setAmt_balcur
-    1:1:void setAmt_balfrz(java.lang.String):14:14 -> setAmt_balfrz
-    1:1:void setAmt_lastaval(java.lang.String):14:14 -> setAmt_lastaval
-    1:1:void setAmt_lastbal(java.lang.String):16:16 -> setAmt_lastbal
-    1:1:void setAmt_lastfrz(java.lang.String):16:16 -> setAmt_lastfrz
-    1:1:void setOid_acctno(java.lang.String):16:16 -> setOid_acctno
+    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):16:16 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):18:18 -> <init>
+    3:3:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):20:20 -> <init>
+    1:1:java.lang.String getAcct_state():16:16 -> getAcct_state
+    1:1:java.lang.String getAcct_type():16:16 -> getAcct_type
+    1:1:java.lang.String getAmt_balaval():16:16 -> getAmt_balaval
+    1:1:java.lang.String getAmt_balcur():18:18 -> getAmt_balcur
+    1:1:java.lang.String getAmt_balfrz():18:18 -> getAmt_balfrz
+    1:1:java.lang.String getAmt_lastaval():18:18 -> getAmt_lastaval
+    1:1:java.lang.String getAmt_lastbal():20:20 -> getAmt_lastbal
+    1:1:java.lang.String getAmt_lastfrz():20:20 -> getAmt_lastfrz
+    1:1:java.lang.String getOid_acctno():20:20 -> getOid_acctno
+    1:1:void setAcct_state(java.lang.String):16:16 -> setAcct_state
+    1:1:void setAcct_type(java.lang.String):16:16 -> setAcct_type
+    1:1:void setAmt_balaval(java.lang.String):16:16 -> setAmt_balaval
+    1:1:void setAmt_balcur(java.lang.String):18:18 -> setAmt_balcur
+    1:1:void setAmt_balfrz(java.lang.String):18:18 -> setAmt_balfrz
+    1:1:void setAmt_lastaval(java.lang.String):18:18 -> setAmt_lastaval
+    1:1:void setAmt_lastbal(java.lang.String):20:20 -> setAmt_lastbal
+    1:1:void setAmt_lastfrz(java.lang.String):20:20 -> setAmt_lastfrz
+    1:1:void setOid_acctno(java.lang.String):20:20 -> setOid_acctno
 com.hdl.xl.model.AcctList -> com.hdl.xl.model.AcctList:
 # {"id":"sourceFile","fileName":"AcctList.kt"}
     1:4:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String):8:11 -> <init>
@@ -217249,7 +217278,7 @@ com.hdl.xl.utils.net.ApiService -> com.hdl.xl.utils.net.ApiService:
 # {"id":"sourceFile","fileName":"ApiService.kt"}
 com.hdl.xl.utils.net.ApiService$DefaultImpls -> com.hdl.xl.utils.net.ApiService$a:
 # {"id":"sourceFile","fileName":"ApiService.kt"}
-    1:1:io.reactivex.Observable register$default(com.hdl.xl.utils.net.ApiService,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,java.lang.Object):848:848 -> a
+    1:1:io.reactivex.Observable register$default(com.hdl.xl.utils.net.ApiService,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,java.lang.Object):851:851 -> a
 com.hdl.xl.utils.net.BBDCApiService -> com.hdl.xl.utils.net.BBDCApiService:
 # {"id":"sourceFile","fileName":"BBDCApiService.kt"}
 com.hdl.xl.utils.net.BBDCApiService$DefaultImpls -> com.hdl.xl.utils.net.BBDCApiService$a:
@@ -218485,82 +218514,82 @@ com.hdl.xl.vmodel.CloudVModel -> vc.v:
     androidx.lifecycle.MutableLiveData withdrawal -> N
     androidx.lifecycle.MutableLiveData money -> O
     androidx.lifecycle.MutableLiveData acctName -> K
-    1:1:void <init>(android.app.Application):22:22 -> <init>
-    2:3:void <init>(android.app.Application):26:27 -> <init>
-    4:4:void <init>(android.app.Application):29:29 -> <init>
-    5:10:void <init>(android.app.Application):31:36 -> <init>
-    11:11:void <init>(android.app.Application):40:40 -> <init>
-    12:12:void <init>(android.app.Application):42:42 -> <init>
-    1:1:java.lang.String getAcct_type():27:27 -> A
-    1:1:androidx.lifecycle.MutableLiveData getAll():31:31 -> B
-    1:1:androidx.lifecycle.MutableLiveData getGatewayUrl():40:40 -> C
-    1:1:androidx.lifecycle.MutableLiveData getIncome():32:32 -> D
-    1:1:androidx.lifecycle.MutableLiveData getList():42:42 -> E
-    1:1:androidx.lifecycle.MutableLiveData getMoney():34:34 -> F
-    1:1:androidx.lifecycle.MutableLiveData getMoneyAvailable():35:35 -> G
-    1:1:androidx.lifecycle.MutableLiveData getMoneyFrozen():36:36 -> H
-    1:1:java.lang.String getStatus():26:26 -> I
-    1:1:androidx.lifecycle.MutableLiveData getWithdrawal():33:33 -> J
-    1:1:void setAcctName(androidx.lifecycle.MutableLiveData):29:29 -> K
-    1:1:void setAcct_type(java.lang.String):27:27 -> L
-    1:1:void setAll(androidx.lifecycle.MutableLiveData):31:31 -> M
-    1:1:void setGatewayUrl(androidx.lifecycle.MutableLiveData):40:40 -> N
-    1:1:void setIncome(androidx.lifecycle.MutableLiveData):32:32 -> O
-    1:1:void setList(androidx.lifecycle.MutableLiveData):42:42 -> P
-    1:1:void setMoney(androidx.lifecycle.MutableLiveData):34:34 -> Q
-    1:1:void setMoneyAvailable(androidx.lifecycle.MutableLiveData):35:35 -> R
-    1:1:void setMoneyFrozen(androidx.lifecycle.MutableLiveData):36:36 -> S
-    1:1:void setStatus(java.lang.String):26:26 -> T
-    1:1:void setWithdrawal(androidx.lifecycle.MutableLiveData):33:33 -> U
-    1:1:void toRecharge():112:112 -> V
-    1:1:void toWithdrawal():119:119 -> W
-    1:1:kotlin.jvm.functions.Function1 apiFunc():124:124 -> s
-    1:1:void getAcctApply():89:89 -> w
-    1:1:void getAcctInfo():69:69 -> x
-    1:1:androidx.lifecycle.MutableLiveData getAcctName():29:29 -> y
-    1:1:void getAcctUser():46:46 -> z
+    1:1:void <init>(android.app.Application):23:23 -> <init>
+    2:3:void <init>(android.app.Application):27:28 -> <init>
+    4:4:void <init>(android.app.Application):30:30 -> <init>
+    5:10:void <init>(android.app.Application):32:37 -> <init>
+    11:11:void <init>(android.app.Application):41:41 -> <init>
+    12:12:void <init>(android.app.Application):43:43 -> <init>
+    1:1:java.lang.String getAcct_type():28:28 -> A
+    1:1:androidx.lifecycle.MutableLiveData getAll():32:32 -> B
+    1:1:androidx.lifecycle.MutableLiveData getGatewayUrl():41:41 -> C
+    1:1:androidx.lifecycle.MutableLiveData getIncome():33:33 -> D
+    1:1:androidx.lifecycle.MutableLiveData getList():43:43 -> E
+    1:1:androidx.lifecycle.MutableLiveData getMoney():35:35 -> F
+    1:1:androidx.lifecycle.MutableLiveData getMoneyAvailable():36:36 -> G
+    1:1:androidx.lifecycle.MutableLiveData getMoneyFrozen():37:37 -> H
+    1:1:java.lang.String getStatus():27:27 -> I
+    1:1:androidx.lifecycle.MutableLiveData getWithdrawal():34:34 -> J
+    1:1:void setAcctName(androidx.lifecycle.MutableLiveData):30:30 -> K
+    1:1:void setAcct_type(java.lang.String):28:28 -> L
+    1:1:void setAll(androidx.lifecycle.MutableLiveData):32:32 -> M
+    1:1:void setGatewayUrl(androidx.lifecycle.MutableLiveData):41:41 -> N
+    1:1:void setIncome(androidx.lifecycle.MutableLiveData):33:33 -> O
+    1:1:void setList(androidx.lifecycle.MutableLiveData):43:43 -> P
+    1:1:void setMoney(androidx.lifecycle.MutableLiveData):35:35 -> Q
+    1:1:void setMoneyAvailable(androidx.lifecycle.MutableLiveData):36:36 -> R
+    1:1:void setMoneyFrozen(androidx.lifecycle.MutableLiveData):37:37 -> S
+    1:1:void setStatus(java.lang.String):27:27 -> T
+    1:1:void setWithdrawal(androidx.lifecycle.MutableLiveData):34:34 -> U
+    1:1:void toRecharge():116:116 -> V
+    1:1:void toWithdrawal():123:123 -> W
+    1:1:kotlin.jvm.functions.Function1 apiFunc():128:128 -> s
+    1:1:void getAcctApply():93:93 -> w
+    1:1:void getAcctInfo():70:70 -> x
+    1:1:androidx.lifecycle.MutableLiveData getAcctName():30:30 -> y
+    1:1:void getAcctUser():47:47 -> z
 com.hdl.xl.vmodel.CloudVModel$apiFunc$1 -> vc.v$a:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):124:124 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):128:128 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctApply$1 -> vc.v$b:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):89:89 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):104:104 -> invokeSuspend
-    3:5:java.lang.Object invokeSuspend(java.lang.Object):89:89 -> invokeSuspend
-    6:7:java.lang.Object invokeSuspend(java.lang.Object):92:93 -> invokeSuspend
-    8:8:java.lang.Object invokeSuspend(java.lang.Object):95:95 -> invokeSuspend
-    9:10:java.lang.Object invokeSuspend(java.lang.Object):97:98 -> invokeSuspend
-    11:11:java.lang.Object invokeSuspend(java.lang.Object):104:104 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):93:93 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):108:108 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):93:93 -> invokeSuspend
+    6:7:java.lang.Object invokeSuspend(java.lang.Object):96:97 -> invokeSuspend
+    8:8:java.lang.Object invokeSuspend(java.lang.Object):99:99 -> invokeSuspend
+    9:10:java.lang.Object invokeSuspend(java.lang.Object):101:102 -> invokeSuspend
+    11:11:java.lang.Object invokeSuspend(java.lang.Object):108:108 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctApply$1$it$1 -> vc.v$b$a:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):90:90 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):94:94 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctInfo$1 -> vc.v$c:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):69:69 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):83:83 -> invokeSuspend
-    3:5:java.lang.Object invokeSuspend(java.lang.Object):69:69 -> invokeSuspend
-    6:6:java.lang.Object invokeSuspend(java.lang.Object):71:71 -> invokeSuspend
-    7:7:java.lang.Object invokeSuspend(java.lang.Object):73:73 -> invokeSuspend
-    8:8:java.lang.Object invokeSuspend(java.lang.Object):75:75 -> invokeSuspend
-    9:9:java.lang.Object invokeSuspend(java.lang.Object):78:78 -> invokeSuspend
-    10:10:java.lang.Object invokeSuspend(java.lang.Object):83:83 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):70:70 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):87:87 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):70:70 -> invokeSuspend
+    6:6:java.lang.Object invokeSuspend(java.lang.Object):72:72 -> invokeSuspend
+    7:7:java.lang.Object invokeSuspend(java.lang.Object):74:74 -> invokeSuspend
+    8:8:java.lang.Object invokeSuspend(java.lang.Object):76:76 -> invokeSuspend
+    9:11:java.lang.Object invokeSuspend(java.lang.Object):80:82 -> invokeSuspend
+    12:12:java.lang.Object invokeSuspend(java.lang.Object):87:87 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctInfo$1$it$1 -> vc.v$c$a:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):70:70 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):71:71 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctUser$1 -> vc.v$d:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):46:46 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):65:65 -> invokeSuspend
-    3:5:java.lang.Object invokeSuspend(java.lang.Object):46:46 -> invokeSuspend
-    6:7:java.lang.Object invokeSuspend(java.lang.Object):48:49 -> invokeSuspend
-    8:8:java.lang.Object invokeSuspend(java.lang.Object):51:51 -> invokeSuspend
-    9:9:java.lang.Object invokeSuspend(java.lang.Object):54:54 -> invokeSuspend
-    10:10:java.lang.Object invokeSuspend(java.lang.Object):56:56 -> invokeSuspend
-    11:11:java.lang.Object invokeSuspend(java.lang.Object):59:59 -> invokeSuspend
-    12:12:java.lang.Object invokeSuspend(java.lang.Object):65:65 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):47:47 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):66:66 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):47:47 -> invokeSuspend
+    6:7:java.lang.Object invokeSuspend(java.lang.Object):49:50 -> invokeSuspend
+    8:8:java.lang.Object invokeSuspend(java.lang.Object):52:52 -> invokeSuspend
+    9:9:java.lang.Object invokeSuspend(java.lang.Object):55:55 -> invokeSuspend
+    10:10:java.lang.Object invokeSuspend(java.lang.Object):57:57 -> invokeSuspend
+    11:11:java.lang.Object invokeSuspend(java.lang.Object):60:60 -> invokeSuspend
+    12:12:java.lang.Object invokeSuspend(java.lang.Object):66:66 -> invokeSuspend
 com.hdl.xl.vmodel.CloudVModel$getAcctUser$1$it$1 -> vc.v$d$a:
 # {"id":"sourceFile","fileName":"CloudVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):47:47 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):48:48 -> invokeSuspend
 com.hdl.xl.vmodel.CloudWithVModel -> vc.w:
 # {"id":"sourceFile","fileName":"CloudWithVModel.kt"}
     java.lang.String money -> K
@@ -218585,15 +218614,13 @@ com.hdl.xl.vmodel.CloudWithVModel -> vc.w:
 com.hdl.xl.vmodel.CloudWithVModel$getKeysInfo$1 -> vc.w$a:
 # {"id":"sourceFile","fileName":"CloudWithVModel.kt"}
     1:1:java.lang.Object invokeSuspend(java.lang.Object):112:112 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):120:120 -> invokeSuspend
-    3:3:java.lang.Object invokeSuspend(java.lang.Object):112:112 -> invokeSuspend
-    4:4:java.lang.Object invokeSuspend(java.lang.Object):114:114 -> invokeSuspend
-    5:5:java.lang.Object invokeSuspend(java.lang.Object):112:112 -> invokeSuspend
-    6:7:java.lang.Object invokeSuspend(java.lang.Object):117:118 -> invokeSuspend
-    8:8:java.lang.Object invokeSuspend(java.lang.Object):120:120 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):121:121 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):112:112 -> invokeSuspend
+    6:7:java.lang.Object invokeSuspend(java.lang.Object):118:119 -> invokeSuspend
+    8:8:java.lang.Object invokeSuspend(java.lang.Object):121:121 -> invokeSuspend
 com.hdl.xl.vmodel.CloudWithVModel$getKeysInfo$1$it$1 -> vc.w$a$a:
 # {"id":"sourceFile","fileName":"CloudWithVModel.kt"}
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):114:114 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):113:113 -> invokeSuspend
 com.hdl.xl.vmodel.CloudWithVModel$setSendSms$1 -> vc.w$b:
 # {"id":"sourceFile","fileName":"CloudWithVModel.kt"}
     1:1:java.lang.Object invokeSuspend(java.lang.Object):95:95 -> invokeSuspend

+ 11 - 11
app/src/main/java/com/hdl/xl/activity/CloundActivity.kt

@@ -81,17 +81,17 @@ class CloundActivity : MBRActivity<CloudVModel, CloudWalletAdapter, ActivityClou
 
        vm.list.observe(this){
 
-           var a=0.00
-           var b=0.00
-           var c=0.00
-           for(item in it){
-               a += item.amt_balcur.toDouble()
-               b+=item.amt_balaval.toDouble()
-               c+=item.amt_balfrz.toDouble()
-           }
-           vm.money.value=DecimalUtils.getNoCarry(a)
-           vm.moneyAvailable.value=DecimalUtils.getNoCarry(b)
-           vm.moneyFrozen.value=DecimalUtils.getNoCarry(c)
+//           var a=0.00
+//           var b=0.00
+//           var c=0.00
+//           for(item in it){
+//               a += item.amt_balcur.toDouble()
+//               b+=item.amt_balaval.toDouble()
+//               c+=item.amt_balfrz.toDouble()
+//           }
+//           vm.money.value=DecimalUtils.getNoCarry(a)
+//           vm.moneyAvailable.value=DecimalUtils.getNoCarry(b)
+//           vm.moneyFrozen.value=DecimalUtils.getNoCarry(c)
        }
 
 

+ 38 - 7
app/src/main/java/com/hdl/xl/adapter/CloudWalletAdapter.kt

@@ -23,14 +23,45 @@ class CloudWalletAdapter(var vm: CloudVModel) :
         val res = simpleDateFormat.format(date1)
         holder.dataBinding?.tvTime?.text = res
 
-
-        if (item.flag_dc == "CREDIT") {
-            holder.dataBinding?.tvTitle?.text = "入账"
-            holder.dataBinding?.tvMoney?.text = "+" + item.amt
-        } else {
-            holder.dataBinding?.tvTitle?.text = "出账"
-
+        if (item.flag_dc == "DEBIT") {
             holder.dataBinding?.tvMoney?.text = "-" + item.amt
+        } else {
+            holder.dataBinding?.tvMoney?.text = "+" + item.amt
+        }
+        when(item.txn_type){
+            "USER_TOPUP"->{
+                holder.dataBinding?.tvTitle?.text = "用户充值"
+            }
+            "MCH_TOPUP"->{
+                holder.dataBinding?.tvTitle?.text = "商户充值"
+            }
+            "GENERAL_CONSUME"->{
+                holder.dataBinding?.tvTitle?.text = "普通消费"
+            }
+            "SECURED_CONSUME"->{
+                holder.dataBinding?.tvTitle?.text = "担保消费"
+            }
+            "SERVICE_FEE"->{
+                holder.dataBinding?.tvTitle?.text = "手续费收取"
+            }
+            "INNER_FUND_EXCHANGE"->{
+                holder.dataBinding?.tvTitle?.text = "内部代发"
+            }
+            "OUTER_FUND_EXCHANGE"->{
+                holder.dataBinding?.tvTitle?.text = "外部代发"
+            }
+            "ACCT_CASH_OUT"->{
+                holder.dataBinding?.tvTitle?.text = "账户提现"
+            }
+            "SECURED_CONFIRM"->{
+                holder.dataBinding?.tvTitle?.text = "担保确认"
+            }
+            "CAPITAL_CANCEL"->{
+                holder.dataBinding?.tvTitle?.text = "手续费应收应付核销"
+            }
+            "INNER_DIRECT_EXCHANGE"->{
+                holder.dataBinding?.tvTitle?.text = "定向内部代发"
+            }
         }
 
     }

+ 4 - 4
app/src/main/java/com/hdl/xl/config/Config.kt

@@ -6,14 +6,14 @@ import com.ysnows.base.config.IConfig
 object  Config : IConfig {
     override fun baseUrl(): String {
 
-//       return "https://xlapi.xiangliannft.com/api/" //正式地址
-     return "https://xianglian-api.hdlkeji.com/api/"//测试地址
+       return "https://xlapi.xiangliannft.com/api/" //正式地址
+//     return "https://xianglian-api.hdlkeji.com/api/"//测试地址
 
     }
 
     override fun searchUrl(): String? {//分享+支付回调的
-        return "https://xianglian-api.hdlkeji.com/"//测试地址
-//      return "https://xlapi.xiangliannft.com/" //正式地址
+//        return "https://xianglian-api.hdlkeji.com/"//测试地址
+      return "https://xlapi.xiangliannft.com/" //正式地址
     }
 
 

+ 4 - 0
app/src/main/java/com/hdl/xl/model/AcctInfo.kt

@@ -1,5 +1,6 @@
 package com.hdl.xl.model
 
+import android.telephony.SignalStrength
 import com.ysnows.base.inter.IModel
 
 /**
@@ -7,6 +8,9 @@ import com.ysnows.base.inter.IModel
  */
 data class AcctInfo(
     var bank_open_flag:String,var user_status:String,
+    var total_balaval:String,var total_balfrz:String,
+    var total_money:String,
+
     var id:String,var ret_code:String,var acctinfo_list:List<AcctinfoList>):IModel{
 
     data class AcctinfoList(var acct_state:String,var acct_type:String,var amt_balaval:String,

+ 4 - 1
app/src/main/java/com/hdl/xl/utils/net/ApiService.kt

@@ -716,7 +716,10 @@ interface ApiService {
      * @return
      */
     @GET("Cloud_wallet/getRandomKeys")
-    suspend fun getRandomKeys(@Query("user_id") user_id: String?,@Query("pkg_name") pkg_name: String?,@Query("app_name") app_name: String?,@Query("flag_chnl") flag_chnl: String?): Resp<RandomKeys>
+    suspend fun getRandomKeys(@Query("user_id") user_id: String?,
+                              @Query("pkg_name") pkg_name: String?,
+                              @Query("app_name") app_name: String?,
+                              @Query("flag_chnl") flag_chnl: String?): Resp<RandomKeys>
 
 
 

+ 5 - 1
app/src/main/java/com/hdl/xl/vmodel/CloudVModel.kt

@@ -9,6 +9,7 @@ import com.hdl.xl.activity.RechargeCloudActivity
 import com.hdl.xl.config.MIntentAction
 import com.hdl.xl.model.AcctInfo
 import com.hdl.xl.model.User
+import com.hdl.xl.utils.DecimalUtils
 import com.hdl.xl.utils.net.NetEngine
 import com.ysnows.base.base.*
 import com.ysnows.base.net.IResp
@@ -75,7 +76,10 @@ class CloudVModel(application: Application) : BRViewModel<BRRepository>(applicat
                     getAcctApply()
                 }else{
                     //开户成功
-                    list.value=it.data?.acctinfo_list
+//                    list.value=it.data?.acctinfo_list
+                    money.value= it.data?.total_money
+                    moneyAvailable.value= it.data?.total_balaval
+                    moneyFrozen.value= it.data?.total_balfrz
 
                 }
 

+ 3 - 2
app/src/main/java/com/hdl/xl/vmodel/CloudWithVModel.kt

@@ -110,9 +110,10 @@ class CloudWithVModel(application: Application) : BViewModel<BRepository>(applic
 
     fun getKeysInfo(){
         viewModelScope.launch {
-//            var it=repository().lreq { NetEngine.service.getRandomKeys(User.get()?.id,"com.hdl.xl","象链","ANDROID") }
             var it=repository().lreq { NetEngine.service.getRandomKeys(User.get()?.id,
-                "test","test","ANDROID") }
+                "com.hdl.xl","象链","ANDROID") }
+//            var it=repository().lreq { NetEngine.service.getRandomKeys(User.get()?.id,
+//                "test","test","ANDROID") }
 
             if(it.ok()){
                 bean.value=it.data

+ 3 - 3
app/xiaomi/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 12,
-      "versionName": "1.0.11",
-      "outputFile": "xiaomi_1.0.11.apk"
+      "versionCode": 13,
+      "versionName": "1.1.0",
+      "outputFile": "xiaomi_1.1.0.apk"
     }
   ],
   "elementType": "File"

+ 2 - 2
build.gradle

@@ -10,8 +10,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.hdl.xl"
-    ext.application_version_code = 12
-    ext.application_version_name = "1.0.11"
+    ext.application_version_code = 13
+    ext.application_version_name = "1.1.0"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 31