Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

# Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml
2024-07-13 09:29:11 +08:00
parent 845b217c4d 7edd75e223
commit 9292e6f5c5
51 changed files with 1048 additions and 45 deletions
--- a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
@@ -136,14 +136,14 @@ public class MyWalletActivity extends AbsActivity {
                                                    }
                                                });
                                            } catch (JSONException e) {
-                                                throw new RuntimeException(e);
+                                                e.printStackTrace();
                                            }
                                        }
                                    });
                                }
                            }
                        } catch (JSONException e) {
-                            throw new RuntimeException(e);
+                            e.printStackTrace();
                        }
                    }
                });
@@ -491,7 +491,7 @@ public class MyWalletActivity extends AbsActivity {


            } catch (JSONException e) {
-                throw new RuntimeException(e);
+                e.printStackTrace();
            }

        }