提交之前代码的错误

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

@@ -14,10 +14,10 @@ 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) {

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

@@ -403,7 +403,7 @@ public class UserEntity implements Serializable {
     //用户等级 0：普通用户     1：VIP用户
     public static final int LEVEL_VIP = 1;
     //该用户是否是VIP用户
-    public boolean isVip(){
+    public boolean isVIP(){
         return level >= LEVEL_VIP;
     }
 }

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

@@ -1,16 +1,19 @@
 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;
@@ -39,13 +42,17 @@ public class ActVip extends BaseActivity {
             @Override
             protected void convert(BaseViewHolder helper, BuyVipReq item) {
                 int position = helper.getAdapterPosition();
-//                if (priceShow.isSelectState()){
-//                    convertView.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
-//                    holder.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));
-//                    holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
-//                }
+                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);

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;
 
 /**
@@ -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/fragment/FgtPersonalCenter.java

@@ -66,8 +66,6 @@ import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
 public class FgtPersonalCenter extends BaseFragment {
     @BindView(R.id.icon_img_iv)
     ImageView iconImgIv;
-    @BindView(R.id.fgt_pc_item_top_vip_tv)
-    TextView fgt_pc_item_top_vip_tv;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.sheep_num_tv)
@@ -296,10 +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));
-        ViewUtil.setVisibility(fgt_pc_item_top_vip_tv, userEntity.isVip());
-        ViewUtil.setVisibility(fgt_pc_item_vip_v, userEntity.isVip());
-        ViewUtil.setVisibility(fgt_pc_item_vip_ll, userEntity.isVip());
-        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());
     }
 
     /**