diff --git a/app/build.gradle b/app/build.gradle index b5f56f61f..10d55fdaa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "ceui.lisa.pixiv" minSdkVersion 21 targetSdkVersion 30 - versionCode 164 - versionName "3.0.1" + versionCode 165 + versionName "3.0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { @@ -23,7 +23,7 @@ android { //必须,告知RxHttp你依赖的okhttp版本,目前已适配 v3.12.0 - v4.9.0版本 (v4.3.0除外) rxhttp_okhttp : '4.4.0', //使用asXxx方法时必须,告知RxHttp你依赖的rxjava版本,可传入rxjava2、rxjava3 - rxhttp_rxåjava : 'rxjava3', + rxhttp_rxjava : 'rxjava3', rxhttp_package: 'rxhttp' //非必须,指定RxHttp类包名 ] } diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentRecmdIllust.java b/app/src/main/java/ceui/lisa/fragments/FragmentRecmdIllust.java index 8f1f95bbf..a60537b7f 100644 --- a/app/src/main/java/ceui/lisa/fragments/FragmentRecmdIllust.java +++ b/app/src/main/java/ceui/lisa/fragments/FragmentRecmdIllust.java @@ -6,6 +6,7 @@ import com.scwang.smartrefresh.layout.footer.FalsifyFooter; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -21,12 +22,15 @@ import ceui.lisa.helper.IllustFilter; import ceui.lisa.helper.TagFilter; import ceui.lisa.http.NullCtrl; +import ceui.lisa.http.Retro; import ceui.lisa.model.ListIllust; import ceui.lisa.models.IllustsBean; +import ceui.lisa.models.UserModel; import ceui.lisa.repo.RecmdIllustRepo; import ceui.lisa.utils.Common; import ceui.lisa.utils.DensityUtil; import ceui.lisa.utils.Dev; +import ceui.lisa.utils.Local; import ceui.lisa.utils.Params; import ceui.lisa.view.SpacesItemWithHeadDecoration; import ceui.lisa.viewmodel.BaseModel; @@ -35,6 +39,7 @@ import io.reactivex.ObservableOnSubscribe; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; +import retrofit2.Call; public class FragmentRecmdIllust extends NetListFragment { @@ -77,6 +82,24 @@ public boolean localData() { @Override public BaseAdapter adapter() { + new Thread(new Runnable() { + @Override + public void run() { + UserModel userModel = Local.getUser(); + Call call = Retro.getAccountApi().newRefreshToken( + FragmentLogin.CLIENT_ID, + FragmentLogin.CLIENT_SECRET, + FragmentLogin.REFRESH_TOKEN, + userModel.getResponse().getRefresh_token(), + Boolean.TRUE); + try { + UserModel newUser = call.execute().body(); + } catch (IOException e) { + e.printStackTrace(); + } + } + }).start(); + return new IAdapterWithHeadView(allItems, mContext, dataType); } diff --git a/app/src/main/java/ceui/lisa/http/AccountApi.java b/app/src/main/java/ceui/lisa/http/AccountApi.java index 644343d24..c843da09b 100644 --- a/app/src/main/java/ceui/lisa/http/AccountApi.java +++ b/app/src/main/java/ceui/lisa/http/AccountApi.java @@ -80,5 +80,4 @@ Call newRefreshToken(@Field("client_id") String client_id, @Field("refresh_token") String refresh_token, @Field("include_policy") boolean include_policy); - } diff --git a/app/src/main/java/ceui/lisa/http/TokenInterceptor.java b/app/src/main/java/ceui/lisa/http/TokenInterceptor.java index 22a624251..479845b1a 100644 --- a/app/src/main/java/ceui/lisa/http/TokenInterceptor.java +++ b/app/src/main/java/ceui/lisa/http/TokenInterceptor.java @@ -90,8 +90,8 @@ private synchronized String getNewToken(String tokenForThisRequest) throws IOExc Common.showLog("getNewToken 主动获取最新的token old:" + tokenForThisRequest + " new:" + Shaft.sUserModel.getResponse().getAccess_token()); UserModel userModel = Local.getUser(); Call call = Retro.getAccountApi().newRefreshToken( - FragmentLogin.IOS_CLIENT_ID, - FragmentLogin.IOS_CLIENT_SECRET, + FragmentLogin.CLIENT_ID, + FragmentLogin.CLIENT_SECRET, FragmentLogin.REFRESH_TOKEN, userModel.getResponse().getRefresh_token(), Boolean.TRUE);