Skip to content

Commit 7f7bce7

Browse files
mxdldevmxdldev
committed
mvvm perfect
1 parent 58b9e7a commit 7f7bce7

37 files changed

+103
-130
lines changed

‎lib_common/src/main/java/com/fly/tour/common/mvvm/BaseMvvmActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void onChanged(@Nullable Boolean show) {
4848
mViewModel.getUC().getShowTransLoadingViewEvent().observe(this, new Observer<Boolean>() {
4949
@Override
5050
public void onChanged(@Nullable Boolean show) {
51-
KLog.v("MYTAG","view showTransLoadingView start...");
51+
KLog.v("MYTAG","view postShowTransLoadingViewEvent start...");
5252
showTransLoadingView(show);
5353
}
5454
});

‎lib_common/src/main/java/com/fly/tour/common/mvvm/BaseMvvmFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void onChanged(@Nullable Boolean show) {
4949
mViewModel.getUC().getShowTransLoadingViewEvent().observe(this, new Observer<Boolean>() {
5050
@Override
5151
public void onChanged(@Nullable Boolean show) {
52-
KLog.v("MYTAG","view showTransLoadingView start...");
52+
KLog.v("MYTAG","view postShowTransLoadingViewEvent start...");
5353
showTransLoadingView(show);
5454
}
5555
});

‎lib_common/src/main/java/com/fly/tour/common/mvvm/BaseMvvmRefreshActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.support.annotation.Nullable;
55

66
import com.fly.tour.common.mvvm.view.IBaseRefreshView;
7-
import com.fly.tour.common.mvvm.viewmodel.BaseRefreshViewModel;
7+
import com.fly.tour.common.mvvm.viewmodel.BaseViewRefreshModel;
88
import com.refresh.lib.BaseRefreshLayout;
99
import com.refresh.lib.DaisyRefreshLayout;
1010

@@ -17,7 +17,7 @@
1717
* Version: V1.0.0<br>
1818
* Update: <br>
1919
*/
20-
public abstract class BaseMvvmRefreshActivity<T,VM extends BaseRefreshViewModel> extends BaseMvvmActivity<VM> implements IBaseRefreshView<T> {
20+
public abstract class BaseMvvmRefreshActivity<T,VM extends BaseViewRefreshModel> extends BaseMvvmActivity<VM> implements IBaseRefreshView<T> {
2121
protected DaisyRefreshLayout mRefreshLayout;
2222

2323
@Override

‎lib_common/src/main/java/com/fly/tour/common/mvvm/BaseMvvmRefreshFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.view.View;
66

77
import com.fly.tour.common.mvvm.view.IBaseRefreshView;
8-
import com.fly.tour.common.mvvm.viewmodel.BaseRefreshViewModel;
8+
import com.fly.tour.common.mvvm.viewmodel.BaseViewRefreshModel;
99
import com.fly.tour.common.util.log.KLog;
1010
import com.refresh.lib.BaseRefreshLayout;
1111
import com.refresh.lib.DaisyRefreshLayout;
@@ -19,7 +19,7 @@
1919
* Version: V1.0.0<br>
2020
* Update: <br>
2121
*/
22-
public abstract class BaseMvvmRefreshFragment<T,VM extends BaseRefreshViewModel> extends BaseMvvmFragment<VM> implements IBaseRefreshView<T> {
22+
public abstract class BaseMvvmRefreshFragment<T,VM extends BaseViewRefreshModel> extends BaseMvvmFragment<VM> implements IBaseRefreshView<T> {
2323
protected DaisyRefreshLayout mRefreshLayout;
2424

2525
@Override

‎lib_common/src/main/java/com/fly/tour/common/mvvm/viewmodel/BaseViewModel.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -86,30 +86,30 @@ public static final class ParameterField {
8686
public static String BUNDLE = "BUNDLE";
8787
}
8888

89-
public void showInitLoadView(boolean show) {
89+
public void postShowInitLoadViewEvent(boolean show) {
9090
if (mUIChangeLiveData != null) {
9191
mUIChangeLiveData.showInitLoadViewEvent.postValue(show);
9292
}
9393
}
9494

95-
public void showNoDataView(boolean show) {
95+
public void postShowNoDataViewEvent(boolean show) {
9696
if (mUIChangeLiveData != null) {
9797
mUIChangeLiveData.showNoDataViewEvent.postValue(show);
9898
}
9999
}
100100

101-
public void showTransLoadingView(boolean show) {
101+
public void postShowTransLoadingViewEvent(boolean show) {
102102
if (mUIChangeLiveData != null) {
103103
mUIChangeLiveData.showTransLoadingViewEvent.postValue(show);
104104
}
105105
}
106106

107-
public void showNetWorkErrView(boolean show) {
107+
public void postShowNetWorkErrViewEvent(boolean show) {
108108
if (mUIChangeLiveData != null) {
109109
mUIChangeLiveData.showNetWorkErrViewEvent.postValue(show);
110110
}
111111
}
112-
public void startActivity(Class<?> clz, Bundle bundle) {
112+
public void postStartActivityEvent(Class<?> clz, Bundle bundle) {
113113
Map<String, Object> params = new HashMap<>();
114114
params.put(ParameterField.CLASS, clz);
115115
if (bundle != null) {
@@ -119,12 +119,12 @@ public void startActivity(Class<?> clz, Bundle bundle) {
119119
}
120120

121121

122-
public void finishActivity() {
122+
public void postFinishActivityEvent() {
123123
mUIChangeLiveData.finishActivityEvent.call();
124124
}
125125

126126

127-
public void onBackPressed() {
127+
public void postOnBackPressedEvent() {
128128
mUIChangeLiveData.onBackPressedEvent.call();
129129
}
130130

@@ -170,6 +170,4 @@ protected void onCleared() {
170170
mModel.onCleared();
171171
}
172172
}
173-
174-
175173
}

‎lib_common/src/main/java/com/fly/tour/common/mvvm/viewmodel/BaseRefreshViewModel.java renamed to ‎lib_common/src/main/java/com/fly/tour/common/mvvm/viewmodel/BaseViewRefreshModel.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
import java.util.List;
99

1010
/**
11-
* Description: <BaseRefreshViewModel><br>
11+
* Description: <BaseViewRefreshModel><br>
1212
* Author: mxdl<br>
1313
* Date: 2019/06/30<br>
1414
* Version: V1.0.0<br>
1515
* Update: <br>
1616
*/
17-
public class BaseRefreshViewModel<T,M extends BaseModel> extends BaseViewModel<M> {
17+
public class BaseViewRefreshModel<T,M extends BaseModel> extends BaseViewModel<M> {
1818

1919
protected UIChangeRefreshLiveData mUIChangeRefreshLiveData;
20-
public BaseRefreshViewModel(@NonNull Application application, M model) {
20+
public BaseViewRefreshModel(@NonNull Application application, M model) {
2121
super(application, model);
2222
}
2323

@@ -50,29 +50,29 @@ public SingleLiveEvent<Void> getStopLoadMoreLiveEvent() {
5050
return mStopLoadMoreLiveEvent = createLiveData(mStopLoadMoreLiveEvent);
5151
}
5252
}
53-
public void stopRefresh(){
53+
public void postStopRefreshEvent(){
5454
if(mUIChangeRefreshLiveData != null){
5555
mUIChangeRefreshLiveData.getStopRefresLiveEvent().call();
5656
}
5757
}
58-
public void autoRefresh(){
58+
public void postAutoRefreshEvent(){
5959
if(mUIChangeRefreshLiveData != null){
6060
mUIChangeRefreshLiveData.getAutoRefresLiveEvent().call();
6161
}
6262
}
63-
public void refreshData(List<T> list){
63+
public void postRefreshDataEvent(List<T> list){
6464
if(mUIChangeRefreshLiveData != null){
6565
mUIChangeRefreshLiveData.getRefresLiveEvent().postValue(list);
6666
}
6767
}
68-
public void loadMore(List<T> list){
68+
public void postLoadMoreEvent(List<T> list){
6969
if(mUIChangeRefreshLiveData != null){
7070
mUIChangeRefreshLiveData.getLoadMoreLiveEvent().postValue(list);
7171
}
7272
}
73-
public void stopLoadMore(){
73+
public void postStopLoadMoreEvent(){
7474
if(mUIChangeRefreshLiveData != null){
75-
mUIChangeRefreshLiveData.mStopLoadMoreLiveEvent.call();
75+
mUIChangeRefreshLiveData.getStopLoadMoreLiveEvent().call();
7676
}
7777
}
7878
}

‎lib_common/src/main/java/com/fly/tour/common/util/CrashHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void uncaughtException(Thread thread, Throwable ex) {
115115
// ComponentName cn = new ComponentName(mContext.getPackageName(), className);
116116
// intent.setComponent(cn);
117117
// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
118-
// mContext.startActivity(intent);
118+
// mContext.postStartActivityEvent(intent);
119119

120120
String packageName = mContext.getPackageName();
121121
// Log.v("TEST","packageName:"+packageName);

‎lib_fly_api/src/main/java/com/fly/tour/api/NewsDetailService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
import com.fly.tour.api.config.API;
55
import com.fly.tour.api.dto.RespDTO;
6-
import com.fly.tour.api.news.entity.NewsDetail;
7-
import com.fly.tour.api.newstype.entity.NewsType;
6+
import com.fly.tour.api.news.NewsDetail;
87

98
import java.util.List;
109
import io.reactivex.Observable;

‎lib_fly_api/src/main/java/com/fly/tour/api/NewsTypeService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
import com.fly.tour.api.config.API;
55
import com.fly.tour.api.dto.RespDTO;
6-
import com.fly.tour.api.news.entity.NewsDetail;
7-
import com.fly.tour.api.newstype.entity.NewsType;
6+
import com.fly.tour.api.news.NewsType;
87

98
import java.util.List;
109

‎lib_fly_api/src/main/java/com/fly/tour/api/config/API.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* Update: <br>
99
*/
1010
public class API {
11-
//public static final String URL_HOST_USER = "http://192.168.31.105:8762";
12-
//public static final String URL_HOST_NEWS = "http://192.168.31.105:8767";
13-
public static final String URL_HOST_USER = "http://192.168.0.189:8762";
14-
public static final String URL_HOST_NEWS = "http://192.168.0.189:8767";
11+
public static final String URL_HOST_USER = "http://192.168.31.105:8762";
12+
public static final String URL_HOST_NEWS = "http://192.168.31.105:8767";
13+
//public static final String URL_HOST_USER = "http://192.168.0.189:8762";
14+
//public static final String URL_HOST_NEWS = "http://192.168.0.189:8767";
1515
}

‎lib_fly_api/src/main/java/com/fly/tour/api/news/entity/NewsDetail.java renamed to ‎lib_fly_api/src/main/java/com/fly/tour/api/news/NewsDetail.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fly.tour.api.news.entity;
1+
package com.fly.tour.api.news;
22

33
/**
44
* Description: <NewsDetail><br>

‎lib_fly_api/src/main/java/com/fly/tour/api/newstype/entity/NewsType.java renamed to ‎lib_fly_api/src/main/java/com/fly/tour/api/news/NewsType.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package com.fly.tour.api.newstype.entity;
1+
package com.fly.tour.api.news;
22

33
import android.os.Parcel;
44
import android.os.Parcelable;
55

6-
import java.util.Date;
7-
86
/**
97
* Description: <NewsType><br>
108
* Author: mxdl<br>

‎module_main/src/main/java/com/fly/tour/main/mvvm/viewmodel/SplashViewModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public SplashViewModel(@NonNull Application application, SplashModel model) {
2929
super(application, model);
3030
}
3131
public void login() {
32-
mModel.login("mxdl","123456").subscribe(new Observer<RespDTO<LoginDTO>>() {
32+
mModel.login("gxl","123456").subscribe(new Observer<RespDTO<LoginDTO>>() {
3333
@Override
3434
public void onSubscribe(Disposable d) {
3535

‎module_me/src/main/java/com/fly/tour/me/NewsDetailAddActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.widget.Button;
99
import android.widget.EditText;
1010

11-
import com.fly.tour.api.newstype.entity.NewsType;
11+
import com.fly.tour.api.news.NewsType;
1212
import com.fly.tour.common.adapter.BaseAdapter;
1313
import com.fly.tour.common.mvvm.BaseMvvmActivity;
1414
import com.fly.tour.common.util.ToastUtil;

‎module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.view.MenuItem;
1111
import android.view.View;
1212

13-
import com.fly.tour.api.newstype.entity.NewsType;
13+
import com.fly.tour.api.news.NewsType;
1414
import com.fly.tour.common.event.RequestCode;
1515
import com.fly.tour.common.mvvm.BaseMvvmRefreshActivity;
1616
import com.fly.tour.common.util.ToastUtil;

‎module_me/src/main/java/com/fly/tour/me/adapter/NewsTypeSelectAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.view.View;
77
import android.widget.TextView;
88

9-
import com.fly.tour.api.newstype.entity.NewsType;
9+
import com.fly.tour.api.news.NewsType;
1010
import com.fly.tour.common.adapter.BaseAdapter;
1111
import com.fly.tour.me.R;
1212

‎module_me/src/main/java/com/fly/tour/me/adapter/NewsTypeShowAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.widget.Button;
88
import android.widget.TextView;
99

10-
import com.fly.tour.api.newstype.entity.NewsType;
10+
import com.fly.tour.api.news.NewsType;
1111
import com.fly.tour.common.adapter.BaseAdapter;
1212
import com.fly.tour.common.util.DateUtil;
1313
import com.fly.tour.me.R;

‎module_me/src/main/java/com/fly/tour/me/mvvm/model/NewsDetailAddModel.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
package com.fly.tour.me.mvvm.model;
22

33
import android.app.Application;
4-
import android.content.Context;
54

65
import com.fly.tour.api.NewsDetailService;
76
import com.fly.tour.api.NewsTypeService;
87
import com.fly.tour.api.RetrofitManager;
98
import com.fly.tour.api.dto.RespDTO;
109
import com.fly.tour.api.http.RxAdapter;
11-
import com.fly.tour.api.news.entity.NewsDetail;
12-
import com.fly.tour.api.newstype.entity.NewsType;
10+
import com.fly.tour.api.news.NewsDetail;
11+
import com.fly.tour.api.news.NewsType;
1312
import com.fly.tour.common.mvvm.model.BaseModel;
1413
import com.fly.tour.common.util.DateUtil;
1514

1615
import java.util.Date;
1716
import java.util.List;
1817

19-
import javax.inject.Inject;
20-
2118
import io.reactivex.Observable;
2219

2320
/**

‎module_me/src/main/java/com/fly/tour/me/mvvm/model/NewsDetailAddViewModel.java

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.fly.tour.me.mvvm.model;
22

33
import android.app.Application;
4-
import android.content.Context;
54
import android.support.annotation.NonNull;
65

76
import com.fly.tour.api.dto.RespDTO;
87
import com.fly.tour.api.http.ExceptionHandler;
9-
import com.fly.tour.api.news.entity.NewsDetail;
10-
import com.fly.tour.api.newstype.entity.NewsType;
8+
import com.fly.tour.api.news.NewsDetail;
9+
import com.fly.tour.api.news.NewsType;
1110
import com.fly.tour.common.event.SingleLiveEvent;
1211
import com.fly.tour.common.event.me.NewsDetailCurdEvent;
1312
import com.fly.tour.common.mvvm.viewmodel.BaseViewModel;
@@ -16,9 +15,6 @@
1615
import org.greenrobot.eventbus.EventBus;
1716

1817
import java.util.List;
19-
import java.util.Map;
20-
21-
import javax.inject.Inject;
2218

2319
import io.reactivex.Observer;
2420
import io.reactivex.disposables.Disposable;
@@ -41,15 +37,15 @@ public void addNewsDetail(final int type, final String title, final String conte
4137
mModel.addNewsDetail(type, title, content).subscribe(new Observer<RespDTO<NewsDetail>>() {
4238
@Override
4339
public void onSubscribe(Disposable d) {
44-
showTransLoadingView(true);
40+
postShowTransLoadingViewEvent(true);
4541
}
4642

4743
@Override
4844
public void onNext(RespDTO<NewsDetail> newsDetailRespDTO) {
4945
if (newsDetailRespDTO.code == ExceptionHandler.APP_ERROR.SUCC) {
5046
ToastUtil.showToast("添加成功");
51-
showTransLoadingView(false);
52-
finishActivity();
47+
postShowTransLoadingViewEvent(false);
48+
postFinishActivityEvent();
5349
EventBus.getDefault().post(new NewsDetailCurdEvent(type));
5450
} else {
5551
ToastUtil.showToast("添加失败");
@@ -58,12 +54,12 @@ public void onNext(RespDTO<NewsDetail> newsDetailRespDTO) {
5854

5955
@Override
6056
public void onError(Throwable e) {
61-
showTransLoadingView(false);
57+
postShowTransLoadingViewEvent(false);
6258
}
6359

6460
@Override
6561
public void onComplete() {
66-
showTransLoadingView(false);
62+
postShowTransLoadingViewEvent(false);
6763
}
6864
});
6965
}

‎module_me/src/main/java/com/fly/tour/me/mvvm/model/NewsTypeAddModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.fly.tour.api.RetrofitManager;
77
import com.fly.tour.api.dto.RespDTO;
88
import com.fly.tour.api.http.RxAdapter;
9-
import com.fly.tour.api.newstype.entity.NewsType;
9+
import com.fly.tour.api.news.NewsType;
1010
import com.fly.tour.common.mvvm.model.BaseModel;
1111

1212
import io.reactivex.Observable;

‎module_me/src/main/java/com/fly/tour/me/mvvm/model/NewsTypeListModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.fly.tour.api.RetrofitManager;
66
import com.fly.tour.api.dto.RespDTO;
77
import com.fly.tour.api.http.RxAdapter;
8-
import com.fly.tour.api.newstype.entity.NewsType;
8+
import com.fly.tour.api.news.NewsType;
99
import com.fly.tour.common.mvvm.model.BaseModel;
1010

1111
import java.util.List;

0 commit comments

Comments
 (0)