Merge branch 'dev_1.1.2_lj' into dev_1.1.2

modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java

@@ -170,12 +170,12 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                 private int likeNum;
                 private int uploadType;
                 private String uploadUser;
-                private Object imgUrl;
-                private Object content;
-                private Object gasStationId;
-                private Object gasStationName;
-                private Object gasImg;
-                private Object gasPrices;
+                private String imgUrl;
+                private String content;
+                private String gasStationId;
+                private String gasStationName;
+                private String gasImg;
+                private String gasPrices;
                 private String endDate;
                 private boolean fabulous;
                 private int direction;
@@ -295,7 +295,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return imgUrl;
                 }
 
-                public void setImgUrl(Object imgUrl) {
+                public void setImgUrl(String imgUrl) {
                     this.imgUrl = imgUrl;
                 }
 
@@ -303,7 +303,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return content;
                 }
 
-                public void setContent(Object content) {
+                public void setContent(String content) {
                     this.content = content;
                 }
 
@@ -311,7 +311,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasStationId;
                 }
 
-                public void setGasStationId(Object gasStationId) {
+                public void setGasStationId(String gasStationId) {
                     this.gasStationId = gasStationId;
                 }
 
@@ -319,7 +319,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasStationName;
                 }
 
-                public void setGasStationName(Object gasStationName) {
+                public void setGasStationName(String gasStationName) {
                     this.gasStationName = gasStationName;
                 }
 
@@ -327,7 +327,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasImg;
                 }
 
-                public void setGasImg(Object gasImg) {
+                public void setGasImg(String gasImg) {
                     this.gasImg = gasImg;
                 }
 
@@ -335,7 +335,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasPrices;
                 }
 
-                public void setGasPrices(Object gasPrices) {
+                public void setGasPrices(String gasPrices) {
                     this.gasPrices = gasPrices;
                 }
 

modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java

@@ -118,10 +118,13 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
         String sn = Utils.getSn();
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("sn", sn);
-        hashMap.put("pageNum", String.valueOf(pageNum));
-        hashMap.put("pageSize", "10");
-        Map<String, Object> parameters = new HashMap<>();
+        hashMap.put("pageNum", pageNum);
+        hashMap.put("pageSize", 10);
+
+        HashMap<String, Object> parameters = new HashMap<>();
         parameters.put("data", GsonUtil.jsonFromObject(hashMap));
+
+
         shareEventApiService.getShareEventList(parameters)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())