老用户回归

common/src/main/java/com/yunbao/common/bean/ConfigBean.java

@@ -1,6 +1,7 @@
 package com.yunbao.common.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.Arrays;
 import java.util.List;
@@ -9,7 +10,7 @@ import java.util.List;
  * Created by cxf on 2017/8/5.
  */
 
-public class ConfigBean {
+public class ConfigBean extends BaseModel {
     private String version;//Android apk安装包 版本号
     private String downloadApkUrl;//Android apk安装包 下载地址
     private String updateDes;//版本更新描述
@@ -58,10 +59,63 @@ public class ConfigBean {
     private String txPlayUgcLicenceUrl;//腾讯短视频鉴权
     private String txVideoUgcKey;
     private String google_isup;
+    @SerializedName("is_return_user")//是否需要弹窗（0否，1是）
+    private String isReturnUser;
+    @SerializedName("popup_img_url")//弹窗图片地址
+    private String popupImgUrl;
+    @SerializedName("popup_img_en_url")//弹窗图片地址
+    private String popupImgEnUrl;
+    @SerializedName("jump_h5_url")//点击跳转H5页面地址
+    private String jumpH5Url;
+
+    @JSONField(name = "is_return_user")
+    public String getIsReturnUser() {
+        return isReturnUser;
+    }
+
+    @JSONField(name = "is_return_user")
+    public ConfigBean setIsReturnUser(String isReturnUser) {
+        this.isReturnUser = isReturnUser;
+        return this;
+    }
+    @JSONField(name = "popup_img_url")
+    public String getPopupImgUrl() {
+        return popupImgUrl;
+    }
+
+    @JSONField(name = "popup_img_url")
+    public ConfigBean setPopupImgUrl(String popupImgUrl) {
+        this.popupImgUrl = popupImgUrl;
+        return this;
+    }
+
+    @JSONField(name = "popup_img_en_url")
+    public String getPopupImgEnUrl() {
+        return popupImgEnUrl;
+    }
+
+    @JSONField(name = "popup_img_en_url")
+    public ConfigBean setPopupImgEnUrl(String popupImgEnUrl) {
+        this.popupImgEnUrl = popupImgEnUrl;
+        return this;
+    }
+
+    @JSONField(name = "jump_h5_url")
+    public String getJumpH5Url() {
+        return jumpH5Url;
+    }
+
+    @JSONField(name = "jump_h5_url")
+    public ConfigBean setJumpH5Url(String jumpH5Url) {
+        this.jumpH5Url = jumpH5Url;
+        return this;
+    }
+
     @JSONField(name = "google_isup")
     public String getGoogle_isup() {
         return google_isup;
     }
+
     @JSONField(name = "google_isup")
     public void setGoogle_isup(String google_isup) {
         this.google_isup = google_isup;
@@ -71,6 +125,7 @@ public class ConfigBean {
     public String getTxPlayUgcLicenceUrl() {
         return txPlayUgcLicenceUrl;
     }
+
     @JSONField(name = "tx_play_ugc_licence_url")
     public void setTxPlayUgcLicenceUrl(String txPlayUgcLicenceUrl) {
         this.txPlayUgcLicenceUrl = txPlayUgcLicenceUrl;
@@ -347,6 +402,7 @@ public class ConfigBean {
     public void setBeautyFace(int beautyFace) {
         this.beautyFace = beautyFace;
     }
+
     @JSONField(name = "sprout_face_narrowing")
     public int getBeautyFaceNarrowing() {
         return faceNarrowing;
@@ -465,22 +521,27 @@ public class ConfigBean {
     public String getAdInfo() {
         return mAdInfo;
     }
+
     @JSONField(name = "guide")
     public void setAdInfo(String adInfo) {
         mAdInfo = adInfo;
     }
+
     @JSONField(name = "letter_switch")
     public int getPriMsgSwitch() {
         return priMsgSwitch;
     }
+
     @JSONField(name = "letter_switch")
     public void setPriMsgSwitch(int priMsgSwitch) {
         this.priMsgSwitch = priMsgSwitch;
     }
+
     @JSONField(name = "isup")
     public int getForceUpdate() {
         return forceUpdate;
     }
+
     @JSONField(name = "isup")
     public void setForceUpdate(int forceUpdate) {
         this.forceUpdate = forceUpdate;
@@ -490,6 +551,7 @@ public class ConfigBean {
     public String getSproutType() {
         return sproutType;
     }
+
     @JSONField(name = "sprout_type")
     public void setSproutType(String sprout_type) {
         this.sproutType = sprout_type;
@@ -499,6 +561,7 @@ public class ConfigBean {
     public String getTurntableEnable() {
         return turntableEnable;
     }
+
     @JSONField(name = "turntable_enable")
     public void setTurntableEnable(String turntable) {
         this.turntableEnable = turntable;
@@ -529,6 +592,7 @@ public class ConfigBean {
     public String getPaster360Url() {
         return paster360Url;
     }
+
     @JSONField(name = "360_paster_url")
     public void setPaster360Url(String paster360Url) {
         this.paster360Url = paster360Url;
@@ -538,6 +602,7 @@ public class ConfigBean {
     public String getPkTime() {
         return pkTime;
     }
+
     @JSONField(name = "live_pk_time")
     public void setPkTime(String time) {
         this.pkTime = time;
@@ -548,6 +613,7 @@ public class ConfigBean {
     public String getCustomerServerUrl() {
         return serverUrl;
     }
+
     @JSONField(name = "service_url")
     public void setCustomerServerUrl(String serverUrl) {
         this.serverUrl = serverUrl;