app/build.gradle
@@ -16,15 +16,14 @@ applicationId "com.dayu.recharge" minSdk 23 targetSdk 26 versionCode 261 versionName "2.6.1" versionCode 265 versionName "2.6.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi-v7a','arm64-v8a' } signingConfig signingConfigs.debug } buildTypes { qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java
@@ -28,7 +28,7 @@ * 备注: */ public class QHOnLineApplication { public static QHOnLineApplication qhAloneApplication; public static QHOnLineApplication qhOnLineApplication; public Application application; public String tokenStr; @@ -44,19 +44,19 @@ public String adminId;//登录的账号id public static QHOnLineApplication getInstance(Application context) { if (qhAloneApplication == null) { qhAloneApplication = new QHOnLineApplication(); if (qhOnLineApplication == null) { qhOnLineApplication = new QHOnLineApplication(); } qhAloneApplication.application = context; qhOnLineApplication.application = context; ApiManager.init(); return qhAloneApplication; return qhOnLineApplication; } public static QHOnLineApplication getInstance() { if (qhAloneApplication == null) { qhAloneApplication = new QHOnLineApplication(); if (qhOnLineApplication == null) { qhOnLineApplication = new QHOnLineApplication(); } return qhAloneApplication; return qhOnLineApplication; } @@ -71,6 +71,8 @@ if (t.getData() != null) { getToken(context, name, pw, t.getData()); } } else { ToastUtil.show(t.getMsg()); } } }); qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
@@ -104,9 +104,9 @@ // 在这里执行异步操作 List<RechargeBean> beanList; if (beginTime == 0 && endTime == 0) { beanList = asynchBaseDao.rechargeDao().findAll(QHOnLineApplication.qhAloneApplication.adminId, page * limit, limit); beanList = asynchBaseDao.rechargeDao().findAll(QHOnLineApplication.qhOnLineApplication.adminId, page * limit, limit); } else { beanList = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.qhAloneApplication.adminId, beginTime, endTime); beanList = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.qhOnLineApplication.adminId, beginTime, endTime); } // 将结果发送给观察者 emitter.onNext(beanList); qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
@@ -1,9 +1,7 @@ package com.dayu.qiheonlinelibrary.net; import android.content.Context; import android.content.Intent; import android.text.TextUtils; import com.dayu.baselibrary.business.BusinessProvider; import com.dayu.qiheonlinelibrary.bean.BaseResult; @@ -12,29 +10,13 @@ import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener; import com.dayu.qiheonlinelibrary.utils.MyJsonParser; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.Objects; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; /** qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/MyIntercepterApplication.java
@@ -1,23 +1,22 @@ package com.dayu.qiheonlinelibrary.net; import android.os.Handler; import android.os.Looper; import android.text.TextUtils; import com.dayu.qiheonlinelibrary.QHOnLineApplication; import com.dayu.qiheonlinelibrary.utils.SharedPreferencesHelper; import com.dayu.qiheonlinelibrary.utils.ToastUtil; import com.tencent.bugly.crashreport.CrashReport; import java.io.IOException; import java.net.ConnectException; import java.util.HashMap; import java.util.Map; import okhttp3.FormBody; import okhttp3.Interceptor; import okhttp3.MediaType; import okhttp3.Protocol; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; @@ -35,10 +34,14 @@ Request myRequest = createRequest(chain.request()); if (myRequest != null) { Response response = chain.proceed(myRequest); Response response = null; try { response = chain.proceed(myRequest); } catch (ConnectException e) { e.printStackTrace(); return getNullResponse(request); } return response; } else { ToastUtil.showToastLong(QHOnLineApplication.qhAloneApplication.application, "请检查网络连接!!"); } } catch (Exception e) { e.printStackTrace(); @@ -74,6 +77,13 @@ * @return */ public Response getNullResponse(Request request) { // 显示Toast提示 new Handler(Looper.getMainLooper()).post(new Runnable() { @Override public void run() { ToastUtil.showToastLong(QHOnLineApplication.getInstance().application.getApplicationContext(), "请检查网络!!!"); } }); int code = 20010; String message = "咦,请检查网络"; String errJson = "{\"code\":" + code + ",\"message\":\"" + message + "\"}"; qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/ToastUtil.java
@@ -1,6 +1,8 @@ package com.dayu.qiheonlinelibrary.utils; import android.content.Context; import android.os.Handler; import android.os.Looper; import android.text.TextUtils; import android.widget.Toast; @@ -10,6 +12,15 @@ public class ToastUtil { public static void showToastLongOnMainLooper(final Context context, final String message) { new Handler(Looper.getMainLooper()).post(new Runnable() { @Override public void run() { Toast.makeText(context, message, Toast.LENGTH_LONG).show(); } }); } private static Toast makeText(Context context, CharSequence text, int duration) { return Toast.makeText(context, text, duration); } qiheonlinelibrary/src/main/res/layout/activity_new_card_qhl.xml
@@ -61,7 +61,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:text="测试23" android:text="" android:textSize="@dimen/new_card_size" /> <ImageView @@ -91,7 +91,7 @@ android:digits="0123456789Xx" android:inputType="text" android:maxLength="18" android:text="130107199210160011" android:text="" android:textSize="@dimen/new_card_size" /> @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:inputType="number" android:maxLength="11" android:text="15802220723" android:text="" android:textSize="@dimen/new_card_size" /> </LinearLayout>