diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java index 071a285..aa03acf 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java @@ -16,9 +16,9 @@ } @Override - public void onReadyRetrofitRequest(String token, String qrcodeId) { + public void onReadyRetrofitRequest(String qrcodeId) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(token, qrcodeId)); + addSubscription(actionModel.sendRetrofitRequest(qrcodeId)); } @Override diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java index 071a285..aa03acf 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java @@ -16,9 +16,9 @@ } @Override - public void onReadyRetrofitRequest(String token, String qrcodeId) { + public void onReadyRetrofitRequest(String qrcodeId) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(token, qrcodeId)); + addSubscription(actionModel.sendRetrofitRequest(qrcodeId)); } @Override diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java index 948e36e..3568f53 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java @@ -9,7 +9,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; -import android.widget.Toast; import androidx.annotation.Nullable; @@ -29,6 +28,7 @@ import com.casic.birmm.hxrq.utils.Constant; import com.casic.birmm.hxrq.utils.RSAUtils; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.casic.birmm.hxrq.utils.TokenHelper; import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; @@ -166,11 +166,11 @@ SaveKeyValues.putValue("userPassword", userPassword); } if (TextUtils.isEmpty(userName)) { - Toast.makeText(this, "用户名不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("用户名不能为空", ToastHelper.WARING); return; } if (TextUtils.isEmpty(userPassword)) { - Toast.makeText(this, "密码不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("密码不能为空", ToastHelper.WARING); return; } String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); @@ -210,7 +210,7 @@ finish(); } else { //{"code":200,"data":"","exceptionClazz":"","message":"图片中没有人脸","success":false} - Toast.makeText(this, resultBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastHelper.showToast(resultBean.getMessage(), ToastHelper.WARING); } } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java index 071a285..aa03acf 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java @@ -16,9 +16,9 @@ } @Override - public void onReadyRetrofitRequest(String token, String qrcodeId) { + public void onReadyRetrofitRequest(String qrcodeId) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(token, qrcodeId)); + addSubscription(actionModel.sendRetrofitRequest(qrcodeId)); } @Override diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java index 948e36e..3568f53 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java @@ -9,7 +9,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; -import android.widget.Toast; import androidx.annotation.Nullable; @@ -29,6 +28,7 @@ import com.casic.birmm.hxrq.utils.Constant; import com.casic.birmm.hxrq.utils.RSAUtils; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.casic.birmm.hxrq.utils.TokenHelper; import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; @@ -166,11 +166,11 @@ SaveKeyValues.putValue("userPassword", userPassword); } if (TextUtils.isEmpty(userName)) { - Toast.makeText(this, "用户名不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("用户名不能为空", ToastHelper.WARING); return; } if (TextUtils.isEmpty(userPassword)) { - Toast.makeText(this, "密码不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("密码不能为空", ToastHelper.WARING); return; } String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); @@ -210,7 +210,7 @@ finish(); } else { //{"code":200,"data":"","exceptionClazz":"","message":"图片中没有人脸","success":false} - Toast.makeText(this, resultBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastHelper.showToast(resultBean.getMessage(), ToastHelper.WARING); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java index 253be31..23810c3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java @@ -1,48 +1,35 @@ package com.casic.birmm.hxrq.ui; import android.graphics.Color; -import android.text.TextUtils; +import android.util.Log; import android.view.View; -import android.widget.Toast; import androidx.core.content.ContextCompat; import com.casic.birmm.hxrq.R; import com.casic.birmm.hxrq.base.DoubleClickExitActivity; -import com.casic.birmm.hxrq.bean.LoginResultBean; -import com.casic.birmm.hxrq.bean.PublicKeyBean; import com.casic.birmm.hxrq.bean.QrCodeBean; -import com.casic.birmm.hxrq.mvp.presenter.AuthenticatePresenterImpl; -import com.casic.birmm.hxrq.mvp.presenter.LoginPresenterImpl; import com.casic.birmm.hxrq.mvp.presenter.QrCodePresenterImpl; -import com.casic.birmm.hxrq.mvp.view.IAuthenticateView; -import com.casic.birmm.hxrq.mvp.view.ILoginView; import com.casic.birmm.hxrq.mvp.view.IQrCodeDataView; -import com.casic.birmm.hxrq.utils.RSAUtils; -import com.casic.birmm.hxrq.utils.SaveKeyValues; -import com.casic.birmm.hxrq.utils.TokenHelper; +import com.casic.birmm.hxrq.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import java.security.PublicKey; - import butterknife.BindView; import cn.bertsir.zbar.Qr.ScanResult; import cn.bertsir.zbar.QrConfig; import cn.bertsir.zbar.QrManager; import cn.bertsir.zbar.view.ScanLineView; -public class MainActivity extends DoubleClickExitActivity implements - IAuthenticateView, ILoginView, IQrCodeDataView { +public class MainActivity extends DoubleClickExitActivity implements IQrCodeDataView { @BindView(R.id.mainTopLayout) QMUITopBarLayout mainTopLayout; - private AuthenticatePresenterImpl authenticatePresenter; - private LoginPresenterImpl loginPresenter; + private static final String TAG = "MainActivity"; private QrCodePresenterImpl qrCodePresenter; - private String qrCode = ""; private QMUITipDialog loadingDialog; @Override @@ -65,10 +52,6 @@ @Override public void initData() { - //验证key - authenticatePresenter = new AuthenticatePresenterImpl(this); - //账号密码登录 - loginPresenter = new LoginPresenterImpl(this); //扫码登录 qrCodePresenter = new QrCodePresenterImpl(this); loadingDialog = new QMUITipDialog.Builder(this) @@ -106,8 +89,7 @@ QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { @Override public void onScanSuccess(final ScanResult result) { - qrCode = result.content; - authenticatePresenter.onReadyRetrofitRequest();//需要时时保持最新token，所以扫码登录之前需要获取最新token + qrCodePresenter.onReadyRetrofitRequest(result.content); } }); } @@ -123,48 +105,19 @@ } @Override - public void authenticateResult(PublicKeyBean result) { - if (result.isSuccess()) { - PublicKey publicKey = RSAUtils.keyStrToPublicKey(result.getData().getPublicKey()); - String userName = (String) SaveKeyValues.getValue("userName", ""); - String userPassword = (String) SaveKeyValues.getValue("userPassword", ""); - String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); - //登录并获取Token，POST请求 - loginPresenter.onReadyRetrofitRequest(result.getData().getSid(), userName, dataByPublicKey); - } - } - - @Override - public void obtainLoginResult(LoginResultBean result) { -// Log.d(TAG, "obtainLoginResult: " + new Gson().toJson(result)); - String token = result.getData().getToken(); - if (!TextUtils.isEmpty(token)) { - //获取用户信息 - TokenHelper.saveToken(token); - qrCodePresenter.onReadyRetrofitRequest(TokenHelper.getToken(), qrCode); - } - } - - @Override public void obtainQrCodeData(QrCodeBean codeBean) { - // Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); + Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); if (codeBean.getCode() == 200) { //验证成功登录 - Toast.makeText(this, "登陆成功", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("登陆成功", ToastHelper.SUCCESS); } else { - Toast.makeText(this, "二维码已失效", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("二维码已失效", ToastHelper.WARING); } } @Override protected void onDestroy() { super.onDestroy(); - if (authenticatePresenter != null) { - authenticatePresenter.disposeRetrofitRequest(); - } - if (loginPresenter != null) { - loginPresenter.disposeRetrofitRequest(); - } if (qrCodePresenter != null) { qrCodePresenter.disposeRetrofitRequest(); } diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java index 071a285..aa03acf 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java @@ -16,9 +16,9 @@ } @Override - public void onReadyRetrofitRequest(String token, String qrcodeId) { + public void onReadyRetrofitRequest(String qrcodeId) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(token, qrcodeId)); + addSubscription(actionModel.sendRetrofitRequest(qrcodeId)); } @Override diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java index 948e36e..3568f53 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java @@ -9,7 +9,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; -import android.widget.Toast; import androidx.annotation.Nullable; @@ -29,6 +28,7 @@ import com.casic.birmm.hxrq.utils.Constant; import com.casic.birmm.hxrq.utils.RSAUtils; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.casic.birmm.hxrq.utils.TokenHelper; import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; @@ -166,11 +166,11 @@ SaveKeyValues.putValue("userPassword", userPassword); } if (TextUtils.isEmpty(userName)) { - Toast.makeText(this, "用户名不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("用户名不能为空", ToastHelper.WARING); return; } if (TextUtils.isEmpty(userPassword)) { - Toast.makeText(this, "密码不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("密码不能为空", ToastHelper.WARING); return; } String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); @@ -210,7 +210,7 @@ finish(); } else { //{"code":200,"data":"","exceptionClazz":"","message":"图片中没有人脸","success":false} - Toast.makeText(this, resultBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastHelper.showToast(resultBean.getMessage(), ToastHelper.WARING); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java index 253be31..23810c3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java @@ -1,48 +1,35 @@ package com.casic.birmm.hxrq.ui; import android.graphics.Color; -import android.text.TextUtils; +import android.util.Log; import android.view.View; -import android.widget.Toast; import androidx.core.content.ContextCompat; import com.casic.birmm.hxrq.R; import com.casic.birmm.hxrq.base.DoubleClickExitActivity; -import com.casic.birmm.hxrq.bean.LoginResultBean; -import com.casic.birmm.hxrq.bean.PublicKeyBean; import com.casic.birmm.hxrq.bean.QrCodeBean; -import com.casic.birmm.hxrq.mvp.presenter.AuthenticatePresenterImpl; -import com.casic.birmm.hxrq.mvp.presenter.LoginPresenterImpl; import com.casic.birmm.hxrq.mvp.presenter.QrCodePresenterImpl; -import com.casic.birmm.hxrq.mvp.view.IAuthenticateView; -import com.casic.birmm.hxrq.mvp.view.ILoginView; import com.casic.birmm.hxrq.mvp.view.IQrCodeDataView; -import com.casic.birmm.hxrq.utils.RSAUtils; -import com.casic.birmm.hxrq.utils.SaveKeyValues; -import com.casic.birmm.hxrq.utils.TokenHelper; +import com.casic.birmm.hxrq.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import java.security.PublicKey; - import butterknife.BindView; import cn.bertsir.zbar.Qr.ScanResult; import cn.bertsir.zbar.QrConfig; import cn.bertsir.zbar.QrManager; import cn.bertsir.zbar.view.ScanLineView; -public class MainActivity extends DoubleClickExitActivity implements - IAuthenticateView, ILoginView, IQrCodeDataView { +public class MainActivity extends DoubleClickExitActivity implements IQrCodeDataView { @BindView(R.id.mainTopLayout) QMUITopBarLayout mainTopLayout; - private AuthenticatePresenterImpl authenticatePresenter; - private LoginPresenterImpl loginPresenter; + private static final String TAG = "MainActivity"; private QrCodePresenterImpl qrCodePresenter; - private String qrCode = ""; private QMUITipDialog loadingDialog; @Override @@ -65,10 +52,6 @@ @Override public void initData() { - //验证key - authenticatePresenter = new AuthenticatePresenterImpl(this); - //账号密码登录 - loginPresenter = new LoginPresenterImpl(this); //扫码登录 qrCodePresenter = new QrCodePresenterImpl(this); loadingDialog = new QMUITipDialog.Builder(this) @@ -106,8 +89,7 @@ QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { @Override public void onScanSuccess(final ScanResult result) { - qrCode = result.content; - authenticatePresenter.onReadyRetrofitRequest();//需要时时保持最新token，所以扫码登录之前需要获取最新token + qrCodePresenter.onReadyRetrofitRequest(result.content); } }); } @@ -123,48 +105,19 @@ } @Override - public void authenticateResult(PublicKeyBean result) { - if (result.isSuccess()) { - PublicKey publicKey = RSAUtils.keyStrToPublicKey(result.getData().getPublicKey()); - String userName = (String) SaveKeyValues.getValue("userName", ""); - String userPassword = (String) SaveKeyValues.getValue("userPassword", ""); - String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); - //登录并获取Token，POST请求 - loginPresenter.onReadyRetrofitRequest(result.getData().getSid(), userName, dataByPublicKey); - } - } - - @Override - public void obtainLoginResult(LoginResultBean result) { -// Log.d(TAG, "obtainLoginResult: " + new Gson().toJson(result)); - String token = result.getData().getToken(); - if (!TextUtils.isEmpty(token)) { - //获取用户信息 - TokenHelper.saveToken(token); - qrCodePresenter.onReadyRetrofitRequest(TokenHelper.getToken(), qrCode); - } - } - - @Override public void obtainQrCodeData(QrCodeBean codeBean) { - // Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); + Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); if (codeBean.getCode() == 200) { //验证成功登录 - Toast.makeText(this, "登陆成功", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("登陆成功", ToastHelper.SUCCESS); } else { - Toast.makeText(this, "二维码已失效", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("二维码已失效", ToastHelper.WARING); } } @Override protected void onDestroy() { super.onDestroy(); - if (authenticatePresenter != null) { - authenticatePresenter.disposeRetrofitRequest(); - } - if (loginPresenter != null) { - loginPresenter.disposeRetrofitRequest(); - } if (qrCodePresenter != null) { qrCodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java b/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java new file mode 100644 index 0000000..d7ae495 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java @@ -0,0 +1,52 @@ +package com.casic.birmm.hxrq.utils; + +import android.annotation.SuppressLint; +import android.content.Context; + +import com.sdsmdg.tastytoast.TastyToast; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:20 + * @Email: 290677893@qq.com + **/ +public class ToastHelper { + + @SuppressLint({"StaticFieldLeak"}) + private static Context context; + public static final int DEFAULT = 0; + public static final int SUCCESS = 1; + public static final int ERROR = 2; + public static final int WARING = 3; + public static final int INFO = 4; + public static final int CONFUSING = 5; + + public static void initToastHelper(Context mContext) { + ToastHelper.context = mContext.getApplicationContext(); + } + + public static void showToast(String msg, int toastStyle) { + switch (toastStyle) { + case DEFAULT: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.DEFAULT); + break; + case SUCCESS: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.SUCCESS); + break; + case ERROR: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.ERROR); + break; + case WARING: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.WARNING); + break; + case INFO: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.INFO); + break; + case CONFUSING: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.CONFUSING); + break; + default: + break; + } + } +} diff --git a/app/build.gradle b/app/build.gradle index 5577e3b..df78bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,5 @@ implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java index b72edef..8580ad6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/BaseApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.qmuiteam.qmui.arch.QMUISwipeBackActivityManager; public class BaseApplication extends Application { @@ -11,5 +12,6 @@ super.onCreate(); QMUISwipeBackActivityManager.init(this); SaveKeyValues.initSharedPreferences(this); + ToastHelper.initToastHelper(this); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java index 7867e6f..c81d17f 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/base/DoubleClickExitActivity.java @@ -1,7 +1,8 @@ package com.casic.birmm.hxrq.base; import android.view.KeyEvent; -import android.widget.Toast; + +import com.casic.birmm.hxrq.utils.ToastHelper; public abstract class DoubleClickExitActivity extends BaseActivity { @@ -11,7 +12,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("再按一次退出程序", ToastHelper.INFO); clickTime = System.currentTimeMillis(); return true; } else { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java index 15b236c..10e04e7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/IQrCodeModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IQrCodeModel { - Subscription sendRetrofitRequest(String token, String qrcodeId); + Subscription sendRetrofitRequest(String qrcodeId); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java index f1dba3f..9f167d3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/model/QrCodeModelImpl.java @@ -28,8 +28,8 @@ } @Override - public Subscription sendRetrofitRequest(String token, String qrcodeId) { - Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, token, qrcodeId); + public Subscription sendRetrofitRequest(String qrcodeId) { + Observable observable = RetrofitServiceManager.getQrScanResult(HttpConfig.BASE_IP, qrcodeId); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java index 16dce11..12d11c7 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/IQrCodePresenter.java @@ -1,7 +1,7 @@ package com.casic.birmm.hxrq.mvp.presenter; public interface IQrCodePresenter { - void onReadyRetrofitRequest(String token, String qrcodeId); + void onReadyRetrofitRequest(String qrcodeId); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java index 071a285..aa03acf 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java +++ b/app/src/main/java/com/casic/birmm/hxrq/mvp/presenter/QrCodePresenterImpl.java @@ -16,9 +16,9 @@ } @Override - public void onReadyRetrofitRequest(String token, String qrcodeId) { + public void onReadyRetrofitRequest(String qrcodeId) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(token, qrcodeId)); + addSubscription(actionModel.sendRetrofitRequest(qrcodeId)); } @Override diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java index 948e36e..3568f53 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/LoginActivity.java @@ -9,7 +9,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; -import android.widget.Toast; import androidx.annotation.Nullable; @@ -29,6 +28,7 @@ import com.casic.birmm.hxrq.utils.Constant; import com.casic.birmm.hxrq.utils.RSAUtils; import com.casic.birmm.hxrq.utils.SaveKeyValues; +import com.casic.birmm.hxrq.utils.ToastHelper; import com.casic.birmm.hxrq.utils.TokenHelper; import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; @@ -166,11 +166,11 @@ SaveKeyValues.putValue("userPassword", userPassword); } if (TextUtils.isEmpty(userName)) { - Toast.makeText(this, "用户名不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("用户名不能为空", ToastHelper.WARING); return; } if (TextUtils.isEmpty(userPassword)) { - Toast.makeText(this, "密码不能为空", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("密码不能为空", ToastHelper.WARING); return; } String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); @@ -210,7 +210,7 @@ finish(); } else { //{"code":200,"data":"","exceptionClazz":"","message":"图片中没有人脸","success":false} - Toast.makeText(this, resultBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastHelper.showToast(resultBean.getMessage(), ToastHelper.WARING); } } diff --git a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java index 253be31..23810c3 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java +++ b/app/src/main/java/com/casic/birmm/hxrq/ui/MainActivity.java @@ -1,48 +1,35 @@ package com.casic.birmm.hxrq.ui; import android.graphics.Color; -import android.text.TextUtils; +import android.util.Log; import android.view.View; -import android.widget.Toast; import androidx.core.content.ContextCompat; import com.casic.birmm.hxrq.R; import com.casic.birmm.hxrq.base.DoubleClickExitActivity; -import com.casic.birmm.hxrq.bean.LoginResultBean; -import com.casic.birmm.hxrq.bean.PublicKeyBean; import com.casic.birmm.hxrq.bean.QrCodeBean; -import com.casic.birmm.hxrq.mvp.presenter.AuthenticatePresenterImpl; -import com.casic.birmm.hxrq.mvp.presenter.LoginPresenterImpl; import com.casic.birmm.hxrq.mvp.presenter.QrCodePresenterImpl; -import com.casic.birmm.hxrq.mvp.view.IAuthenticateView; -import com.casic.birmm.hxrq.mvp.view.ILoginView; import com.casic.birmm.hxrq.mvp.view.IQrCodeDataView; -import com.casic.birmm.hxrq.utils.RSAUtils; -import com.casic.birmm.hxrq.utils.SaveKeyValues; -import com.casic.birmm.hxrq.utils.TokenHelper; +import com.casic.birmm.hxrq.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import java.security.PublicKey; - import butterknife.BindView; import cn.bertsir.zbar.Qr.ScanResult; import cn.bertsir.zbar.QrConfig; import cn.bertsir.zbar.QrManager; import cn.bertsir.zbar.view.ScanLineView; -public class MainActivity extends DoubleClickExitActivity implements - IAuthenticateView, ILoginView, IQrCodeDataView { +public class MainActivity extends DoubleClickExitActivity implements IQrCodeDataView { @BindView(R.id.mainTopLayout) QMUITopBarLayout mainTopLayout; - private AuthenticatePresenterImpl authenticatePresenter; - private LoginPresenterImpl loginPresenter; + private static final String TAG = "MainActivity"; private QrCodePresenterImpl qrCodePresenter; - private String qrCode = ""; private QMUITipDialog loadingDialog; @Override @@ -65,10 +52,6 @@ @Override public void initData() { - //验证key - authenticatePresenter = new AuthenticatePresenterImpl(this); - //账号密码登录 - loginPresenter = new LoginPresenterImpl(this); //扫码登录 qrCodePresenter = new QrCodePresenterImpl(this); loadingDialog = new QMUITipDialog.Builder(this) @@ -106,8 +89,7 @@ QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { @Override public void onScanSuccess(final ScanResult result) { - qrCode = result.content; - authenticatePresenter.onReadyRetrofitRequest();//需要时时保持最新token，所以扫码登录之前需要获取最新token + qrCodePresenter.onReadyRetrofitRequest(result.content); } }); } @@ -123,48 +105,19 @@ } @Override - public void authenticateResult(PublicKeyBean result) { - if (result.isSuccess()) { - PublicKey publicKey = RSAUtils.keyStrToPublicKey(result.getData().getPublicKey()); - String userName = (String) SaveKeyValues.getValue("userName", ""); - String userPassword = (String) SaveKeyValues.getValue("userPassword", ""); - String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(), publicKey); - //登录并获取Token，POST请求 - loginPresenter.onReadyRetrofitRequest(result.getData().getSid(), userName, dataByPublicKey); - } - } - - @Override - public void obtainLoginResult(LoginResultBean result) { -// Log.d(TAG, "obtainLoginResult: " + new Gson().toJson(result)); - String token = result.getData().getToken(); - if (!TextUtils.isEmpty(token)) { - //获取用户信息 - TokenHelper.saveToken(token); - qrCodePresenter.onReadyRetrofitRequest(TokenHelper.getToken(), qrCode); - } - } - - @Override public void obtainQrCodeData(QrCodeBean codeBean) { - // Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); + Log.d(TAG, "obtainQrCodeData: " + new Gson().toJson(codeBean)); if (codeBean.getCode() == 200) { //验证成功登录 - Toast.makeText(this, "登陆成功", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("登陆成功", ToastHelper.SUCCESS); } else { - Toast.makeText(this, "二维码已失效", Toast.LENGTH_SHORT).show(); + ToastHelper.showToast("二维码已失效", ToastHelper.WARING); } } @Override protected void onDestroy() { super.onDestroy(); - if (authenticatePresenter != null) { - authenticatePresenter.disposeRetrofitRequest(); - } - if (loginPresenter != null) { - loginPresenter.disposeRetrofitRequest(); - } if (qrCodePresenter != null) { qrCodePresenter.disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java b/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java new file mode 100644 index 0000000..d7ae495 --- /dev/null +++ b/app/src/main/java/com/casic/birmm/hxrq/utils/ToastHelper.java @@ -0,0 +1,52 @@ +package com.casic.birmm.hxrq.utils; + +import android.annotation.SuppressLint; +import android.content.Context; + +import com.sdsmdg.tastytoast.TastyToast; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:20 + * @Email: 290677893@qq.com + **/ +public class ToastHelper { + + @SuppressLint({"StaticFieldLeak"}) + private static Context context; + public static final int DEFAULT = 0; + public static final int SUCCESS = 1; + public static final int ERROR = 2; + public static final int WARING = 3; + public static final int INFO = 4; + public static final int CONFUSING = 5; + + public static void initToastHelper(Context mContext) { + ToastHelper.context = mContext.getApplicationContext(); + } + + public static void showToast(String msg, int toastStyle) { + switch (toastStyle) { + case DEFAULT: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.DEFAULT); + break; + case SUCCESS: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.SUCCESS); + break; + case ERROR: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.ERROR); + break; + case WARING: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.WARNING); + break; + case INFO: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.INFO); + break; + case CONFUSING: + TastyToast.makeText(context, msg, TastyToast.LENGTH_LONG, TastyToast.CONFUSING); + break; + default: + break; + } + } +} diff --git a/app/src/main/java/com/casic/birmm/hxrq/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/birmm/hxrq/utils/retrofit/RetrofitServiceManager.java index d481055..4f618b6 100644 --- a/app/src/main/java/com/casic/birmm/hxrq/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/birmm/hxrq/utils/retrofit/RetrofitServiceManager.java @@ -8,6 +8,7 @@ import com.casic.birmm.hxrq.bean.PublicKeyBean; import com.casic.birmm.hxrq.bean.QrCodeBean; import com.casic.birmm.hxrq.utils.HttpConfig; +import com.casic.birmm.hxrq.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -69,10 +70,10 @@ /** * 扫码登录结果 */ - public static Observable getQrScanResult(String baseUrl, String token, String qrcodeId) { + public static Observable getQrScanResult(String baseUrl, String qrcodeId) { Retrofit retrofit = createRetrofit(baseUrl); RetrofitService service = retrofit.create(RetrofitService.class); - return service.getScannerLoginResult(token, qrcodeId); + return service.getScannerLoginResult(TokenHelper.getToken(), qrcodeId); } /**