diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 057268a..6f53e4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -28,13 +28,13 @@ import com.casic.dcms.bean.ToiletListBean; import com.casic.dcms.databinding.ActivityMainBinding; import com.casic.dcms.greendao.NoticeBeanDao; -import com.casic.dcms.mvp.presenter.impl.MapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetMapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.PushRegisterPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.ToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadPositionPresenterImpl; -import com.casic.dcms.mvp.view.IMapConfigView; +import com.casic.dcms.mvp.view.IGetMapConfigView; +import com.casic.dcms.mvp.view.IGetToiletListView; import com.casic.dcms.mvp.view.IPushRegisterView; -import com.casic.dcms.mvp.view.IToiletListView; import com.casic.dcms.mvp.view.IUploadPositionView; import com.casic.dcms.service.UploadLocationService; import com.casic.dcms.ui.fragment.HomePageFragment; @@ -63,7 +63,8 @@ import okhttp3.ResponseBody; -public class MainActivity extends AndroidxBaseActivity implements IUploadPositionView, IPushRegisterView, IMapConfigView, IToiletListView { +public class MainActivity extends AndroidxBaseActivity + implements IUploadPositionView, IPushRegisterView, IGetMapConfigView, IGetToiletListView { private static final String TAG = "MainActivity"; private static WeakReferenceHandler weakReferenceHandler; @@ -73,8 +74,8 @@ private String imei = ""; private UploadPositionPresenterImpl uploadPositionPresenter; private PushRegisterPresenterImpl registerPresenter; - private MapConfigPresenterImpl mapConfigPresenter; - private ToiletListPresenterImpl toiletListPresenter; + private GetMapConfigPresenterImpl mapConfigPresenter; + private GetToiletListPresenterImpl toiletListPresenter; private long clickTime = 0; @Override @@ -91,8 +92,8 @@ weakReferenceHandler = new WeakReferenceHandler(this); uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); - mapConfigPresenter = new MapConfigPresenterImpl(this); - toiletListPresenter = new ToiletListPresenterImpl(this); + mapConfigPresenter = new GetMapConfigPresenterImpl(this); + toiletListPresenter = new GetToiletListPresenterImpl(this); //获取配置项 obtainProjectConfig(); //配置页面 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 057268a..6f53e4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -28,13 +28,13 @@ import com.casic.dcms.bean.ToiletListBean; import com.casic.dcms.databinding.ActivityMainBinding; import com.casic.dcms.greendao.NoticeBeanDao; -import com.casic.dcms.mvp.presenter.impl.MapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetMapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.PushRegisterPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.ToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadPositionPresenterImpl; -import com.casic.dcms.mvp.view.IMapConfigView; +import com.casic.dcms.mvp.view.IGetMapConfigView; +import com.casic.dcms.mvp.view.IGetToiletListView; import com.casic.dcms.mvp.view.IPushRegisterView; -import com.casic.dcms.mvp.view.IToiletListView; import com.casic.dcms.mvp.view.IUploadPositionView; import com.casic.dcms.service.UploadLocationService; import com.casic.dcms.ui.fragment.HomePageFragment; @@ -63,7 +63,8 @@ import okhttp3.ResponseBody; -public class MainActivity extends AndroidxBaseActivity implements IUploadPositionView, IPushRegisterView, IMapConfigView, IToiletListView { +public class MainActivity extends AndroidxBaseActivity + implements IUploadPositionView, IPushRegisterView, IGetMapConfigView, IGetToiletListView { private static final String TAG = "MainActivity"; private static WeakReferenceHandler weakReferenceHandler; @@ -73,8 +74,8 @@ private String imei = ""; private UploadPositionPresenterImpl uploadPositionPresenter; private PushRegisterPresenterImpl registerPresenter; - private MapConfigPresenterImpl mapConfigPresenter; - private ToiletListPresenterImpl toiletListPresenter; + private GetMapConfigPresenterImpl mapConfigPresenter; + private GetToiletListPresenterImpl toiletListPresenter; private long clickTime = 0; @Override @@ -91,8 +92,8 @@ weakReferenceHandler = new WeakReferenceHandler(this); uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); - mapConfigPresenter = new MapConfigPresenterImpl(this); - toiletListPresenter = new ToiletListPresenterImpl(this); + mapConfigPresenter = new GetMapConfigPresenterImpl(this); + toiletListPresenter = new GetToiletListPresenterImpl(this); //获取配置项 obtainProjectConfig(); //配置页面 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index ee5dc4c..965d82d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -37,12 +37,13 @@ import java.io.File; -public class MinePageFragment extends AndroidxBaseFragment implements IUpdateVersionView, ILoginOutView { +public class MinePageFragment extends AndroidxBaseFragment + implements IUpdateVersionView, ILoginOutView { private Context context; private ClipboardManager clipboardManager; - private LoginOutPresenterImpl loginOutPresenter; private UpdatePresenterImpl updatePresenter; + private LoginOutPresenterImpl loginOutPresenter; private ProgressDialog progressDialog; @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 057268a..6f53e4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -28,13 +28,13 @@ import com.casic.dcms.bean.ToiletListBean; import com.casic.dcms.databinding.ActivityMainBinding; import com.casic.dcms.greendao.NoticeBeanDao; -import com.casic.dcms.mvp.presenter.impl.MapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetMapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.PushRegisterPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.ToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadPositionPresenterImpl; -import com.casic.dcms.mvp.view.IMapConfigView; +import com.casic.dcms.mvp.view.IGetMapConfigView; +import com.casic.dcms.mvp.view.IGetToiletListView; import com.casic.dcms.mvp.view.IPushRegisterView; -import com.casic.dcms.mvp.view.IToiletListView; import com.casic.dcms.mvp.view.IUploadPositionView; import com.casic.dcms.service.UploadLocationService; import com.casic.dcms.ui.fragment.HomePageFragment; @@ -63,7 +63,8 @@ import okhttp3.ResponseBody; -public class MainActivity extends AndroidxBaseActivity implements IUploadPositionView, IPushRegisterView, IMapConfigView, IToiletListView { +public class MainActivity extends AndroidxBaseActivity + implements IUploadPositionView, IPushRegisterView, IGetMapConfigView, IGetToiletListView { private static final String TAG = "MainActivity"; private static WeakReferenceHandler weakReferenceHandler; @@ -73,8 +74,8 @@ private String imei = ""; private UploadPositionPresenterImpl uploadPositionPresenter; private PushRegisterPresenterImpl registerPresenter; - private MapConfigPresenterImpl mapConfigPresenter; - private ToiletListPresenterImpl toiletListPresenter; + private GetMapConfigPresenterImpl mapConfigPresenter; + private GetToiletListPresenterImpl toiletListPresenter; private long clickTime = 0; @Override @@ -91,8 +92,8 @@ weakReferenceHandler = new WeakReferenceHandler(this); uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); - mapConfigPresenter = new MapConfigPresenterImpl(this); - toiletListPresenter = new ToiletListPresenterImpl(this); + mapConfigPresenter = new GetMapConfigPresenterImpl(this); + toiletListPresenter = new GetToiletListPresenterImpl(this); //获取配置项 obtainProjectConfig(); //配置页面 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index ee5dc4c..965d82d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -37,12 +37,13 @@ import java.io.File; -public class MinePageFragment extends AndroidxBaseFragment implements IUpdateVersionView, ILoginOutView { +public class MinePageFragment extends AndroidxBaseFragment + implements IUpdateVersionView, ILoginOutView { private Context context; private ClipboardManager clipboardManager; - private LoginOutPresenterImpl loginOutPresenter; private UpdatePresenterImpl updatePresenter; + private LoginOutPresenterImpl loginOutPresenter; private ProgressDialog progressDialog; @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 7b872cb..e431254 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -13,10 +13,10 @@ import com.casic.dcms.bean.PersonBean; import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.databinding.FragmentPhoneBinding; -import com.casic.dcms.mvp.presenter.impl.DeptTreePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.PhoneBookPresenterImpl; -import com.casic.dcms.mvp.view.IDeptTreeView; -import com.casic.dcms.mvp.view.IPhoneBookView; +import com.casic.dcms.mvp.presenter.impl.GetDeptTreePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetPhoneBookPresenterImpl; +import com.casic.dcms.mvp.view.IGetDeptTreeView; +import com.casic.dcms.mvp.view.IGetPhoneBookView; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.AlertControlDialog; @@ -24,13 +24,14 @@ import java.util.ArrayList; import java.util.List; -public class PhonePageFragment extends AndroidxBaseFragment implements IDeptTreeView, IPhoneBookView { +public class PhonePageFragment extends AndroidxBaseFragment + implements IGetDeptTreeView, IGetPhoneBookView { private final List deptList = new ArrayList<>(); //部门名集合 private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private Context context; - private DeptTreePresenterImpl deptTreePresenter; - private PhoneBookPresenterImpl phoneBookPresenter; + private GetDeptTreePresenterImpl deptTreePresenter; + private GetPhoneBookPresenterImpl phoneBookPresenter; private DeptExpandableAdapter expandableAdapter; @Override @@ -40,9 +41,9 @@ @Override protected void initData() { - deptTreePresenter = new DeptTreePresenterImpl(this); + deptTreePresenter = new GetDeptTreePresenterImpl(this); deptTreePresenter.onReadyRetrofitRequest("0"); - phoneBookPresenter = new PhoneBookPresenterImpl(this); + phoneBookPresenter = new GetPhoneBookPresenterImpl(this); expandableAdapter = new DeptExpandableAdapter(context); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 057268a..6f53e4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -28,13 +28,13 @@ import com.casic.dcms.bean.ToiletListBean; import com.casic.dcms.databinding.ActivityMainBinding; import com.casic.dcms.greendao.NoticeBeanDao; -import com.casic.dcms.mvp.presenter.impl.MapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetMapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.PushRegisterPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.ToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadPositionPresenterImpl; -import com.casic.dcms.mvp.view.IMapConfigView; +import com.casic.dcms.mvp.view.IGetMapConfigView; +import com.casic.dcms.mvp.view.IGetToiletListView; import com.casic.dcms.mvp.view.IPushRegisterView; -import com.casic.dcms.mvp.view.IToiletListView; import com.casic.dcms.mvp.view.IUploadPositionView; import com.casic.dcms.service.UploadLocationService; import com.casic.dcms.ui.fragment.HomePageFragment; @@ -63,7 +63,8 @@ import okhttp3.ResponseBody; -public class MainActivity extends AndroidxBaseActivity implements IUploadPositionView, IPushRegisterView, IMapConfigView, IToiletListView { +public class MainActivity extends AndroidxBaseActivity + implements IUploadPositionView, IPushRegisterView, IGetMapConfigView, IGetToiletListView { private static final String TAG = "MainActivity"; private static WeakReferenceHandler weakReferenceHandler; @@ -73,8 +74,8 @@ private String imei = ""; private UploadPositionPresenterImpl uploadPositionPresenter; private PushRegisterPresenterImpl registerPresenter; - private MapConfigPresenterImpl mapConfigPresenter; - private ToiletListPresenterImpl toiletListPresenter; + private GetMapConfigPresenterImpl mapConfigPresenter; + private GetToiletListPresenterImpl toiletListPresenter; private long clickTime = 0; @Override @@ -91,8 +92,8 @@ weakReferenceHandler = new WeakReferenceHandler(this); uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); - mapConfigPresenter = new MapConfigPresenterImpl(this); - toiletListPresenter = new ToiletListPresenterImpl(this); + mapConfigPresenter = new GetMapConfigPresenterImpl(this); + toiletListPresenter = new GetToiletListPresenterImpl(this); //获取配置项 obtainProjectConfig(); //配置页面 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index ee5dc4c..965d82d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -37,12 +37,13 @@ import java.io.File; -public class MinePageFragment extends AndroidxBaseFragment implements IUpdateVersionView, ILoginOutView { +public class MinePageFragment extends AndroidxBaseFragment + implements IUpdateVersionView, ILoginOutView { private Context context; private ClipboardManager clipboardManager; - private LoginOutPresenterImpl loginOutPresenter; private UpdatePresenterImpl updatePresenter; + private LoginOutPresenterImpl loginOutPresenter; private ProgressDialog progressDialog; @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 7b872cb..e431254 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -13,10 +13,10 @@ import com.casic.dcms.bean.PersonBean; import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.databinding.FragmentPhoneBinding; -import com.casic.dcms.mvp.presenter.impl.DeptTreePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.PhoneBookPresenterImpl; -import com.casic.dcms.mvp.view.IDeptTreeView; -import com.casic.dcms.mvp.view.IPhoneBookView; +import com.casic.dcms.mvp.presenter.impl.GetDeptTreePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetPhoneBookPresenterImpl; +import com.casic.dcms.mvp.view.IGetDeptTreeView; +import com.casic.dcms.mvp.view.IGetPhoneBookView; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.AlertControlDialog; @@ -24,13 +24,14 @@ import java.util.ArrayList; import java.util.List; -public class PhonePageFragment extends AndroidxBaseFragment implements IDeptTreeView, IPhoneBookView { +public class PhonePageFragment extends AndroidxBaseFragment + implements IGetDeptTreeView, IGetPhoneBookView { private final List deptList = new ArrayList<>(); //部门名集合 private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private Context context; - private DeptTreePresenterImpl deptTreePresenter; - private PhoneBookPresenterImpl phoneBookPresenter; + private GetDeptTreePresenterImpl deptTreePresenter; + private GetPhoneBookPresenterImpl phoneBookPresenter; private DeptExpandableAdapter expandableAdapter; @Override @@ -40,9 +41,9 @@ @Override protected void initData() { - deptTreePresenter = new DeptTreePresenterImpl(this); + deptTreePresenter = new GetDeptTreePresenterImpl(this); deptTreePresenter.onReadyRetrofitRequest("0"); - phoneBookPresenter = new PhoneBookPresenterImpl(this); + phoneBookPresenter = new GetPhoneBookPresenterImpl(this); expandableAdapter = new DeptExpandableAdapter(context); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 750b959..53dc6b0 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -84,7 +84,7 @@ * token添加到Header */ @GET("/map/server/listPage") - Observable obtainMapConfig(@Header("token") String token); + Observable getMapConfig(@Header("token") String token); /** * 大类列表查询 @@ -173,16 +173,16 @@ * 获取部门树 */ @GET("/dept/tree") - Observable obtainDeptTree(@Header("token") String token, - @Query("pid") String pid); + Observable getDeptTree(@Header("token") String token, + @Query("pid") String pid); /** * 获取通讯录 */ @FormUrlEncoded @POST("/mgr/mobileList") - Observable obtainPhoneBook(@Header("token") String token, - @Field("deptid") String deptid); + Observable getPhoneBook(@Header("token") String token, + @Field("deptid") String deptid); /** * 获取高发问题 @@ -246,7 +246,7 @@ * 更新版本 */ @POST("/app/checkVersion") - Observable obtainVersion(@Header("token") String token); + Observable updateVersion(@Header("token") String token); /** * 获取核实待办案卷 @@ -491,7 +491,7 @@ * http://111.198.10.15:11409/sanitation/toilet/list */ @GET("/sanitation/toilet/list") - Observable obtainToiletList(@Header("token") String token); + Observable getToiletList(@Header("token") String token); /** * 公厕打扫签到 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e67f267..1980751 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java deleted file mode 100644 index 9804147..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IDeptTreeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IDeptTreeModel { - Subscription sendDeptTreeRequest(String pid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java new file mode 100644 index 0000000..c7b1306 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetDeptTreeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetDeptTreeModel { + Subscription getDeptTree(String pid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java new file mode 100644 index 0000000..367bf38 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetMapConfigModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetMapConfigModel { + Subscription getMapConfig(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java new file mode 100644 index 0000000..075a941 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetPhoneBookModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetPhoneBookModel { + Subscription getPhoneBook(String deptid); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java new file mode 100644 index 0000000..3d5c908 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IGetToiletListModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IGetToiletListModel { + Subscription getToiletList(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java index b657a78..63868e4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginOutActionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface ILoginOutActionModel { - Subscription sendLoginOutRequest(); + Subscription loginOut(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java deleted file mode 100644 index 29d7696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IMapConfigModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IMapConfigModel { - Subscription sendMapConfigRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java deleted file mode 100644 index 0e79a15..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPhoneBookModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPhoneBookModel { - Subscription sendPhoneBookRequest(String deptid); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java deleted file mode 100644 index 0e0eec2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IToiletListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IToiletListModel { - Subscription sendToiletListRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java index 2e18a0d..42e2bb0 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUpdateVersionModel.java @@ -3,5 +3,5 @@ import rx.Subscription; public interface IUpdateVersionModel { - Subscription sendUpdateVersionRequest(); + Subscription updateVersion(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java deleted file mode 100644 index 486fe98..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/DeptTreeModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.model.IDeptTreeModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class DeptTreeModelImpl implements IDeptTreeModel { - - private final OnGetDeptTreeListener deptTreeListener; - - public DeptTreeModelImpl(OnGetDeptTreeListener listener) { - this.deptTreeListener = listener; - } - - /** - * {@link com.casic.dcms.mvp.model.IDeptTreeModel} - */ - @Override - public Subscription sendDeptTreeRequest(String pid) { - Observable observable = RetrofitServiceManager.getDeptTreeResult(pid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - deptTreeListener.onFailure(e); - } - } - - @Override - public void onNext(DeptTreeBean resultBean) { - if (resultBean != null) { - deptTreeListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java new file mode 100644 index 0000000..3066a03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetDeptTreeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.model.IGetDeptTreeModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetDeptTreeModelImpl implements IGetDeptTreeModel { + + private final OnGetDeptTreeListener deptTreeListener; + + public GetDeptTreeModelImpl(OnGetDeptTreeListener listener) { + this.deptTreeListener = listener; + } + + /** + * {@link IGetDeptTreeModel} + */ + @Override + public Subscription getDeptTree(String pid) { + Observable observable = RetrofitServiceManager.getDeptTree(pid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + deptTreeListener.onFailure(e); + } + } + + @Override + public void onNext(DeptTreeBean resultBean) { + if (resultBean != null) { + deptTreeListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java new file mode 100644 index 0000000..db35068 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetMapConfigModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.model.IGetMapConfigModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetMapConfigModelImpl implements IGetMapConfigModel { + + private final OnGetMapConfigListener obtainMapConfigListener; + + public GetMapConfigModelImpl(OnGetMapConfigListener listener) { + this.obtainMapConfigListener = listener; + } + + /** + * {@link IGetMapConfigModel} + */ + @Override + public Subscription getMapConfig() { + Observable observable = RetrofitServiceManager.getMapConfig(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + obtainMapConfigListener.onFailure(e); + } + } + + @Override + public void onNext(MapConfigBean resultBean) { + if (resultBean != null) { + obtainMapConfigListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java new file mode 100644 index 0000000..dc834e7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetPhoneBookModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.model.IGetPhoneBookModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetPhoneBookModelImpl implements IGetPhoneBookModel { + + private final OnGetPhoneBookListener onGetPhoneBookListener; + + public GetPhoneBookModelImpl(OnGetPhoneBookListener listener) { + this.onGetPhoneBookListener = listener; + } + + /** + * {@link IGetPhoneBookModel} + */ + @Override + public Subscription getPhoneBook(String deptid) { + Observable observable = RetrofitServiceManager.getPhoneBook(deptid); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + onGetPhoneBookListener.onFailure(e); + } + } + + @Override + public void onNext(PhoneBookBean resultBean) { + if (resultBean != null) { + onGetPhoneBookListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java new file mode 100644 index 0000000..561ed86 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/GetToiletListModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.model.IGetToiletListModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class GetToiletListModelImpl implements IGetToiletListModel { + + private final OnGetToiletListListener toiletListListener; + + public GetToiletListModelImpl(OnGetToiletListListener listener) { + this.toiletListListener = listener; + } + + /** + * {@link IGetToiletListModel} + */ + @Override + public Subscription getToiletList() { + Observable observable = RetrofitServiceManager.getToiletList(); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + toiletListListener.onFailure(e); + } + } + + @Override + public void onNext(ToiletListBean resultBean) { + if (resultBean != null) { + toiletListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java index c76b530..4c79aec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/LoginOutActionModelImpl.java @@ -23,8 +23,8 @@ * {@link ILoginOutActionModel} */ @Override - public Subscription sendLoginOutRequest() { - Observable observable = RetrofitServiceManager.getLoginOutResult(); + public Subscription loginOut() { + Observable observable = RetrofitServiceManager.loginOut(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java deleted file mode 100644 index bcd721c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/MapConfigModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.model.IMapConfigModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class MapConfigModelImpl implements IMapConfigModel { - - private final OnGetMapConfigListener obtainMapConfigListener; - - public MapConfigModelImpl(OnGetMapConfigListener listener) { - this.obtainMapConfigListener = listener; - } - - /** - * {@link IMapConfigModel} - */ - @Override - public Subscription sendMapConfigRequest() { - Observable observable = RetrofitServiceManager.getMapConfig(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - obtainMapConfigListener.onFailure(e); - } - } - - @Override - public void onNext(MapConfigBean resultBean) { - if (resultBean != null) { - obtainMapConfigListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java deleted file mode 100644 index 7d97f41..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/PhoneBookModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.model.IPhoneBookModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PhoneBookModelImpl implements IPhoneBookModel { - - private final OnGetPhoneBookListener onGetPhoneBookListener; - - public PhoneBookModelImpl(OnGetPhoneBookListener listener) { - this.onGetPhoneBookListener = listener; - } - - /** - * {@link IPhoneBookModel} - */ - @Override - public Subscription sendPhoneBookRequest(String deptid) { - Observable observable = RetrofitServiceManager.getPhoneBookResult(deptid); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - onGetPhoneBookListener.onFailure(e); - } - } - - @Override - public void onNext(PhoneBookBean resultBean) { - if (resultBean != null) { - onGetPhoneBookListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java deleted file mode 100644 index 27ff0f3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/ToiletListModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.model.IToiletListModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class ToiletListModelImpl implements IToiletListModel { - - private final OnGetToiletListListener toiletListListener; - - public ToiletListModelImpl(OnGetToiletListListener listener) { - this.toiletListListener = listener; - } - - /** - * {@link IToiletListModel} - */ - @Override - public Subscription sendToiletListRequest() { - Observable observable = RetrofitServiceManager.getToiletListResult(); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - toiletListListener.onFailure(e); - } - } - - @Override - public void onNext(ToiletListBean resultBean) { - if (resultBean != null) { - toiletListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java index 24de10a..875777c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UpdateVersionModelImpl.java @@ -23,8 +23,8 @@ * {@link IUpdateVersionModel} */ @Override - public Subscription sendUpdateVersionRequest() { - Observable observable = RetrofitServiceManager.getVersionResult(); + public Subscription updateVersion() { + Observable observable = RetrofitServiceManager.updateVersion(); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java deleted file mode 100644 index 81e5e65..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IDeptTreePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IDeptTreePresenter { - void onReadyRetrofitRequest(String pid); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java new file mode 100644 index 0000000..e989251 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetDeptTreePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetDeptTreePresenter { + void onReadyRetrofitRequest(String pid); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java new file mode 100644 index 0000000..dcbbd5a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetMapConfigPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetMapConfigPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java new file mode 100644 index 0000000..821069c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IGetToiletListPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IGetToiletListPresenter { + void onReadyRetrofitRequest(); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java deleted file mode 100644 index 924aab5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IMapConfigPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IMapConfigPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java deleted file mode 100644 index b918019..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IToiletListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IToiletListPresenter { - void onReadyRetrofitRequest(); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java deleted file mode 100644 index ffcd7a0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/DeptTreePresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.DeptTreeBean; -import com.casic.dcms.listener.OnGetDeptTreeListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.DeptTreeModelImpl; -import com.casic.dcms.mvp.presenter.IDeptTreePresenter; -import com.casic.dcms.mvp.view.IDeptTreeView; - -public class DeptTreePresenterImpl extends BasePresenter implements IDeptTreePresenter, OnGetDeptTreeListener { - - private final IDeptTreeView view; - private final DeptTreeModelImpl actionModel; - - public DeptTreePresenterImpl(IDeptTreeView deptTreeView) { - this.view = deptTreeView; - actionModel = new DeptTreeModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String pid) { - addSubscription(actionModel.sendDeptTreeRequest(pid)); - } - - @Override - public void onSuccess(DeptTreeBean resultBean) { - view.obtainDeptTreeResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java new file mode 100644 index 0000000..ce9b437 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetDeptTreePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.DeptTreeBean; +import com.casic.dcms.listener.OnGetDeptTreeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetDeptTreeModelImpl; +import com.casic.dcms.mvp.presenter.IGetDeptTreePresenter; +import com.casic.dcms.mvp.view.IGetDeptTreeView; + +public class GetDeptTreePresenterImpl extends BasePresenter implements IGetDeptTreePresenter, OnGetDeptTreeListener { + + private final IGetDeptTreeView view; + private final GetDeptTreeModelImpl actionModel; + + public GetDeptTreePresenterImpl(IGetDeptTreeView deptTreeView) { + this.view = deptTreeView; + actionModel = new GetDeptTreeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String pid) { + addSubscription(actionModel.getDeptTree(pid)); + } + + @Override + public void onSuccess(DeptTreeBean resultBean) { + view.obtainDeptTreeResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java new file mode 100644 index 0000000..ad07b47 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetMapConfigPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.MapConfigBean; +import com.casic.dcms.listener.OnGetMapConfigListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetMapConfigModelImpl; +import com.casic.dcms.mvp.presenter.IGetMapConfigPresenter; +import com.casic.dcms.mvp.view.IGetMapConfigView; + +public class GetMapConfigPresenterImpl extends BasePresenter implements IGetMapConfigPresenter, OnGetMapConfigListener { + + private final IGetMapConfigView view; + private final GetMapConfigModelImpl actionModel; + + public GetMapConfigPresenterImpl(IGetMapConfigView mapConfigView) { + this.view = mapConfigView; + actionModel = new GetMapConfigModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getMapConfig()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(MapConfigBean resultBean) { + view.obtainMapConfig(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java new file mode 100644 index 0000000..1de8224 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetPhoneBookPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.listener.OnGetPhoneBookListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetPhoneBookModelImpl; +import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; +import com.casic.dcms.mvp.view.IGetPhoneBookView; + +public class GetPhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { + + private final IGetPhoneBookView view; + private final GetPhoneBookModelImpl actionModel; + + public GetPhoneBookPresenterImpl(IGetPhoneBookView phoneBookView) { + this.view = phoneBookView; + actionModel = new GetPhoneBookModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String deptid) { + addSubscription(actionModel.getPhoneBook(deptid)); + } + + @Override + public void onSuccess(PhoneBookBean resultBean) { + view.obtainPhoneBookResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java new file mode 100644 index 0000000..9884e03 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetToiletListPresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.listener.OnGetToiletListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.GetToiletListModelImpl; +import com.casic.dcms.mvp.presenter.IGetToiletListPresenter; +import com.casic.dcms.mvp.view.IGetToiletListView; + +public class GetToiletListPresenterImpl extends BasePresenter implements IGetToiletListPresenter, OnGetToiletListListener { + + private final IGetToiletListView view; + private final GetToiletListModelImpl actionModel; + + public GetToiletListPresenterImpl(IGetToiletListView toiletListView) { + this.view = toiletListView; + actionModel = new GetToiletListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest() { + addSubscription(actionModel.getToiletList()); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(ToiletListBean resultBean) { + view.obtainToiletListData(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java index 418ceee..98111a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/LoginOutPresenterImpl.java @@ -19,7 +19,7 @@ @Override public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendLoginOutRequest()); + addSubscription(actionModel.loginOut()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java deleted file mode 100644 index 13ee685..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/MapConfigPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.MapConfigBean; -import com.casic.dcms.listener.OnGetMapConfigListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.MapConfigModelImpl; -import com.casic.dcms.mvp.presenter.IMapConfigPresenter; -import com.casic.dcms.mvp.view.IMapConfigView; - -public class MapConfigPresenterImpl extends BasePresenter implements IMapConfigPresenter, OnGetMapConfigListener { - - private final IMapConfigView view; - private final MapConfigModelImpl actionModel; - - public MapConfigPresenterImpl(IMapConfigView mapConfigView) { - this.view = mapConfigView; - actionModel = new MapConfigModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendMapConfigRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(MapConfigBean resultBean) { - view.obtainMapConfig(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java deleted file mode 100644 index 3a9e4cc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/PhoneBookPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.PhoneBookBean; -import com.casic.dcms.listener.OnGetPhoneBookListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.PhoneBookModelImpl; -import com.casic.dcms.mvp.presenter.IPhoneBookPresenter; -import com.casic.dcms.mvp.view.IPhoneBookView; - -public class PhoneBookPresenterImpl extends BasePresenter implements IPhoneBookPresenter, OnGetPhoneBookListener { - - private final IPhoneBookView view; - private final PhoneBookModelImpl actionModel; - - public PhoneBookPresenterImpl(IPhoneBookView phoneBookView) { - this.view = phoneBookView; - actionModel = new PhoneBookModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String deptid) { - addSubscription(actionModel.sendPhoneBookRequest(deptid)); - } - - @Override - public void onSuccess(PhoneBookBean resultBean) { - view.obtainPhoneBookResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java deleted file mode 100644 index 9e6cd78..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ToiletListPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ToiletListBean; -import com.casic.dcms.listener.OnGetToiletListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.ToiletListModelImpl; -import com.casic.dcms.mvp.presenter.IToiletListPresenter; -import com.casic.dcms.mvp.view.IToiletListView; - -public class ToiletListPresenterImpl extends BasePresenter implements IToiletListPresenter, OnGetToiletListListener { - - private final IToiletListView view; - private final ToiletListModelImpl actionModel; - - public ToiletListPresenterImpl(IToiletListView toiletListView) { - this.view = toiletListView; - actionModel = new ToiletListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest() { - addSubscription(actionModel.sendToiletListRequest()); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(ToiletListBean resultBean) { - view.obtainToiletListData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java index d870e17..e8fab39 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UpdatePresenterImpl.java @@ -20,7 +20,7 @@ @Override public void onReadyRetrofitRequest() { view.showProgress(); - addSubscription(actionModel.sendUpdateVersionRequest()); + addSubscription(actionModel.updateVersion()); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java deleted file mode 100644 index 805e0a5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IDeptTreeView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.DeptTreeBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:41 - * @email : 290677893@qq.com - **/ -public interface IDeptTreeView { - void obtainDeptTreeResult(DeptTreeBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java new file mode 100644 index 0000000..d6c7151 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetDeptTreeView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.DeptTreeBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:41 + * @email : 290677893@qq.com + **/ +public interface IGetDeptTreeView { + void obtainDeptTreeResult(DeptTreeBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java new file mode 100644 index 0000000..a0f2293 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetMapConfigView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.MapConfigBean; + +public interface IGetMapConfigView { + void obtainMapConfig(MapConfigBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java new file mode 100644 index 0000000..2e70cfc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetPhoneBookView.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PhoneBookBean; + +/** + * @author : Pengxh + * @time : 2021/4/15 11:17 + * @email : 290677893@qq.com + **/ +public interface IGetPhoneBookView { + void obtainPhoneBookResult(PhoneBookBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java new file mode 100644 index 0000000..c8698c9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetToiletListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ToiletListBean; + +public interface IGetToiletListView { + void obtainToiletListData(ToiletListBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java deleted file mode 100644 index 3e2a2d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IMapConfigView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.MapConfigBean; - -public interface IMapConfigView { - void obtainMapConfig(MapConfigBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java deleted file mode 100644 index 0b815d6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPhoneBookView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PhoneBookBean; - -/** - * @author : Pengxh - * @time : 2021/4/15 11:17 - * @email : 290677893@qq.com - **/ -public interface IPhoneBookView { - void obtainPhoneBookResult(PhoneBookBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java deleted file mode 100644 index 2ec0dc5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IToiletListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ToiletListBean; - -public interface IToiletListView { - void obtainToiletListData(ToiletListBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 057268a..6f53e4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -28,13 +28,13 @@ import com.casic.dcms.bean.ToiletListBean; import com.casic.dcms.databinding.ActivityMainBinding; import com.casic.dcms.greendao.NoticeBeanDao; -import com.casic.dcms.mvp.presenter.impl.MapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetMapConfigPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.PushRegisterPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.ToiletListPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadPositionPresenterImpl; -import com.casic.dcms.mvp.view.IMapConfigView; +import com.casic.dcms.mvp.view.IGetMapConfigView; +import com.casic.dcms.mvp.view.IGetToiletListView; import com.casic.dcms.mvp.view.IPushRegisterView; -import com.casic.dcms.mvp.view.IToiletListView; import com.casic.dcms.mvp.view.IUploadPositionView; import com.casic.dcms.service.UploadLocationService; import com.casic.dcms.ui.fragment.HomePageFragment; @@ -63,7 +63,8 @@ import okhttp3.ResponseBody; -public class MainActivity extends AndroidxBaseActivity implements IUploadPositionView, IPushRegisterView, IMapConfigView, IToiletListView { +public class MainActivity extends AndroidxBaseActivity + implements IUploadPositionView, IPushRegisterView, IGetMapConfigView, IGetToiletListView { private static final String TAG = "MainActivity"; private static WeakReferenceHandler weakReferenceHandler; @@ -73,8 +74,8 @@ private String imei = ""; private UploadPositionPresenterImpl uploadPositionPresenter; private PushRegisterPresenterImpl registerPresenter; - private MapConfigPresenterImpl mapConfigPresenter; - private ToiletListPresenterImpl toiletListPresenter; + private GetMapConfigPresenterImpl mapConfigPresenter; + private GetToiletListPresenterImpl toiletListPresenter; private long clickTime = 0; @Override @@ -91,8 +92,8 @@ weakReferenceHandler = new WeakReferenceHandler(this); uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); - mapConfigPresenter = new MapConfigPresenterImpl(this); - toiletListPresenter = new ToiletListPresenterImpl(this); + mapConfigPresenter = new GetMapConfigPresenterImpl(this); + toiletListPresenter = new GetToiletListPresenterImpl(this); //获取配置项 obtainProjectConfig(); //配置页面 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index ee5dc4c..965d82d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -37,12 +37,13 @@ import java.io.File; -public class MinePageFragment extends AndroidxBaseFragment implements IUpdateVersionView, ILoginOutView { +public class MinePageFragment extends AndroidxBaseFragment + implements IUpdateVersionView, ILoginOutView { private Context context; private ClipboardManager clipboardManager; - private LoginOutPresenterImpl loginOutPresenter; private UpdatePresenterImpl updatePresenter; + private LoginOutPresenterImpl loginOutPresenter; private ProgressDialog progressDialog; @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 7b872cb..e431254 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -13,10 +13,10 @@ import com.casic.dcms.bean.PersonBean; import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.databinding.FragmentPhoneBinding; -import com.casic.dcms.mvp.presenter.impl.DeptTreePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.PhoneBookPresenterImpl; -import com.casic.dcms.mvp.view.IDeptTreeView; -import com.casic.dcms.mvp.view.IPhoneBookView; +import com.casic.dcms.mvp.presenter.impl.GetDeptTreePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.GetPhoneBookPresenterImpl; +import com.casic.dcms.mvp.view.IGetDeptTreeView; +import com.casic.dcms.mvp.view.IGetPhoneBookView; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.AlertControlDialog; @@ -24,13 +24,14 @@ import java.util.ArrayList; import java.util.List; -public class PhonePageFragment extends AndroidxBaseFragment implements IDeptTreeView, IPhoneBookView { +public class PhonePageFragment extends AndroidxBaseFragment + implements IGetDeptTreeView, IGetPhoneBookView { private final List deptList = new ArrayList<>(); //部门名集合 private final List> deptAndPersons = new ArrayList<>(); //个人信息集合的集合 private Context context; - private DeptTreePresenterImpl deptTreePresenter; - private PhoneBookPresenterImpl phoneBookPresenter; + private GetDeptTreePresenterImpl deptTreePresenter; + private GetPhoneBookPresenterImpl phoneBookPresenter; private DeptExpandableAdapter expandableAdapter; @Override @@ -40,9 +41,9 @@ @Override protected void initData() { - deptTreePresenter = new DeptTreePresenterImpl(this); + deptTreePresenter = new GetDeptTreePresenterImpl(this); deptTreePresenter.onReadyRetrofitRequest("0"); - phoneBookPresenter = new PhoneBookPresenterImpl(this); + phoneBookPresenter = new GetPhoneBookPresenterImpl(this); expandableAdapter = new DeptExpandableAdapter(context); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 750b959..53dc6b0 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -84,7 +84,7 @@ * token添加到Header */ @GET("/map/server/listPage") - Observable obtainMapConfig(@Header("token") String token); + Observable getMapConfig(@Header("token") String token); /** * 大类列表查询 @@ -173,16 +173,16 @@ * 获取部门树 */ @GET("/dept/tree") - Observable obtainDeptTree(@Header("token") String token, - @Query("pid") String pid); + Observable getDeptTree(@Header("token") String token, + @Query("pid") String pid); /** * 获取通讯录 */ @FormUrlEncoded @POST("/mgr/mobileList") - Observable obtainPhoneBook(@Header("token") String token, - @Field("deptid") String deptid); + Observable getPhoneBook(@Header("token") String token, + @Field("deptid") String deptid); /** * 获取高发问题 @@ -246,7 +246,7 @@ * 更新版本 */ @POST("/app/checkVersion") - Observable obtainVersion(@Header("token") String token); + Observable updateVersion(@Header("token") String token); /** * 获取核实待办案卷 @@ -491,7 +491,7 @@ * http://111.198.10.15:11409/sanitation/toilet/list */ @GET("/sanitation/toilet/list") - Observable obtainToiletList(@Header("token") String token); + Observable getToiletList(@Header("token") String token); /** * 公厕打扫签到 diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index ef4c2dc..1e2279a 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -125,7 +125,7 @@ public static Observable getMapConfig() { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainMapConfig(AuthenticationHelper.getToken()); + return service.getMapConfig(AuthenticationHelper.getToken()); } /** @@ -170,7 +170,7 @@ /** * 退出登录 */ - public static Observable getLoginOutResult() { + public static Observable loginOut() { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.loginOut(AuthenticationHelper.getToken()); @@ -188,19 +188,19 @@ /** * 获取部门树 */ - public static Observable getDeptTreeResult(String pid) { + public static Observable getDeptTree(String pid) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainDeptTree(AuthenticationHelper.getToken(), pid); + return service.getDeptTree(AuthenticationHelper.getToken(), pid); } /** * 获取通讯录 */ - public static Observable getPhoneBookResult(String deptid) { + public static Observable getPhoneBook(String deptid) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainPhoneBook(AuthenticationHelper.getToken(), deptid); + return service.getPhoneBook(AuthenticationHelper.getToken(), deptid); } /** @@ -264,10 +264,10 @@ /** * 更新版本 */ - public static Observable getVersionResult() { + public static Observable updateVersion() { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainVersion(AuthenticationHelper.getToken()); + return service.updateVersion(AuthenticationHelper.getToken()); } /** @@ -535,10 +535,10 @@ /** * 公厕列表 */ - public static Observable getToiletListResult() { + public static Observable getToiletList() { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainToiletList(AuthenticationHelper.getToken()); + return service.getToiletList(AuthenticationHelper.getToken()); } /**