Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/AndroidManifest.xml

@@ -888,6 +888,10 @@
             android:name="com.sheep.gamegroup.module.login.ReLoginNameAct"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme"></activity>
+        <activity
+            android:name="com.sheep.gamegroup.module.user.activity.ActVip"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppActionTheme"/>
     </application>
 
 </manifest>

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -14,33 +14,33 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 15): knows all DAOs.
+ * Master of DAO (schema version 16): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 15;
+    public static final int SCHEMA_VERSION = 16;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.IHomePageSearch;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.CreateUserVideoReq;
 import com.sheep.gamegroup.model.entity.UserFootprint;
 
 import org.afinal.simplecache.ApiKey;
@@ -1571,5 +1570,29 @@ public interface ApiService {
     @GET(ApiKey.getPackageVersion)
     Observable<BaseMessage> getPackageVersion(@Query("package_name") String package_name, @Query("type") String type, @Query("version") int version);
 //---------------------------end 插件配置相关-------------------------------------
+//---------------------------start 商城相关-------------------------------------
+    /**
+     * 领取商城优惠券
+     * type * integer (query) 代金券类型 1:新手任务完成领取 2:h5任务领取 默认1
+     * amount * (query) 代金券金额
+     */
+    @POST("app/yf_shop/receive_coupons")
+    Observable<BaseMessage> postYfShopReceiveCoupons(@Query("type") int type, @Query("amount") float amount);
+    /**
+     * 查询领取商城优惠券
+     * type * integer (query) 代金券类型 1:新手任务完成领取 2:h5任务领取 默认1
+     */
+    @GET("app/yf_shop/receive_coupons/check")
+    Observable<BaseMessage> getYfShopReceiveCouponsCheck(@Query("type") int type);
+//---------------------------end 商城相关-------------------------------------
+//---------------------------start 小绵羊3.4.7新增 -- vip相关-------------------------------------
+    /**
+     * 用户充值vip
+     * level:	integer ($int32) 1:VIP
+     * pay_type:	integer ($int32) 支付方式 1:支付宝 2:微信
+     */
+    @POST("app/user/buy_vip")
+    Observable<BaseMessage> postBuyVip(@Body JSONObject jsonObject);
+//---------------------------end 小绵羊3.4.7新增 -- vip相关-------------------------------------
 
 }

app/src/main/java/com/sheep/gamegroup/model/entity/Advertising.java

@@ -172,4 +172,13 @@ public class Advertising implements Serializable{
     public boolean isImage() {
         return display_type == 1;
     }
+
+
+
+    //    //默认类型，服务器数据无此类型，只作为客户端自己直接添加使用，只包含内容
+    public static final int TYPE_MSG = 0;
+    //标题与文本与视频
+    public static final int TYPE_VIDEO = 2;
+    //标题与文本与图片
+    public static final int TYPE_IMG = 1;
 }

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeLog.java

@@ -151,6 +151,11 @@ public class RechargeLog implements ILog {
     }
 
     @Override
+    public boolean equals(Object obj) {
+        return obj instanceof RechargeLog && ((RechargeLog) obj).getId() == id;
+    }
+
+    @Override
     public String getStateText() {
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append(type== 1?"+ ":"- ");

app/src/main/java/com/sheep/gamegroup/model/entity/Release_task.java

@@ -1,10 +1,13 @@
 package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
+import android.view.View;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.helper.DownloadHelper;
 import com.sheep.gamegroup.util.TimeUtil;
+import com.sheep.gamegroup.util.string.SpannableSb;
+import com.sheep.jiuyan.samllsheep.R;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -14,8 +17,9 @@ import java.util.Locale;
  * Created by ljy on 2018/3/20.
  */
 
-public class Release_task implements Serializable{
+public class Release_task implements Serializable {
     private float bonus;// 0,
+    private float vip_bonus;// 0,
     private String create_time;// 0,
     private String deadline;// 0,
     private String duration;// 0,
@@ -46,6 +50,7 @@ public class Release_task implements Serializable{
     private int consume_amount;//最低消费
     private int gift_ratio;//赠送比例，取值0-100
     private int user_task_status;//备注:和任务记录状态一样
+
     public int getDemo_time() {
         return demo_time;
     }
@@ -120,6 +125,14 @@ public class Release_task implements Serializable{
         return bonus;
     }
 
+    public float getVip_bonus() {
+        return vip_bonus;
+    }
+
+    public void setVip_bonus(float vip_bonus) {
+        this.vip_bonus = vip_bonus;
+    }
+
     public String getCreate_time() {
         return create_time;
     }
@@ -153,7 +166,7 @@ public class Release_task implements Serializable{
     }
 
     public String getLast_num() {
-        return TextUtils.isEmpty(last_num)?"0":last_num;
+        return TextUtils.isEmpty(last_num) ? "0" : last_num;
     }
 
     public void setLast_num(String last_num) {
@@ -185,7 +198,7 @@ public class Release_task implements Serializable{
     }
 
     public String getRelease_num() {
-        return TextUtils.isEmpty(release_num)?"0":release_num;
+        return TextUtils.isEmpty(release_num) ? "0" : release_num;
     }
 
     public void setRelease_num(String release_num) {
@@ -217,7 +230,7 @@ public class Release_task implements Serializable{
     }
 
     public String getTask_id() {
-        return TextUtils.isEmpty(task_id)?"0":task_id;
+        return TextUtils.isEmpty(task_id) ? "0" : task_id;
     }
 
     public void setTask_id(String task_id) {
@@ -289,6 +302,7 @@ public class Release_task implements Serializable{
 
     /**
      * 获取奖金的文本表示（这里保留两位有效数字，因为服务器可能返回这样的结果：0.6000000238418579）
+     *
      * @return
      */
     public String getBonusText() {
@@ -296,8 +310,8 @@ public class Release_task implements Serializable{
     }
 
 
-    public String getCashOrWelfare(){
-        switch (cash_task){
+    public String getCashOrWelfare() {
+        switch (cash_task) {
             case 2:
                 return "福利";
             case 1:
@@ -305,8 +319,10 @@ public class Release_task implements Serializable{
                 return "现金";
         }
     }
+
     /**
      * 任务是否下线
+     *
      * @return
      */
     public boolean isOffline() {
@@ -322,25 +338,30 @@ public class Release_task implements Serializable{
 
     /**
      * 福利内容
+     *
      * @return
      */
     public String getGiftRatioText() {
         return String.format(Locale.CHINA, "最低充%d，每充%d送%d", consume_amount, consume_amount, gift_ratio * consume_amount / 100);
     }
+
     /**
      * 剩余份数
+     *
      * @return
      */
     public String getLastNumText() {
         return String.format(Locale.CHINA, "剩余%s份", last_num);
     }
-    public int getLastNum1Or0(){
+
+    public int getLastNum1Or0() {
         int lastNum = NumberFormatUtils.parseInteger(last_num, 0);
         return lastNum > 0 ? 1 : 0;
     }
+
     public String getDateText() {
         long endTime = NumberFormatUtils.parseLong(deadline);
-        if(endTime < 1000_000){
+        if (endTime < 1000_000) {
             return "永久";
         }
         return String.format(Locale.CHINA, "%s—%s", TimeUtil.TimeStamp2Date(online_time, "yyyy/MM/dd"), TimeUtil.TimeStamp2Date(endTime, "yyyy/MM/dd"));
@@ -348,6 +369,7 @@ public class Release_task implements Serializable{
 
     /**
      * 任务是否已经完成，对于游戏任务或者福利来说，就是已经领取奖励
+     *
      * @return
      */
     public boolean isTaskFinished() {
@@ -357,4 +379,13 @@ public class Release_task implements Serializable{
     public String getH5BonusText() {
         return String.format(Locale.CHINA, "<font color='#ff2d4b' size='1'>￥</font><font color='#ff2d4b'>%s</font>", getBonusText());
     }
+
+    //所有的奖励金额展示内容
+    public CharSequence getVipBonusText() {
+        return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(vip_bonus));
+//        return new SpannableSb().append(String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(bonus+0.1)), R.dimen.text_size_10).checkAndBr()
+//                .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_1)
+//                .getSsb();
+//        return String.format(Locale.CHINA, "会员：+%s元\n+%s元", NumberFormatUtils.retainMost2(bonus + 0.1f), NumberFormatUtils.retainMost2(bonus));
+    }
 }

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -14,81 +14,44 @@ import java.io.Serializable;
 /**
  * Created by ljy on 2018/3/17.
  */
-@Table(name = "user")
 public class UserEntity implements Serializable {
 
-    @Column(name = "id", isId = true, autoGen = true)
     private int _id;//11,
-    @Column(name = "user_id")
     private String id;//11,
-    @Column(name = "mobile")
     private String mobile;//13688480841,
-    @Column(name = "nickname")
     private String nickname;//test332211,
-    @Column(name = "user_name")
     private String user_name;//test332211,
-    @Column(name = "set_password")
     private int set_password = 0;//test332211,
-    @Column(name = "balance")
     private String balance;//0,
-    @Column(name = "invitation_code")
     private String invitation_code;//032033476,
-    @Column(name = "parent_code")
     private String parent_code;//,
-    @Column(name = "total_asset")
     private String total_asset;//0,
-    @Column(name = "last_login_time")
     private String last_login_time;//1521254162,
-    @Column(name = "create_time")
     private String create_time;//1521254162,
-    @Column(name = "update_time")
     private String update_time;//1521254162,
-    @Column(name = "avatar")
     private String avatar;//,
-    @Column(name = "access_token")
     private String access_token;//_T6fiXabS5G_pQhLLP1qKA,
-    @Column(name = "refresh_token")
     private String refresh_token;//AiO5n79nT-6vjratlulxkg,
-    @Column(name = "open_id")
     private String open_id;//2804526,
-    @Column(name = "real_name")
     private String real_name;//,
-    @Column(name = "id_number")
     private String id_number;//,
-    @Column(name = "bank_card")
     private String bank_card;//,
-    @Column(name = "bank_card_mobile")
     private String bank_card_mobile;//,
-    @Column(name = "total_withdraw")
     private String total_withdraw;//0,
-    @Column(name = "wx_openid")
     private String wx_openid;//
-    @Column(name = "wx_nickname")
     private String wx_nickname;
-    @Column(name = "share_link")
     private String share_link;
-    @Column(name = "newbie_task_status")
     private int newbie_task_status;
-    @Column(name = "is_new")
     private int is_new;//1新用户 2老用户
-    @Column(name = "is_agent")
     private int is_agent;//0不是代理 1是代理
-    @Column(name = "certification_count")
     private int certification_count;//实名认证次数
-    @Column(name = "must_bind_mobile")
     private int must_bind_mobile;//是否必须绑定手机号 0不是 1是
-    @Column(name = "gender")
     private int gender;
-    @Column(name = "birthday")
     private String birthday;
-    @Column(name = "package_cate")//1官方包  2邀请包
     private int package_cate;
-    @Column(name = "create_time_line")
     private int create_time_line;//1:小绵羊3.0之前的用户（注：以后如果再次有这种区分之前用户的需求就陆续加一）
-    @Column(name = "bind_flag")
     private int bind_flag;//绑定表示 二进制形式 从低到高 第一位手机号 第二位QQ号 第三位微信
-    @Column(name = "level")
-    private int level = 0;//用户等级   0普通   1VIP
+    private int level;//用户等级 0：普通用户     1：VIP用户
 
     public int getPackage_cate() {
         return package_cate;
@@ -338,6 +301,14 @@ public class UserEntity implements Serializable {
         this.certification_count = certification_count;
     }
 
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
     public int getMust_bind_mobile() {
         return must_bind_mobile;
     }
@@ -390,18 +361,6 @@ public class UserEntity implements Serializable {
         return TestUtil.isSheep() ? getShare_link() : "http://10.8.210.230:8902/share.html?invitation_code=" + getInvitation_code();
     }
 
-    public int getLevel() {
-        return level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public boolean isVIP() {
-        return level == 1;
-    }
-
     /**
      * 是否绑定手机号
      */
@@ -431,4 +390,20 @@ public class UserEntity implements Serializable {
     public boolean isKfzsPackageUser() {
         return !TextUtils.isEmpty(parent_code) || (create_time_line < 2) || (package_cate == 1);
     }
+
+    //该用户已经完成了所有的新手任务
+    public boolean alreadyFinishAllNewTask() {
+        return getIs_new() == 2;
+    }
+
+    //已经兑换过商城做事券
+    public boolean alreadyExchangeCoupon() {
+        return false;
+    }
+    //用户等级 0：普通用户     1：VIP用户
+    public static final int LEVEL_VIP = 1;
+    //该用户是否是VIP用户
+    public boolean isVIP(){
+        return level >= LEVEL_VIP;
+    }
 }

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeLog.java

@@ -18,7 +18,7 @@ import java.util.List;
 import io.reactivex.Observable;
 
 /**
- * 我的资产 --> 消费记录
+ * 我的资产 --> 收费明细
  * Created by realicing on 2018/12/21.
  * realicing@sina.com
  */
@@ -26,7 +26,7 @@ public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
     @Override
     public void initView() {
         super.initView();
-        per_page = 100;
+        per_page = 10;
     }
 
     private List<ILog> logList = new ArrayList<>();

app/src/main/java/com/sheep/gamegroup/module/user/activity/ActVip.java

@@ -0,0 +1,74 @@
+package com.sheep.gamegroup.module.user.activity;
+
+import android.content.Context;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.module.user.model.BuyVipReq;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by realicing on 2018/12/25.
+ * realicing@sina.com
+ *
+ * vip介绍界面
+ */
+public class ActVip extends BaseActivity {
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_vip;
+    }
+
+    private List<BuyVipReq> list = new ArrayList<>();
+    @Override
+    public void initView() {
+        recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2));
+        BaseQuickAdapter<BuyVipReq, BaseViewHolder> adapter = new BaseQuickAdapter<BuyVipReq, BaseViewHolder>(R.layout.rechargeprice_gridview_item, list) {
+            @Override
+            protected void convert(BaseViewHolder helper, BuyVipReq item) {
+                int position = helper.getAdapterPosition();
+                View convertView = helper.itemView;
+                Context context = SheepApp.getInstance();
+                TextView item_tv_y = convertView.findViewById(R.id.item_tv_y);
+
+                if (position == curPosition){
+                    convertView.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
+                    item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
+                }else{
+                    convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+                    item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
+                }
+            }
+        };
+        adapter.bindToRecyclerView(recyclerView);
+        adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if(curPosition != position){
+                    curPosition = position;
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        });
+    }
+    private int curPosition = 0;
+
+    public void onClickPay(View view) {
+
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/user/model/BuyVipReq.java

@@ -0,0 +1,41 @@
+package com.sheep.gamegroup.module.user.model;
+
+/**
+ * Created by realicing on 2018/12/25.
+ * realicing@sina.com
+ * 用户充值vip 参数
+ * <p>
+ * level:	integer ($int32)
+ * 1:VIP
+ * pay_type:	integer ($int32)
+ * 支付方式 1:支付宝 2:微信
+ */
+public class BuyVipReq {
+    private int level;
+    private int pay_type;
+    private String pay_name;
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(int pay_type) {
+        this.pay_type = pay_type;
+    }
+
+    public String getPay_name() {
+        return pay_name;
+    }
+
+    public void setPay_name(String pay_name) {
+        this.pay_name = pay_name;
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/user/model/TempUserResp.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.module.user.model;
+
+/**
+ * Created by realicing on 2018/12/25.
+ * realicing@sina.com
+ * 用户充值vip结果
+ *
+ * token:	string 临时用户token
+ */
+public class TempUserResp {
+    private String token;// 临时用户token
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/yf_shop/model/ReceiveCouponsCheckResq.java

@@ -0,0 +1,35 @@
+package com.sheep.gamegroup.module.yf_shop.model;
+
+/**
+ * Created by realicing on 2018/12/24.
+ * realicing@sina.com
+ * 查询领取商城优惠券
+ *
+ * amount:	number ($double)
+ * 代金券领取金额
+ * status:	integer ($int64)
+ * 代金券领取状态 1:已领取 2:未领取
+ */
+public class ReceiveCouponsCheckResq {
+    private float amount;
+    private int status;
+
+    public float getAmount() {
+        return amount;
+    }
+
+    public void setAmount(float amount) {
+        this.amount = amount;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+//    代金券类型 1:新手任务完成领取 2:h5任务领取 默认1
+    public static final int TYPE_NEW_TASK = 1;//新手任务完成领取
+    public static final int TYPE_H5_TASK = 2;//h5任务领取
+}

app/src/main/java/com/sheep/gamegroup/module/yf_shop/model/ReceiveCouponsResp.java

@@ -0,0 +1,41 @@
+package com.sheep.gamegroup.module.yf_shop.model;
+
+/**
+ * Created by realicing on 2018/12/24.
+ * realicing@sina.com
+ * 领取商城优惠券
+ *
+ * amount:	number ($double) 代金券金额
+ * buy_url:	string 购买地址
+ * type:	integer ($int64) 代金券类型 1:新手任务完成领取 2:h5任务领取
+ */
+public class ReceiveCouponsResp {
+
+    private float amount;
+    private String buy_url;
+    private int type;
+
+    public float getAmount() {
+        return amount;
+    }
+
+    public void setAmount(float amount) {
+        this.amount = amount;
+    }
+
+    public String getBuy_url() {
+        return buy_url;
+    }
+
+    public void setBuy_url(String buy_url) {
+        this.buy_url = buy_url;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+}

app/src/main/java/com/sheep/gamegroup/util/ApiJSONUtil.java

@@ -22,10 +22,12 @@ public class ApiJSONUtil {
     public static final int COMMENT_TYPE_GAME = 1;
     public static final int COMMENT_TYPE_ARTICLE = 2;
     public static final int COMMENT_TYPE_VIDEO = 3;
+
     @IntDef({COMMENT_TYPE_GAME, COMMENT_TYPE_ARTICLE, COMMENT_TYPE_VIDEO})
     @Retention(RetentionPolicy.SOURCE)
     public @interface COMMENT_TYPE {
     }
+
     /**
      * 用户游戏评论
      * CommentType       int8    `description:"评论类型 1：游戏 2：资讯" json:"comment_type"`
@@ -57,6 +59,7 @@ public class ApiJSONUtil {
         jsonObject.put("content", content);
         return SheepApp.getInstance().getNetComponent().getApiService().postGameUserUserComment(jsonObject);
     }
+
     /**
      * 在自己的评论详情中，自己去回复 用户对自己的评论
      * UserCommentReq{
@@ -71,4 +74,42 @@ public class ApiJSONUtil {
         return SheepApp.getInstance().getNetComponent().getApiService().postGameUserReplyComment(jsonObject);
     }
 
+    /**
+     * @param type
+     * @param amount
+     */
+    public static Observable<BaseMessage> postYfShopReceiveCoupons(int type, float amount) {
+        return SheepApp.getInstance().getNetComponent().getApiService().postYfShopReceiveCoupons(type, amount)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+
+    }
+
+
+    public static final int PAY_TYPE_ALIPAY = 1;//支付方式 1:支付宝
+    public static final int PAY_TYPE_WX = 2;//支付方式 2:微信
+
+//    @IntDef({PAY_TYPE_ALIPAY, PAY_TYPE_WX})
+//    @Retention(RetentionPolicy.SOURCE)
+//    public  @interface PAY_TYPE {
+//    }
+
+    /**
+     * 用户充值vip
+     * <p>
+     * 返回结果
+     * TempUserResp result = baseMessage.getData(TempUserResp.class);
+     *
+     * @param level:    integer ($int32) 1:VIP
+     * @param pay_type: integer ($int32) 支付方式 1:支付宝 2:微信
+     */
+    public static Observable<BaseMessage> postBuyVip(int level, float pay_type) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("level", level);
+        jsonObject.put("pay_type", pay_type);
+        return SheepApp.getInstance().getNetComponent().getApiService().postBuyVip(jsonObject)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -68,6 +68,7 @@ import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
@@ -559,10 +560,6 @@ public class CommonUtil {
         }
     }
 
-    //以龙猫开头的则认为是龙猫app
-    public static final String LONG_MAO_APP_NAME = "龙猫";
-    public static final String LONG_MAO_APP_PACKAGE_NAME = "com.cfyl.galesaur.guess";
-    public static final String LONG_MAO_APP_URI = "guess://longmao";
 
     /**
      * 尝试跳转到龙猫竞猜
@@ -572,19 +569,8 @@ public class CommonUtil {
      * @return 判断到已经安装，返回false
      */
     private boolean checkLongMao(Activity activity, IJump jump) {
-        if (jump.getTitle() != null && jump.getTitle().startsWith(LONG_MAO_APP_NAME) && PackageUtil.isAppInstalled(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME)) {
-            try {
-                PackageUtil.startApp(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME);
-            } catch (Exception ignore) {
-                try {
-                    Intent intent = Intent.parseUri(LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
-                    intent.setComponent(null);
-                    activity.startActivity(intent);
-                } catch (Exception ignore2) {
-                    return true;
-                }
-            }
-            return false;
+        if (jump.getTitle() != null && jump.getTitle().startsWith(Config.LONG_MAO_APP_NAME) && PackageUtil.isAppInstalled(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME)) {
+            return !Jump2View.getInstance().gotoLongMao(activity);
         }
         return true;
     }
@@ -2109,7 +2095,7 @@ public class CommonUtil {
         if (userEntity == null) {
             return false;
         }
-        if (userEntity.getIs_new() == 2) { //1新用户 2老用户
+        if (userEntity.alreadyFinishAllNewTask()) { //1新用户 2老用户
             return false;
         } else {
             return true;

app/src/main/java/com/sheep/gamegroup/util/IDConstant.java

@@ -53,4 +53,5 @@ public class IDConstant {
 
     //TODO 这里移动积分兑换的id需要替换
     public static final int JUMP_EXCHANGE_CMCC = 1000025;//移动积分兑换
+    public static final int JUMP_EXCHANGE_COUPON = 1000026;//绵羊币兑换商城优惠券
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -52,6 +52,8 @@ import com.sheep.gamegroup.module.login.ChangePasswordAct;
 import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
+import com.sheep.gamegroup.module.user.activity.ActVip;
+import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.activity.ActApprenticeRedPacket;
 import com.sheep.gamegroup.view.activity.ActArticleComment;
@@ -143,6 +145,7 @@ import com.sheep.gamegroup.view.activity.WithdrawalResultAct;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegisterSuccess;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
@@ -152,6 +155,7 @@ import com.sheep.jiuyan.samllsheep.service.ListenerShotNewService;
 import com.sheep.jiuyan.samllsheep.service.ListenerShotService;
 import com.sheep.jiuyan.samllsheep.ui.activity.SignActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.youmi.android.offer.BaseActYmPermissionCheck;
 import com.youmi.android.offer.YmConfig;
@@ -165,6 +169,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
@@ -965,8 +971,8 @@ public class Jump2View {
         }
         //检查url是否是http开头并添加
         if (!url.startsWith("http")) {
-            if(url.contains("://")){
-                if(tryGotoDeepLink(url)){
+            if (url.contains("://")) {
+                if (tryGotoDeepLink(url)) {
                     return;
                 }
             } else {
@@ -979,8 +985,10 @@ public class Jump2View {
         intent.putExtra(IJumpWeb.KEY_NEEDJSINTERACT, true);
         context.startActivity(intent);
     }
+
     /**
      * 尝试通过深度链接跳转应用
+     *
      * @param url
      */
     public boolean tryGotoDeepLink(String url) {
@@ -998,6 +1006,7 @@ public class Jump2View {
             return false;
         }
     }
+
     /**
      * 跳到web页面
      *
@@ -1013,8 +1022,8 @@ public class Jump2View {
         }
         //检查url是否是http开头并添加
         if (!url.startsWith("http")) {
-            if(url.contains("://")){
-                if(tryGotoDeepLink(url)){
+            if (url.contains("://")) {
+                if (tryGotoDeepLink(url)) {
                     return;
                 }
             } else {
@@ -1496,21 +1505,59 @@ public class Jump2View {
         if (SysAppUtil.isNewSmallSheep()) {//新版本只显示引导页面，不展示弹窗和开屏广告
             return;
         }
-        SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(2)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        Advertising advertising = baseMessage.getData(Advertising.class);
-                        ViewUtil.showHalfScreenAd(activity, advertising, container);
-                    }
+        CommonUtil.getInstance().callActionWithUserInfo(userEntity ->
+                Observable.create((ObservableOnSubscribe<Boolean>) emitter -> {
+                    if (userEntity.alreadyFinishAllNewTask()) {//已经完成所有新手任务
+                        //没有兑换过优惠券时，显示商城优惠券
+                        SheepApp.getInstance().getNetComponent().getApiService().getYfShopReceiveCouponsCheck(ReceiveCouponsCheckResq.TYPE_NEW_TASK)
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                                    @Override
+                                    public void onNext(BaseMessage baseMessage) {
+                                        emitter.onNext(false);
+                                    }
 
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        tryShowReservation(activity);
+                                    @Override
+                                    public void onError(BaseMessage baseMessage) {
+                                        emitter.onNext(true);
+                                    }
+                                });
+                    } else {
+                        emitter.onNext(true);
                     }
-                });
+                }).subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new AbsObserver<Boolean>() {
+                            @Override
+                            public void onNext(Boolean showAd) {
+                                if (showAd) {//显示开屏广告
+                                    SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(2)
+                                            .subscribeOn(Schedulers.io())
+                                            .observeOn(AndroidSchedulers.mainThread())
+                                            .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                                                @Override
+                                                public void onNext(BaseMessage baseMessage) {
+                                                    Advertising advertising = baseMessage.getData(Advertising.class);
+                                                    ViewUtil.showHalfScreenAd(activity, advertising, container);
+                                                }
+
+                                                @Override
+                                                public void onError(BaseMessage baseMessage) {
+                                                    tryShowReservation(activity);
+                                                }
+                                            });
+                                } else {//显示商城
+                                    Advertising advertising = new Advertising();
+                                    advertising.setName("兑换商城优惠券，优惠多多");
+//                    advertising.setDesc("点击兑换商城优惠券，优惠多多");
+                                    advertising.setDisplay_type(Advertising.TYPE_IMG);
+                                    advertising.setDisplay_src(ViewUtil.getNetImgByName("homepage_xinshourw"));
+                                    advertising.setLinkType(IDConstant.JUMP_EXCHANGE_COUPON);
+                                    ViewUtil.showHalfScreenAd(activity, advertising, container);
+                                }
+                            }
+                        }));
     }
 
     public void tryShowReservation(final Activity activity) {
@@ -2446,4 +2493,40 @@ public class Jump2View {
         Intent intent = new Intent(activity, ActMediaChoose.class);
         activity.startActivity(DataUtil.putObject(intent, type));
     }
+
+    /**
+     * 小绵羊3.4.7新增 -- 跳转VIP介绍界面
+     * @param activity
+     */
+    public void goActVip(Activity activity) {
+        Intent intent = new Intent(activity, ActVip.class);
+        activity.startActivity(intent);
+    }
+
+    /**
+     * 小绵羊3.4.7新增 -- 跳转龙猫界面
+     * @param activity
+     */
+    public boolean gotoLongMao(Activity activity) {
+        try {
+            PackageUtil.startApp(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME);
+        } catch (Exception ignore) {
+            try {
+                Intent intent = Intent.parseUri(Config.LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
+                intent.setComponent(null);
+                activity.startActivity(intent);
+            } catch (Exception ignore2) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 小绵羊3.4.7新增 -- 跳转商城优惠购物界面
+     * @param activity
+     */
+    public void gotoYfShop(Activity activity) {
+        goWeb(activity, Config.YF_SHOP_HOME, Config.YF_SHOP_NAME);
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -442,11 +442,12 @@ public class SysAppUtil {
                 e.printStackTrace();
             }
         }
-        if(TestUtil.isSheep()) {
-            checkUpdateNewVersion(activity, ignoreMd5, action1);
-        } else if(!TestUtil.isDev()) {
-            TestUtil.checkUpdateFromJenkins(activity, ignoreMd5, action1);
-        }
+        checkUpdateNewVersion(activity, ignoreMd5, action1);
+//        if(TestUtil.isSheep()) {
+//            checkUpdateNewVersion(activity, ignoreMd5, action1);
+//        } else if(!TestUtil.isDev()) {
+//            TestUtil.checkUpdateFromJenkins(activity, ignoreMd5, action1);
+//        }
     }
     //通过接口检查更新
     public static void checkUpdateNewVersion(final Activity activity, final String ignoreMd5, final Action1<Integer> action1) {

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -55,6 +55,7 @@ import com.sheep.gamegroup.view.dialog.DialogLoading;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogProgress;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -90,8 +91,6 @@ import okhttp3.Call;
 import rx.functions.Action1;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
-import static com.sheep.gamegroup.util.CommonUtil.LONG_MAO_APP_PACKAGE_NAME;
-import static com.sheep.gamegroup.util.CommonUtil.LONG_MAO_APP_URI;
 import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 /**
@@ -234,7 +233,7 @@ public class TestUtil {
     }
 
     public static boolean isSheep() {
-        return TextUtils.equals("sheep", BuildConfig.FLAVOR) && !BuildConfig.DEBUG;
+        return TextUtils.equals("sheep", BuildConfig.FLAVOR) && !isDev();
     }
 
     public static boolean isTest() {
@@ -393,14 +392,14 @@ public class TestUtil {
                                 break;
                             case "龙猫竞猜":
                                 try {
-                                    PackageUtil.startApp(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME);
+                                    PackageUtil.startApp(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME);
                                 } catch (Exception e) {
                                     G.showToast(e.getMessage());
                                 }
                                 break;
                             case "龙猫竞猜-scheme":
                                 try {
-                                    Intent intent = Intent.parseUri(LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
+                                    Intent intent = Intent.parseUri(Config.LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
                                     intent.setComponent(null);
                                     activity.startActivity(intent);
                                 } catch (Exception e) {

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -109,6 +109,7 @@ public class ActMyMoney extends BaseActivity {
         viewPager.setAdapter(mAdapter);
         new_tab();
         //refresh
+        refresh.setHeaderInsetStart(G.getRealPix(24));
         refresh.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
 
             @Override
@@ -138,7 +139,7 @@ public class ActMyMoney extends BaseActivity {
 
             @Override
             public void onPageSelected(int i) {
-                MY_MONEY_TAB.onEvent("tab_name", tabNames[2]);
+                MY_MONEY_TAB.onEvent("tab_name", tabNames[i]);
             }
 
             @Override
@@ -248,22 +249,40 @@ public class ActMyMoney extends BaseActivity {
             return;
         }
         my_money_total_money.setText(getString(R.string.total_money, userAssets.getSheep_bi_total()));
-        my_money_task_reward.setText(getString(R.string.task_reward, userAssets.getTask_reward()));
-        my_money_agent_extract.setText(getString(R.string.agent_extract, userAssets.getExtension_extract()));
-        my_money_recharge_amount.setText(getString(R.string.recharge_amount, userAssets.getRecharge_amount()));
+        my_money_task_reward.setText(getString(R.string.total_money, userAssets.getTask_reward()));
+        my_money_agent_extract.setText(getString(R.string.total_money, userAssets.getExtension_extract()));
+        my_money_recharge_amount.setText(getString(R.string.total_money, userAssets.getRecharge_amount()));
         my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2(userAssets.getCash_withdrawal())));
-        my_money_dingxiang_amount.setText(getString(R.string.dingxiang_amount, NumberFormatUtils.retainMost2(userAssets.getDirectional_currency())));
+        my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2(userAssets.getDirectional_currency())));
     }
     private void resetData() {
         if(my_money_total_money == null){
             return;
         }
         my_money_total_money.setText(getString(R.string.total_money, "0.00"));
-        my_money_task_reward.setText(getString(R.string.task_reward, "0.00"));
-        my_money_agent_extract.setText(getString(R.string.agent_extract, "0.00"));
-        my_money_recharge_amount.setText(getString(R.string.recharge_amount, "0.00"));
+        my_money_task_reward.setText(getString(R.string.total_money, "0.00"));
+        my_money_agent_extract.setText(getString(R.string.total_money, "0.00"));
+        my_money_recharge_amount.setText(getString(R.string.total_money, "0.00"));
         my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
-        my_money_dingxiang_amount.setText(getString(R.string.dingxiang_amount, "0.00"));
+        my_money_dingxiang_amount.setText(getString(R.string.total_money, "0.00"));
+    }
+    //点击优惠购物
+    public void onClickCoupons(View view) {
+        Jump2View.getInstance().gotoYfShop(this);
+    }
+
+    //点击VIP
+    public void onClickVip(View view) {
+        Jump2View.getInstance().goActVip(this);
     }
 
+    //点击游戏直充
+    public void onClickGameRecharge(View view) {
+        Jump2View.getInstance().goGameRecharge(this, null);
+    }
+
+    //点击龙猫电竞
+    public void onClickLongMao(View view) {
+        Jump2View.getInstance().gotoLongMao(this);
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -26,8 +26,13 @@ import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RouserArticlesEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
+import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsResp;
+import com.sheep.gamegroup.util.ApiJSONUtil;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.IDConstant;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
@@ -36,6 +41,7 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ApiKey;
@@ -432,6 +438,25 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                 case JUMP_WATCH_FOCUS://看点
                     Jump2View.getInstance().goWatchFocus(activity, advertising.getLink_id());
                     break;
+                case IDConstant.JUMP_EXCHANGE_COUPON://绵羊币兑换商城优惠券
+                    //调用接口兑换商城优惠券， 然后跳转到对应的商城h5界面
+                    ApiJSONUtil.postYfShopReceiveCoupons(ReceiveCouponsCheckResq.TYPE_NEW_TASK, 6f)
+                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                G.showToast(baseMessage);
+                            }
+
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                G.showToast(baseMessage);
+                                ReceiveCouponsResp data = baseMessage.getData(ReceiveCouponsResp.class);
+                                if(data != null){
+                                    Jump2View.getInstance().goWeb(activity, data.getBuy_url(), advertising.getName());
+                                }
+                            }
+                        });
+                    break;
             }
         }
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpMiDong.java

@@ -77,7 +77,7 @@ public class AdpMiDong extends AdbCommonRecycler<AdData> {
         }
 
         if (!TextUtils.isEmpty(data.getTodayTask())) {
-            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>%s元</font>", data.getUprice())));
+            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>%s</font>", data.getPrice())));
             tv_date.setText(data.getTodayTask());
             if(TimeUtil.newInstance().big2Today(data.getTodayTask(), TimeUtil.FORMAT_DD_LINE)){
                 task_top.setEnabled(true);
@@ -86,8 +86,7 @@ public class AdpMiDong extends AdbCommonRecycler<AdData> {
             }
             task_top.setVisibility(View.VISIBLE);
         } else {//(data.getUprice() + data.getUsign_price_total())
-            double price = data.getUprice() + data.getUsign_price_total();
-            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>%s元</font>", NumberFormatUtils.retainMost2(price))));
+            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>%s</font>", data.getPrice_all_exdw())));
             task_top.setVisibility(View.GONE);
         }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -136,7 +136,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     if (BuildConfig.DEBUG) {
                         G.showToast("测试：服务器返回数据错误，这个奖励可能没有完成？");
                     }
-                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
+//                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
                         isShow(context);
                     break;
                 case 6://加入官方QQ群

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -566,6 +566,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
                 CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonusText() + "元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
 
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 if (isBegin == 1 || type == 2) {//即将开始
@@ -744,6 +745,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
                 CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ taskReleaseEty.getBonusText() +"元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
                 if(!taskReleaseEty.getDeadline().equals("永久")){
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                             "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getDeadline()))+"");

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogMidong.java

@@ -11,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -69,7 +70,7 @@ public class DialogMidong {
             CommonUtil.getInstance().setDownloadTvText(activity,midong_btn_tv, data);
          } else {
            String todayTask = data.getDate();
-            if (todayTask != null && todayTask.equals(TimeUtil.newInstance().TimeStamp2Date(System.currentTimeMillis(), "yyyy-MM-dd"))) {
+            if (todayTask != null && todayTask.equals(TimeUtil. TimeStamp2Date(System.currentTimeMillis(), "yyyy-MM-dd"))) {
                 CommonUtil.getInstance().setDownloadTvText(activity,midong_btn_tv, data);
                 midong_btn_tv.setEnabled(true);
                 midong_btn_tv.setTextColor(activity.getResources().getColor(R.color.blue_34a6e7));
@@ -81,9 +82,9 @@ public class DialogMidong {
         }
         item_date_tv.setText((TextUtils.isEmpty(data.getSize())?"0":data.getSize() +"M"));
         if (!TextUtils.isEmpty(data.getTodayTask())) {
-            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>+%s元</font>", data.getUsign_price_total())));
+            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>+%s</font>", data.getPrice())));
         }else {
-            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>+%s元</font>,签到还可继续得<font color='#ff4a5f'>+%s元</font>", data.getUprice() , data.getUsign_price_total())));
+            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>+%s元</font>,签到还可继续得<font color='#ff4a5f'>+%s元</font>", NumberFormatUtils.retainMost2(data.getUprice()) , NumberFormatUtils.retainMost2(data.getUsign_price_total()))));
         }
 
         midong_btn_tv.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongAdTskList.java

@@ -2,10 +2,12 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.support.v7.widget.RecyclerView;
 
+import com.alibaba.fastjson.JSON;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.GetAdListListener;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.adapter.AdpMiDong;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -30,6 +32,7 @@ public class FgtMiDongAdTskList extends BaseListFragment<AdData> {
         AdManager.getInstance(SheepApp.getInstance()).getAdListAsync(activity, new GetAdListListener() {
             @Override
             public void onLoadAdSuccess(final List<AdData> newList) {
+                LogUtil.println(FgtMiDongAdTskList.class.getSimpleName(), "onLoadAdSuccess", JSON.toJSONString(newList));
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -108,6 +108,10 @@ public class FgtPersonalCenter extends BaseFragment {
     View fgt_person_center_my_focus_line;
     @BindView(R.id.fgt_person_center_my_focus)
     View fgt_person_center_my_focus;
+    @BindView(R.id.fgt_pc_item_vip_v)
+    View fgt_pc_item_vip_v;
+    @BindView(R.id.fgt_pc_item_vip_ll)
+    View fgt_pc_item_vip_ll;
     @BindView(R.id.vip_flag_view)
     View vipFlagView;
 
@@ -290,7 +294,9 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setText(nameTv, userEntity.getNickname());
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
         GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
-        vipFlagView.setVisibility(userEntity.isVIP()?View.VISIBLE:View.GONE);
+        ViewUtil.setVisibility(vipFlagView, userEntity.isVIP());
+        ViewUtil.setVisibility(fgt_pc_item_vip_v, userEntity.isVIP());
+        ViewUtil.setVisibility(fgt_pc_item_vip_ll, userEntity.isVIP());
     }
 
     /**
@@ -428,6 +434,9 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.account_detail_layout://个人资料
                 Jump2View.getInstance().goPersionInfo(activity, null);
                 break;
+            case R.id.fgt_pc_item_vip_ll://VIP
+                Jump2View.getInstance().goActVip(activity);
+                break;
             case R.id.personalcenter_price_layout://我的资产
                 Jump2View.getInstance().goMyMoney(activity, null);
                 break;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -1597,7 +1597,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             }
             SpUtils.saveFirst("first_invitation" + userEntity.getId(), true);//第一次登录成功后保存起来，下次进来就不再弹新人红包
             if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-                isShowRedPackageWithCode();//邀请红包
+                if(TestUtil.isLTVersion3_4_5()) {//新版本中不显示填写邀请码的界面
+                    isShowRedPackageWithCode();//邀请红包
+                }
             }
 
         }

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -11,4 +11,14 @@ public class Config {
     public static int getGameOrTaskOrGiftLayoutId() {
         return USE_CHRISTMAS_THEME ? R.layout.christmas_dialog_game_or_task_or_gift : R.layout.dialog_game_or_task_or_gift;
     }
+
+    //有范商城
+    public final static String YF_SHOP_NAME = "有范商城";
+    public final static String YF_SHOP_HOME = "http://shop.17xmy.com/mobile/";//有范商城主页地址
+
+
+    //以龙猫开头的则认为是龙猫app
+    public static final String LONG_MAO_APP_NAME = "龙猫";
+    public static final String LONG_MAO_APP_PACKAGE_NAME = "com.cfyl.galesaur.guess";
+    public static final String LONG_MAO_APP_URI = "guess://longmao";
 }

app/src/main/res/drawable/shape_2b0a4c60_solid_rectangle_10.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+    <solid android:color="#2B0A4C60" />
+</shape>

app/src/main/res/drawable/shape_gradient_main.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:endColor="#29d6fd"
+        android:startColor="#34a5e7" />
+</shape>

app/src/main/res/drawable/shape_white_solid_rectangle_left.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomLeftRadius="14dp" android:topLeftRadius="14dp" />
+    <solid android:color="#ffffff" />
+</shape>

app/src/main/res/layout/act_my_money.xml

@@ -1,258 +1,352 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/refresh"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.sheep.gamegroup.view.activity.ActMyMoney">
 
-    <android.support.v4.widget.NestedScrollView
-        android:id="@+id/scrollView"
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="fill_vertical"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_marginTop="@dimen/status_bar_height">
 
-        <LinearLayout
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white_light"
-            android:orientation="vertical">
+            android:layout_gravity="fill_vertical"
+            android:fillViewport="true"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <android.support.constraint.ConstraintLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@mipmap/home_blue_bg"
-                android:paddingTop="@dimen/status_bar_height"
-                android:paddingBottom="52dp">
-
-                <ImageView
-                    android:id="@+id/img_baseactivity_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="?attr/actionBarSize"
-                    android:gravity="center_vertical"
-                    android:paddingStart="@dimen/content_padding_20"
-                    android:paddingEnd="@dimen/content_padding_20"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/narrow_back_white"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                android:layout_height="match_parent"
+                android:background="@color/white_light"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/txt_baseactivity_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="?attr/actionBarSize"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/app_name"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_4"
-                    app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+                <android.support.constraint.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_20"
-                    android:layout_marginTop="@dimen/content_padding_10"
-                    android:text="@string/total_money_lable"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/img_baseactivity_title" />
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="30dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        android:src="@mipmap/home_blue_bg"
+                        app:layout_constraintTop_toTopOf="parent" />
+                    <View
+                        android:id="@+id/act_my_money_top_v"
+                        android:layout_width="match_parent"
+                        android:layout_height="?attr/actionBarSize"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:background="@color/white_light" />
 
-                <LinearLayout
-                    android:id="@+id/my_money_ll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/content_padding_20"
-                    android:orientation="vertical"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/img_baseactivity_title">
+                    <TextView
+                        android:id="@+id/my_money_recharge_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="28dp"
+                        android:background="@drawable/shape_white_solid_rectangle_left"
+                        android:gravity="center_vertical"
+                        android:paddingStart="14dp"
+                        android:paddingEnd="10dp"
+                        android:text="充值 >"
+                        android:textColor="#2BCEFA"
+                        android:textSize="15sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/act_my_money_top_v" />
 
                     <TextView
-                        android:id="@+id/my_money_agent_extract"
+                        android:id="@+id/my_money_withdraw_tv"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:text="@string/agent_extract"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
+                        android:layout_height="28dp"
+                        android:layout_marginTop="13dp"
+                        android:background="@drawable/shape_white_solid_rectangle_left"
+                        android:gravity="center_vertical"
+                        android:paddingStart="14dp"
+                        android:paddingEnd="10dp"
+                        android:text="提现 >"
+                        android:textColor="#2BCEFA"
+                        android:textSize="15sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_recharge_tv" />
 
                     <TextView
-                        android:id="@+id/my_money_task_reward"
+                        android:id="@+id/my_money_total_money_lable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/content_padding_20"
-                        android:text="@string/task_reward"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
+                        android:layout_marginStart="22dp"
+                        android:text="@string/total_money_lable"
+                        android:textColor="#DCF3FD"
+                        android:textSize="15sp"
+                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv" />
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                        android:orientation="vertical"
+                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
+                        app:layout_constraintStart_toEndOf="@id/my_money_total_money_lable"
+                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv">
 
                         <TextView
-                            android:id="@+id/my_money_dingxiang_amount"
+                            android:id="@+id/my_money_total_money"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/dingxiang_amount"
+                            android:layout_marginStart="15dp"
+                            android:text="@string/total_money"
                             android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            android:textSize="25sp" />
 
-                        <ImageView
-                            android:id="@+id/my_money_dingxiang_amount_iv"
-                            android:layout_width="35dp"
-                            android:layout_height="35dp"
-                            android:padding="10dp"
-                            android:src="@mipmap/question_mark" />
+                        <TextView
+                            android:id="@+id/my_money_available_amount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="9dp"
+                            android:layout_marginTop="2dp"
+                            android:background="@drawable/shape_2b0a4c60_solid_rectangle_10"
+                            android:paddingStart="6dp"
+                            android:paddingTop="3dp"
+                            android:paddingEnd="6dp"
+                            android:paddingBottom="3dp"
+                            android:text="@string/available_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/my_money_recharge_amount"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/my_money_amount_ll"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/recharge_amount"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
+                        android:layout_marginTop="18dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_withdraw_tv">
 
-                </LinearLayout>
+                        <TextView
+                            android:id="@+id/my_money_agent_extract"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                <TextView
-                    android:id="@+id/my_money_available_amount"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_20"
-                    android:text="@string/available_amount"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:layout_constraintBottom_toBottomOf="@+id/my_money_ll"
-                    app:layout_constraintStart_toStartOf="parent" />
+                        <TextView
+                            android:id="@+id/my_money_task_reward"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                <TextView
-                    android:id="@+id/my_money_total_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_20"
-                    android:layout_marginBottom="@dimen/content_padding_10"
-                    android:text="@string/total_money"
-                    android:textColor="@color/white"
-                    android:textSize="25sp"
-                    app:layout_constraintBottom_toTopOf="@+id/my_money_available_amount"
-                    app:layout_constraintStart_toStartOf="parent" />
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/my_money_dingxiang_amount"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/total_money"
+                                android:textColor="@color/white"
+                                android:textSize="12sp" />
+
+                            <ImageView
+                                android:id="@+id/my_money_dingxiang_amount_iv"
+                                android:layout_width="35dp"
+                                android:layout_height="35dp"
+                                android:padding="10dp"
+                                android:src="@mipmap/question_mark" />
+                        </LinearLayout>
 
-            </android.support.constraint.ConstraintLayout>
+                        <TextView
+                            android:id="@+id/my_money_recharge_amount"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/content_padding_10"
-                android:layout_marginTop="-37dp"
-                android:layout_marginEnd="@dimen/content_padding_10"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                android:orientation="vertical">
+                    </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingStart="@dimen/content_padding_20"
-                    android:paddingTop="@dimen/content_padding_10"
-                    android:paddingEnd="@dimen/content_padding_20"
-                    android:paddingBottom="@dimen/content_padding_10">
+                    <LinearLayout
+                        android:id="@+id/my_money_ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_amount_ll">
 
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:src="@drawable/selector_tab_my_money1" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/agent_extract"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                    <TextView
-                        android:id="@+id/my_money_recharge_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/content_padding_10"
-                        android:layout_weight="1"
-                        android:text="充值"
-                        android:textColor="@color/gray_4"
-                        android:textSize="15sp" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/task_reward"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                    <ImageView
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:src="@mipmap/x_ic_next" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/dingxiang_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                </LinearLayout>
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/recharge_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
-                    android:layout_marginLeft="@dimen/content_padding_20"
-                    android:layout_marginRight="@dimen/content_padding_20"
-                    android:background="@color/white_bg_line" />
+                    </LinearLayout>
+                </android.support.constraint.ConstraintLayout>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="7dp"
+                    android:text="绵羊币消费场景"
+                    android:textColor="#ff333333"
+                    android:textSize="14sp" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingStart="@dimen/content_padding_20"
-                    android:paddingTop="@dimen/content_padding_10"
-                    android:paddingEnd="@dimen/content_padding_20"
-                    android:paddingBottom="@dimen/content_padding_10">
-
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:src="@drawable/selector_tab_my_money2" />
-
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
                     <TextView
-                        android:id="@+id/my_money_withdraw_tv"
                         android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/content_padding_10"
+                        android:drawableTop="@mipmap/ic_coupons"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickCoupons"
+                        android:textSize="12sp"
+                        android:text="优惠购物"/>
+                    <TextView
+                        android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:text="提现"
-                        android:textColor="@color/gray_4"
-                        android:textSize="15sp" />
-
-                    <ImageView
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:src="@mipmap/x_ic_next" />
-
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_vip"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickVip"
+                        android:textSize="12sp"
+                        android:text="VIP"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_game_recharge"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickGameRecharge"
+                        android:textSize="12sp"
+                        android:text="游戏直充"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_long_mao"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickLongMao"
+                        android:textSize="12sp"
+                        android:text="龙猫电竞"/>
                 </LinearLayout>
-            </LinearLayout>
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/indicator"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginStart="@dimen/content_padding_10"
-                android:layout_marginTop="@dimen/content_padding_20"
-                android:layout_marginEnd="@dimen/content_padding_10"
-                android:background="@drawable/shape_main_solid_rectangle_small_top"
-                app:tabGravity="center"
-                app:tabIndicatorColor="#4bc1fe"
-                app:tabIndicatorHeight="0dp"
-                app:tabMode="fixed"
-                app:tabSelectedTextColor="@android:color/white"
-                app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-                app:tabTextColor="#444444" />
+                <android.support.design.widget.TabLayout
+                    android:id="@+id/indicator"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:layout_marginEnd="@dimen/content_padding_10"
+                    android:background="@drawable/shape_main_solid_rectangle_small_top"
+                    app:tabGravity="center"
+                    app:tabIndicatorColor="#4bc1fe"
+                    app:tabIndicatorHeight="0dp"
+                    app:tabMode="fixed"
+                    app:tabSelectedTextColor="@android:color/white"
+                    app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+                    app:tabTextColor="#444444" />
+
+                <com.kfzs.android.view.widget.WrapContentHeightViewPager
+                    android:id="@+id/pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dip"
+                    android:layout_weight="1" />
 
-            <com.kfzs.android.view.widget.WrapContentHeightViewPager
-                android:id="@+id/pager"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1" />
+            </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-        </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_gradient_main"
+        android:paddingTop="@dimen/status_bar_height">
+
+        <ImageView
+            android:id="@+id/img_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="?attr/actionBarSize"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/content_padding_20"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:scaleType="centerInside"
+            android:src="@drawable/narrow_back_white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/txt_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_4"
+            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+    </android.support.constraint.ConstraintLayout>
+</RelativeLayout>

app/src/main/res/layout/act_vip.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context="com.sheep.gamegroup.module.user.activity.ActVip">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:orientation="vertical"
+        android:padding="@dimen/content_padding_13">
+
+        <TextView
+            style="@style/txt_style_15"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="支付方式" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <TextView
+        style="@style/style_button"
+        android:onClick="onClickPay"
+        android:text="立即支付" />
+
+</LinearLayout>

app/src/main/res/layout/fgt_personalcenter_item_center_one.xml

@@ -21,6 +21,27 @@
 
     </LinearLayout>
 
+    <View
+        android:id="@+id/fgt_pc_item_vip_v"
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/fgt_pc_item_vip_ll"
+        style="@style/style_item_container"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/style_item_img"
+            android:src="@mipmap/ic_vip_pc_item" />
+
+        <TextView
+            style="@style/style_item_label"
+            android:text="VIP" />
+
+        <TextView style="@style/style_item_end_next" />
+
+    </LinearLayout>
     <View style="@style/style_item_line_new"
         android:visibility="gone" />
 

app/src/main/res/layout/tablayout_viewpager_layout.xml

@@ -19,7 +19,6 @@
         android:id="@+id/viewpager_act_game_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/content_padding_15"
         android:minHeight="@dimen/view_size_100"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </LinearLayout>

app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -23,10 +23,10 @@
             android:id="@+id/item_title_tv"
             android:layout_width="match_parent"
             android:layout_height="@dimen/content_padding_20"
-            android:layout_marginEnd="12dp"
-            android:gravity="center_vertical"
             android:layout_marginStart="@dimen/content_padding_small"
+            android:layout_marginEnd="12dp"
             android:layout_toEndOf="@+id/item_title_iv"
+            android:gravity="center_vertical"
             android:text="进行中"
             android:textColor="@color/black"
             android:textSize="15sp" />
@@ -42,9 +42,13 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="@dimen/content_padding_10">
+        android:layout_marginEnd="12dp">
+
+        <View
+            android:id="@+id/item_top_v"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/content_padding_10" />
 
         <ImageView
             android:id="@+id/item_icon_iv"
@@ -52,16 +56,16 @@
             android:layout_height="70dp"
             android:src="@drawable/icon_lj"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
 
         <TextView
             android:id="@+id/end_of_time_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/content_padding_4"
             android:layout_marginStart="@dimen/content_padding_4"
             android:layout_marginTop="55dp"
+            android:layout_marginEnd="@dimen/content_padding_4"
             android:background="@drawable/shape_ash_stroke_white_solid_rectangle"
             android:gravity="center"
             android:lines="1"
@@ -70,19 +74,7 @@
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@+id/item_icon_iv"
             app:layout_constraintStart_toStartOf="@+id/item_icon_iv"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/item_money"
-            android:layout_width="@dimen/find_bt_with"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:text="+10元"
-            android:textColor="@color/txt_red"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -90,7 +82,8 @@
             android:layout_marginStart="@dimen/content_padding"
             android:orientation="vertical"
             app:layout_constraintEnd_toStartOf="@+id/task_type_tv"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv">
+            app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
+            app:layout_constraintTop_toBottomOf="@id/item_top_v">
 
             <TextView
                 android:id="@+id/item_name_tv"
@@ -131,6 +124,7 @@
                     android:textColor="#cc8e8e8e"
                     android:textSize="10sp"
                     android:visibility="gone" />
+
                 <TextView
                     android:id="@+id/item_num_tv2"
                     android:layout_width="wrap_content"
@@ -150,8 +144,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/content_padding_8"
                 android:layout_marginTop="@dimen/content_padding_2"
+                android:layout_marginEnd="@dimen/content_padding_8"
                 android:orientation="horizontal">
 
                 <TextView
@@ -179,11 +173,11 @@
         <TextView
             android:id="@+id/task_type_tv"
             style="@style/style_button_find"
+            android:layout_marginTop="5dp"
             android:text="@string/task_cancel"
             android:visibility="invisible"
-            android:layout_marginTop="5dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
         <TextView
             android:id="@+id/detail_task_tv_center"
@@ -193,50 +187,88 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
-        <RelativeLayout
-            android:id="@+id/detail_task_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
-            app:layout_constraintEnd_toEndOf="parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:gravity="end"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/item_top_v">
 
             <TextView
-                android:id="@+id/detail_task_tv"
-                style="@style/style_button_find"
-                android:text="@string/task_cancel" />
+                android:id="@+id/item_money_vip_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:minWidth="@dimen/find_bt_with"
+                android:text="会员：+11元"
+                android:textColor="@color/txt_red"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <TextView
-                android:id="@+id/detail_task_tv_down"
-                style="@style/style_button_find"
-                android:text="@string/task_cancel"
-                android:visibility="gone" />
+                android:id="@+id/item_money"
+                android:layout_width="@dimen/find_bt_with"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:text="+10元"
+                android:textColor="@color/txt_red"
+                android:textSize="15sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <RelativeLayout
+                android:id="@+id/detail_task_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-        </RelativeLayout>
+                <TextView
+                    android:id="@+id/detail_task_tv"
+                    style="@style/style_button_find"
+                    android:text="@string/task_cancel" />
+
+                <TextView
+                    android:id="@+id/detail_task_tv_down"
+                    style="@style/style_button_find"
+                    android:text="@string/task_cancel"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+        </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="12dp"
         android:background="@drawable/sp_rectangle_bg_gray_radius"
         android:padding="@dimen/content_padding_small"
         android:text="@string/tip_finish_task_in_time_or_repeat"
         android:textColor="@color/txt_black_8e8e8e"
         android:textSize="@dimen/text_size_10"
         android:visibility="gone" />
+
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10"/>
+        android:layout_height="@dimen/content_padding_10" />
+
     <View
         android:id="@+id/line_tv"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:background="@color/gray_F0F0F0" />
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -11,13 +11,13 @@
     <string name="last_page">&#060;</string>
     <string name="next_page">&#062;</string>
 
-    <string name="total_money_lable">绵羊币总余额：</string>
+    <string name="total_money_lable">绵羊币\n总余额：</string>
     <string name="total_money">%s元</string>
-    <string name="task_reward">奖励总额：%s元</string>
-    <string name="agent_extract">推广提成总额：%s元</string>
-    <string name="recharge_amount">充值总额：%s元</string>
+    <string name="task_reward">奖励余额</string>
+    <string name="agent_extract">推广提成</string>
+    <string name="recharge_amount">充值余额</string>
     <string name="available_amount">可提现金额：%s元</string>
-    <string name="dingxiang_amount">福利总额：%s元</string>
+    <string name="dingxiang_amount">定向消费</string>
 
     <string name="rechargeq_amount">当前绵羊币余额：%s元</string>
 

media/app/src/main/java/com/kfzs/cfyl/media/MediaApp.java

@@ -27,7 +27,11 @@ public class MediaApp extends Application {
     private void initCgeLibrary() {
         //The second param will be passed as the second arg of the callback function.
         //第二个参数根据自身需要设置， 将作为 loadImage 第二个参数回传
-        CGENativeLibrary.setLoadImageCallback(mLoadImageCallback, null);
+        try {
+            CGENativeLibrary.setLoadImageCallback(mLoadImageCallback, null);
+        } catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     public CGENativeLibrary.LoadImageCallback mLoadImageCallback = new CGENativeLibrary.LoadImageCallback() {