Skip to content

Commit 8dd4329

Browse files
CeuiLiSACeuiLiSA
authored
Merge pull request #635 from LoxiaLiSA/master
fix compile error
2 parents c35f757 + 1e218c2 commit 8dd4329

File tree

7 files changed

+107
-100
lines changed

7 files changed

+107
-100
lines changed

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
applicationId "ceui.lisa.pixiv"
1616
minSdkVersion 21
1717
targetSdkVersion 34
18-
versionCode 292
18+
versionCode 296
1919
versionName "4.1.3"
2020
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2121

‎app/src/main/java/ceui/lisa/activities/MainActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import ceui.lisa.utils.Common;
4545
import ceui.lisa.utils.Dev;
4646
import ceui.lisa.utils.GlideUtil;
47+
import ceui.lisa.utils.Local;
4748
import ceui.lisa.utils.Params;
4849
import ceui.lisa.utils.ReverseImage;
4950
import ceui.lisa.utils.ReverseWebviewCallback;
@@ -220,7 +221,7 @@ public int getCount() {
220221

221222
@Override
222223
protected void initData() {
223-
if (SessionManager.INSTANCE.isLoggedIn()) {
224+
if (SessionManager.INSTANCE.isLoggedIn() || (sUserModel != null && sUserModel.getUser() != null && sUserModel.getUser().isIs_login())) {
224225
if (Dev.isDev && false) {
225226
startActivity(new Intent(this, HomeActivity.class));
226227
} else {

‎app/src/main/java/ceui/lisa/core/RemoteRepo.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public RemoteRepo() {
4444
* */
4545
public abstract Observable<? extends Response> initApi();
4646

47-
/**
48-
* Early development,it only returns JSON Array now
49-
* */
50-
public abstract Observable<? extends Response> initLofterApi();
47+
// /**
48+
// * Early development,it only returns JSON Array now
49+
// * */
50+
// public abstract Observable<? extends Response> initLofterApi();
5151

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

@@ -65,15 +65,15 @@ public void getFirstData(NullCtrl<Response> nullCtrl) {
6565
}
6666
}
6767

68-
public void getLofterFirstData(NullCtrl<Response> nullCtrl) {
69-
mApi = initLofterApi();//mApi contains the response data
70-
if (mApi != null) {
71-
mApi.subscribeOn(Schedulers.newThread())
72-
.map(mFunction)
73-
.observeOn(AndroidSchedulers.mainThread())
74-
.subscribe(nullCtrl);
75-
}
76-
}
68+
// public void getLofterFirstData(NullCtrl<Response> nullCtrl) {
69+
// mApi = initLofterApi();//mApi contains the response data
70+
// if (mApi != null) {
71+
// mApi.subscribeOn(Schedulers.newThread())
72+
// .map(mFunction)
73+
// .observeOn(AndroidSchedulers.mainThread())
74+
// .subscribe(nullCtrl);
75+
// }
76+
// }
7777

7878
public void getNextData(NullCtrl<Response> nullCtrl) {
7979
mApi = initNextApi();

‎app/src/main/java/ceui/lisa/fragments/NetListFragment.java

+72-72
Original file line numberDiff line numberDiff line change
@@ -59,78 +59,78 @@ public abstract class NetListFragment<Layout extends ViewDataBinding,
5959
* */
6060
@Override
6161
public void fresh() {
62-
//For debug usage:
63-
boolean debug = false;
64-
if(debug) {
65-
mRemoteRepo.getLofterFirstData(new NullCtrl<Response>() {
66-
/**
67-
* The method is called when the response is successfully received
68-
*
69-
* @param response The response of previous request
70-
* <p>
71-
* For example:
72-
* </p>
73-
* <p>
74-
* Request for the daily rank list,response is an ArrayList of IllustsBean
75-
* </p>
76-
*/
77-
@Override
78-
public void success(Response response) {
79-
Common.showLog("trace 000");
80-
if (!isAdded()) {
81-
return;
82-
}
83-
Common.showLog("trace 111");
84-
mResponse = response;
85-
tryCatchResponse(mResponse);
86-
List<Item> mResponseList = mResponse.getList();
87-
//Show the received data
88-
if (!Common.isEmpty(mResponseList)) {
89-
Common.showLog("trace 222 " + mAdapter.getItemCount());
90-
beforeFirstLoad(mResponseList);
91-
int beforeLoadSize = getStartSize();
92-
mModel.load(mResponseList, true);
93-
if (mRemoteRepo.hasEffectiveUserFollowStatus()) {
94-
mModel.tidyAppViewModel();
95-
}
96-
allItems = mModel.getContent();//Get all the critical information such as IllustBean list
97-
int afterLoadSize = getStartSize();
98-
onFirstLoaded(mResponseList);
99-
mRecyclerView.setVisibility(View.VISIBLE);
100-
emptyRela.setVisibility(View.INVISIBLE);
101-
mAdapter.notifyItemRangeInserted(beforeLoadSize, afterLoadSize - beforeLoadSize);
102-
Common.showLog("trace 777 " + mAdapter.getItemCount() + " allItems.size():" + allItems.size() + " modelSize:" + mModel.getContent().size());
103-
} else {
104-
Common.showLog("trace 333");
105-
mRecyclerView.setVisibility(View.INVISIBLE);
106-
emptyRela.setVisibility(View.VISIBLE);
107-
}
108-
Common.showLog("trace 444");
109-
mRemoteRepo.setNextUrl(mResponse.getNextUrl());
110-
mAdapter.setNextUrl(mResponse.getNextUrl());
111-
if (!TextUtils.isEmpty(mResponse.getNextUrl())) {
112-
Common.showLog("trace 555");
113-
mRefreshLayout.setRefreshFooter(new ClassicsFooter(mContext));
114-
} else {
115-
Common.showLog("trace 666");
116-
mRefreshLayout.setRefreshFooter(new FalsifyFooter(mContext));
117-
}
118-
}
119-
120-
@Override
121-
public void must(boolean isSuccess) {
122-
mRefreshLayout.finishRefresh(isSuccess);
123-
isLoading = false;
124-
}
125-
126-
@Override
127-
public void onError(Throwable e) {
128-
super.onError(e);
129-
mRecyclerView.setVisibility(View.INVISIBLE);
130-
emptyRela.setVisibility(View.VISIBLE);
131-
}
132-
});
133-
}
62+
// //For debug usage:
63+
// boolean debug = false;
64+
// if(debug) {
65+
// mRemoteRepo.getLofterFirstData(new NullCtrl<Response>() {
66+
// /**
67+
// * The method is called when the response is successfully received
68+
// *
69+
// * @param response The response of previous request
70+
// * <p>
71+
// * For example:
72+
// * </p>
73+
// * <p>
74+
// * Request for the daily rank list,response is an ArrayList of IllustsBean
75+
// * </p>
76+
// */
77+
// @Override
78+
// public void success(Response response) {
79+
// Common.showLog("trace 000");
80+
// if (!isAdded()) {
81+
// return;
82+
// }
83+
// Common.showLog("trace 111");
84+
// mResponse = response;
85+
// tryCatchResponse(mResponse);
86+
// List<Item> mResponseList = mResponse.getList();
87+
// //Show the received data
88+
// if (!Common.isEmpty(mResponseList)) {
89+
// Common.showLog("trace 222 " + mAdapter.getItemCount());
90+
// beforeFirstLoad(mResponseList);
91+
// int beforeLoadSize = getStartSize();
92+
// mModel.load(mResponseList, true);
93+
// if (mRemoteRepo.hasEffectiveUserFollowStatus()) {
94+
// mModel.tidyAppViewModel();
95+
// }
96+
// allItems = mModel.getContent();//Get all the critical information such as IllustBean list
97+
// int afterLoadSize = getStartSize();
98+
// onFirstLoaded(mResponseList);
99+
// mRecyclerView.setVisibility(View.VISIBLE);
100+
// emptyRela.setVisibility(View.INVISIBLE);
101+
// mAdapter.notifyItemRangeInserted(beforeLoadSize, afterLoadSize - beforeLoadSize);
102+
// Common.showLog("trace 777 " + mAdapter.getItemCount() + " allItems.size():" + allItems.size() + " modelSize:" + mModel.getContent().size());
103+
// } else {
104+
// Common.showLog("trace 333");
105+
// mRecyclerView.setVisibility(View.INVISIBLE);
106+
// emptyRela.setVisibility(View.VISIBLE);
107+
// }
108+
// Common.showLog("trace 444");
109+
// mRemoteRepo.setNextUrl(mResponse.getNextUrl());
110+
// mAdapter.setNextUrl(mResponse.getNextUrl());
111+
// if (!TextUtils.isEmpty(mResponse.getNextUrl())) {
112+
// Common.showLog("trace 555");
113+
// mRefreshLayout.setRefreshFooter(new ClassicsFooter(mContext));
114+
// } else {
115+
// Common.showLog("trace 666");
116+
// mRefreshLayout.setRefreshFooter(new FalsifyFooter(mContext));
117+
// }
118+
// }
119+
//
120+
// @Override
121+
// public void must(boolean isSuccess) {
122+
// mRefreshLayout.finishRefresh(isSuccess);
123+
// isLoading = false;
124+
// }
125+
//
126+
// @Override
127+
// public void onError(Throwable e) {
128+
// super.onError(e);
129+
// mRecyclerView.setVisibility(View.INVISIBLE);
130+
// emptyRela.setVisibility(View.VISIBLE);
131+
// }
132+
// });
133+
// }
134134

135135
if (!mRemoteRepo.localData()) {
136136
emptyRela.setVisibility(View.INVISIBLE);

‎app/src/main/java/ceui/lisa/http/TokenInterceptor.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import ceui.lisa.models.UserModel;
1111
import ceui.lisa.utils.Common;
1212
import ceui.lisa.utils.Local;
13+
import ceui.pixiv.session.SessionManager;
1314
import okhttp3.Interceptor;
1415
import okhttp3.Request;
1516
import okhttp3.Response;

‎app/src/main/java/ceui/lisa/repo/RankIllustRepo.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ class RankIllustRepo(
2222
//var debug = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
2323
return Retro.getAppApi().getRank(token(), mode, date)
2424
}
25-
26-
override fun initLofterApi(): Observable<ListIllust> {
27-
//for debug usage
28-
var debug_value = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
29-
Common.showLog("initLofterApi")
30-
Common.showLog(debug_value)
31-
return Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
32-
}
25+
//
26+
// override fun initLofterApi(): Observable<ListIllust> {
27+
// //for debug usage
28+
// var debug_value = Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
29+
// Common.showLog("initLofterApi")
30+
// Common.showLog(debug_value)
31+
// return Retro.getLofterApi().getLofterRank(LOFTER_HEADER, LOFTER_APICOOKIE)
32+
// }
3333

3434
override fun initNextApi(): Observable<ListIllust> {
3535
return Retro.getAppApi().getNextIllust(token(), nextUrl)

‎app/src/main/java/ceui/pixiv/session/SessionManager.kt

+10-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,16 @@ object SessionManager {
5252
}
5353
}
5454

55-
fun updateSession(userModel: UserModel) {
56-
val javaJson = gson.toJson(userModel)
57-
val accountResponse = gson.fromJson(javaJson, AccountResponse::class.java)
58-
prefStore.putString(LoggedInUserJsonKey, gson.toJson(accountResponse))
59-
_loggedInAccount.value = accountResponse
55+
fun updateSession(userModel: UserModel?) {
56+
if (userModel == null) {
57+
prefStore.putString(LoggedInUserJsonKey, "")
58+
_loggedInAccount.value = AccountResponse()
59+
} else {
60+
val javaJson = gson.toJson(userModel)
61+
val accountResponse = gson.fromJson(javaJson, AccountResponse::class.java)
62+
prefStore.putString(LoggedInUserJsonKey, gson.toJson(accountResponse))
63+
_loggedInAccount.value = accountResponse
64+
}
6065
}
6166

6267

0 commit comments

Comments
 (0)