Skip to content

Commit

Permalink
Merge pull request #635 from LoxiaLiSA/master
Browse files Browse the repository at this point in the history 
fix compile error
  • Loading branch information
@CeuiLiSA
CeuiLiSA authored Aug 12, 2024
2 parents c35f757 + 1e218c2 commit 8dd4329
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 100 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
applicationId "ceui.lisa.pixiv"
minSdkVersion 21
targetSdkVersion 34
versionCode 292
versionCode 296
versionName "4.1.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/ceui/lisa/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import ceui.lisa.utils.Common;
import ceui.lisa.utils.Dev;
import ceui.lisa.utils.GlideUtil;
import ceui.lisa.utils.Local;
import ceui.lisa.utils.Params;
import ceui.lisa.utils.ReverseImage;
import ceui.lisa.utils.ReverseWebviewCallback;
Expand Down Expand Up @@ -220,7 +221,7 @@ public int getCount() {

@Override
protected void initData() {
if (SessionManager.INSTANCE.isLoggedIn()) {
if (SessionManager.INSTANCE.isLoggedIn() || (sUserModel != null && sUserModel.getUser() != null && sUserModel.getUser().isIs_login())) {
if (Dev.isDev && false) {
startActivity(new Intent(this, HomeActivity.class));
} else {
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/java/ceui/lisa/core/RemoteRepo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public RemoteRepo() {
* */
public abstract Observable<? extends Response> initApi();

/**
* Early development,it only returns JSON Array now
* */
public abstract Observable<? extends Response> initLofterApi();
// /**
// * Early development,it only returns JSON Array now
// * */
// public abstract Observable<? extends Response> initLofterApi();

public abstract Observable<? extends Response> initNextApi();

Expand All @@ -65,15 +65,15 @@ public void getFirstData(NullCtrl<Response> nullCtrl) {
}
}

public void getLofterFirstData(NullCtrl<Response> nullCtrl) {
mApi = initLofterApi();//mApi contains the response data
if (mApi != null) {
mApi.subscribeOn(Schedulers.newThread())
.map(mFunction)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(nullCtrl);
}
}
// public void getLofterFirstData(NullCtrl<Response> nullCtrl) {
// mApi = initLofterApi();//mApi contains the response data
// if (mApi != null) {
// mApi.subscribeOn(Schedulers.newThread())
// .map(mFunction)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(nullCtrl);
// }
// }

public void getNextData(NullCtrl<Response> nullCtrl) {
mApi = initNextApi();
Expand Down
144 changes: 72 additions & 72 deletions app/src/main/java/ceui/lisa/fragments/NetListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,78 +59,78 @@ public abstract class NetListFragment<Layout extends ViewDataBinding,
* */
@Override
public void fresh() {
//For debug usage:
boolean debug = false;
if(debug) {
mRemoteRepo.getLofterFirstData(new NullCtrl<Response>() {
/**
* The method is called when the response is successfully received
*
* @param response The response of previous request
* <p>
* For example:
* </p>
* <p>
* Request for the daily rank list,response is an ArrayList of IllustsBean
* </p>
*/
@Override
public void success(Response response) {
Common.showLog("trace 000");
if (!isAdded()) {
return;
}
Common.showLog("trace 111");
mResponse = response;
tryCatchResponse(mResponse);
List<Item> mResponseList = mResponse.getList();
//Show the received data
if (!Common.isEmpty(mResponseList)) {
Common.showLog("trace 222 " + mAdapter.getItemCount());
beforeFirstLoad(mResponseList);
int beforeLoadSize = getStartSize();
mModel.load(mResponseList, true);
if (mRemoteRepo.hasEffectiveUserFollowStatus()) {
mModel.tidyAppViewModel();
}
allItems = mModel.getContent();//Get all the critical information such as IllustBean list
int afterLoadSize = getStartSize();
onFirstLoaded(mResponseList);
mRecyclerView.setVisibility(View.VISIBLE);
emptyRela.setVisibility(View.INVISIBLE);
mAdapter.notifyItemRangeInserted(beforeLoadSize, afterLoadSize - beforeLoadSize);
Common.showLog("trace 777 " + mAdapter.getItemCount() + " allItems.size():" + allItems.size() + " modelSize:" + mModel.getContent().size());
} else {
Common.showLog("trace 333");
mRecyclerView.setVisibility(View.INVISIBLE);
emptyRela.setVisibility(View.VISIBLE);
}
Common.showLog("trace 444");
mRemoteRepo.setNextUrl(mResponse.getNextUrl());
mAdapter.setNextUrl(mResponse.getNextUrl());
if (!TextUtils.isEmpty(mResponse.getNextUrl())) {
Common.showLog("trace 555");
mRefreshLayout.setRefreshFooter(new ClassicsFooter(mContext));
} else {
Common.showLog("trace 666");
mRefreshLayout.setRefreshFooter(new FalsifyFooter(mContext));
}
}

@Override
public void must(boolean isSuccess) {
mRefreshLayout.finishRefresh(isSuccess);
isLoading = false;
}

@Override
public void onError(Throwable e) {
super.onError(e);
mRecyclerView.setVisibility(View.INVISIBLE);
emptyRela.setVisibility(View.VISIBLE);
}
});
}
// //For debug usage:
// boolean debug = false;
// if(debug) {
// mRemoteRepo.getLofterFirstData(new NullCtrl<Response>() {
// /**
// * The method is called when the response is successfully received
// *
// * @param response The response of previous request
// * <p>
// * For example:
// * </p>
// * <p>
// * Request for the daily rank list,response is an ArrayList of IllustsBean
// * </p>
// */
// @Override
// public void success(Response response) {
// Common.showLog("trace 000");
// if (!isAdded()) {
// return;
// }
// Common.showLog("trace 111");
// mResponse = response;
// tryCatchResponse(mResponse);
// List<Item> mResponseList = mResponse.getList();
// //Show the received data
// if (!Common.isEmpty(mResponseList)) {
// Common.showLog("trace 222 " + mAdapter.getItemCount());
// beforeFirstLoad(mResponseList);
// int beforeLoadSize = getStartSize();
// mModel.load(mResponseList, true);
// if (mRemoteRepo.hasEffectiveUserFollowStatus()) {
// mModel.tidyAppViewModel();
// }
// allItems = mModel.getContent();//Get all the critical information such as IllustBean list
// int afterLoadSize = getStartSize();
// onFirstLoaded(mResponseList);
// mRecyclerView.setVisibility(View.VISIBLE);
// emptyRela.setVisibility(View.INVISIBLE);
// mAdapter.notifyItemRangeInserted(beforeLoadSize, afterLoadSize - beforeLoadSize);
// Common.showLog("trace 777 " + mAdapter.getItemCount() + " allItems.size():" + allItems.size() + " modelSize:" + mModel.getContent().size());
// } else {
// Common.showLog("trace 333");
// mRecyclerView.setVisibility(View.INVISIBLE);
// emptyRela.setVisibility(View.VISIBLE);
// }
// Common.showLog("trace 444");
// mRemoteRepo.setNextUrl(mResponse.getNextUrl());
// mAdapter.setNextUrl(mResponse.getNextUrl());
// if (!TextUtils.isEmpty(mResponse.getNextUrl())) {
// Common.showLog("trace 555");
// mRefreshLayout.setRefreshFooter(new ClassicsFooter(mContext));
// } else {
// Common.showLog("trace 666");
// mRefreshLayout.setRefreshFooter(new FalsifyFooter(mContext));
// }
// }
//
// @Override
// public void must(boolean isSuccess) {
// mRefreshLayout.finishRefresh(isSuccess);
// isLoading = false;
// }
//
// @Override
// public void onError(Throwable e) {
// super.onError(e);
// mRecyclerView.setVisibility(View.INVISIBLE);
// emptyRela.setVisibility(View.VISIBLE);
// }
// });
// }

if (!mRemoteRepo.localData()) {
emptyRela.setVisibility(View.INVISIBLE);
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/ceui/lisa/http/TokenInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import ceui.lisa.models.UserModel;
import ceui.lisa.utils.Common;
import ceui.lisa.utils.Local;
import ceui.pixiv.session.SessionManager;
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/ceui/lisa/repo/RankIllustRepo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ class RankIllustRepo(
//var debug = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
return Retro.getAppApi().getRank(token(), mode, date)
}

override fun initLofterApi(): Observable<ListIllust> {
//for debug usage
var debug_value = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
Common.showLog("initLofterApi")
Common.showLog(debug_value)
return Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
}
//
// override fun initLofterApi(): Observable<ListIllust> {
// //for debug usage
// var debug_value = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
// Common.showLog("initLofterApi")
// Common.showLog(debug_value)
// return Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
// }

override fun initNextApi(): Observable<ListIllust> {
return Retro.getAppApi().getNextIllust(token(), nextUrl)
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/ceui/pixiv/session/SessionManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,16 @@ object SessionManager {
}
}

fun updateSession(userModel: UserModel) {
val javaJson = gson.toJson(userModel)
val accountResponse = gson.fromJson(javaJson, AccountResponse::class.java)
prefStore.putString(LoggedInUserJsonKey, gson.toJson(accountResponse))
_loggedInAccount.value = accountResponse
fun updateSession(userModel: UserModel?) {
if (userModel == null) {
prefStore.putString(LoggedInUserJsonKey, "")
_loggedInAccount.value = AccountResponse()
} else {
val javaJson = gson.toJson(userModel)
val accountResponse = gson.fromJson(javaJson, AccountResponse::class.java)
prefStore.putString(LoggedInUserJsonKey, gson.toJson(accountResponse))
_loggedInAccount.value = accountResponse
}
}


Expand Down

0 comments on commit 8dd4329

Please sign in to comment.