YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

合并 fix bugs

Browse Source
This commit is contained in:
骆召亮
2025-11-22 11:22:41 +08:00
parent 3c344e1359 46b02ac407
commit 95a1e21909
17 changed files with 153 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -229,8 +229,13 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
startActivity(new Intent(getContext(), MyBagActivity.class));
} else if (id==R.id.me_daily) {//每日任务
startActivity(new Intent(getContext(), DailyTasksActivity.class));
<<<<<<< HEAD
} else if (id == R.id.iv_sz) {//设置
// startActivity(new Intent(getContext(), SettingActivity.class));
=======
}
else if (id == R.id.iv_sz) {//设置
>>>>>>> branch_new_dev
Intent intent = new Intent(getContext(), SettingActivity.class);
Bundle bundle = new Bundle();
bundle.putSerializable("userInfo", userInfo);

17
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
View File

@@ -8,11 +8,17 @@ import com.xscm.moduleutil.bean.WalletConfig;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import io.reactivex.disposables.Disposable;
public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeConacts.View> implements CurrencyExchangeConacts.IMePre {
CurrencyExchangeConacts.View mView;
public CurrencyExchangePresenter(CurrencyExchangeConacts.View view, Context context) {
super(view, context);
this.mView = view;
}
@Override
@@ -25,7 +31,10 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(String s) {
MvpRef.get().exchangeCoin(s);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().exchangeCoin(s);
}
});
}
@@ -40,6 +49,9 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(WalletBean walletBean) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().wallet(walletBean);
}
});
@@ -55,6 +67,9 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(WalletConfig walletConfig) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getWalletConfig(walletConfig);
}
});