sick

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

@@ -434,7 +434,7 @@ public class UserEntity implements Serializable {
     }
 
     public CharSequence getVIPInfo() {
-        String info = String.format(Locale.CHINA, "\t%s到期", TimeUtil.TimeStamp2Date(vip_time, "yyyy.MM.dd"));
+        String info = String.format(Locale.CHINA, "\t有效期%s", TimeUtil.TimeStamp2Date(vip_time, "yyyy.MM.dd"));
         return new SpannableSb().append("VIP").append(info, R.dimen.text_size_9).getSsb();
     }
 

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -622,6 +622,11 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public void goUserCheckIn() {
+        Jump2View.getInstance().goActSignSheep(activity);
+    }
+
+    @JavascriptInterface
     public void shareThirdPartApp(int type, String title, String desc, String url, String img) {
         String shareType = null;
         switch (type) {
@@ -775,4 +780,5 @@ public class KFZSJs {
                     }
                 });
     }
+
 }

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

@@ -119,8 +119,8 @@ public class FgtPersonalCenter extends BaseFragment {
     View fgt_pc_item_vip_ll;
     @BindView(R.id.vip_flag_view)
     View vipFlagView;
-    @BindView(R.id.vip_flag_view_tv)
-    TextView vip_flag_view_tv;
+    @BindView(R.id.vip_info_tv)
+    TextView vipInfoView;
     @BindView(R.id.voucher_red_dot)
     View voucher_red_dot;
     @BindView(R.id.fgt_pc_item_my_pet_v)
@@ -336,7 +336,8 @@ public class FgtPersonalCenter extends BaseFragment {
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
         GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
         ViewUtil.setVisibility(vipFlagView, userEntity.isVIP());
-        ViewUtil.setText(vip_flag_view_tv, userEntity.getVIPInfo());
+        ViewUtil.setVisibility(vipInfoView, userEntity.isVIP());
+        ViewUtil.setText(vipInfoView, userEntity.getVIPInfo().toString());
         ViewUtil.setVisibility(fgt_pc_item_vip_v, !userEntity.isVIP());
         ViewUtil.setVisibility(fgt_pc_item_vip_ll, !userEntity.isVIP());
         ViewUtil.setVisibility(voucher_red_dot, SpUtils.isVoucherFirst());

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

@@ -35,6 +35,7 @@ public class Config {
     private static final String STATION_TURNTABLE = "/turntable/#";
     private static final String STATION_IQIYI_VIP_MEMBER = "/iqiyi_vip_member/#";
     private static final String STATION_SPRING_FESTIVAL_ACTIVITIES = "/spring_festival_activities/#";
+    private static final String STATION_CLOCK_CHALLENGE = "/clock_challenge/#";
     //邀请赚钱
     private static final String STATION_SMALL_SHEEP_INVITATION = "/small_sheep_invitation/#";
     //游戏金币
@@ -94,6 +95,7 @@ public class Config {
     public static final String PATH_WELFARE_MONEY_REWARD_LIST = STATION_WELFARE + "/money-reward-list";
     //邀请赚钱主页
     public static final String PATH_SMALL_SHEEP_INVITATION_HOME = STATION_SMALL_SHEEP_INVITATION + "/home-page";
+    public static final String PATH_SMALL_SHEEP_CLOCK_CHALLENGE = STATION_CLOCK_CHALLENGE + "/homePage";
     public static final String NAME_WELFARE_MONEY_REWARD_LIST = "赏金任务";
     public static final String STATION_SMALL_SHEEP_H5GAME = "/small_sheep_h5game_plugin";
     //small_station地址 key

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -20,6 +20,7 @@ import com.sheep.gamegroup.model.entity.CommendTask;
 import com.sheep.gamegroup.model.entity.SheepSignResult;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserSign;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataKey;
@@ -31,7 +32,9 @@ import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.customview.ErasableTextView;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.ui.view.EggView;
@@ -466,7 +469,7 @@ public class SignActivity extends BaseUMActivity {
 
     @OnClick(R.id.go_to_pack_but)
     public void onGoToPackButClicked() {
-        Jump2View.getInstance().goSignCardAct(this, null);
+        Jump2View.getInstance().goWeb(this, new WebParams(Config.getUrlByPath(Config.PATH_SMALL_SHEEP_CLOCK_CHALLENGE), "打卡挑战"));
     }
 
     //默认最小奖励
@@ -496,7 +499,9 @@ public class SignActivity extends BaseUMActivity {
 
     @OnClick(R.id.go_to_yaoqing)
     public void onGoToYaoqingClicked() {
-        Jump2View.getInstance().goAskGetMoney(this, null);
+        Intent intent = new Intent(this, ActMain.class);
+        intent.putExtra("SWITCH_TAB", 1);
+        startActivity(intent);
     }
 
     @Override

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

@@ -7,7 +7,7 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="125dp"
+        android:layout_height="140dp"
         android:background="@mipmap/home_blue_bg">
 
         <RelativeLayout
@@ -39,18 +39,6 @@
                 android:textSize="18sp"
                 android:visibility="gone" />
 
-            <!--右边消息图标按钮-->
-            <!--<ImageButton-->
-                <!--android:id="@+id/ibtn_baseactivity_message"-->
-                <!--android:layout_width="40dp"-->
-                <!--android:layout_height="40dp"-->
-                <!--android:layout_marginEnd="16dp"-->
-                <!--android:layout_alignParentBottom="true"-->
-                <!--android:layout_alignParentEnd="true"-->
-                <!--android:background="@color/translate"-->
-                <!--android:gravity="center"-->
-                <!--android:src="@mipmap/message_read_icon" />-->
-            <!--右边设置图标按钮-->
             <ImageButton
                 android:id="@+id/ibtn_baseactivity_right"
                 android:layout_width="40dp"
@@ -76,7 +64,7 @@
             android:layout_height="55dp"
             android:layout_marginTop="60dp"
             android:layout_marginBottom="@dimen/content_padding"
-            android:layout_marginStart="@dimen/content_padding_15"
+            android:layout_marginStart="33dp"
             android:src="@drawable/avatar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -86,48 +74,46 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/content_padding_10"
-            android:layout_marginTop="@dimen/content_padding_3"
-            android:layout_marginBottom="@dimen/content_padding_3"
             android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_12"
+            android:text="Billyyoyo"
+            android:textSize="15sp"
             app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-            app:layout_constraintBottom_toTopOf="@+id/sheep_num_tv" />
+            app:layout_constraintTop_toTopOf="@+id/icon_img_iv" />
+
+        <ImageView
+            android:id="@+id/vip_flag_view"
+            android:src="@mipmap/level_vip"
+            android:adjustViewBounds="true"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginLeft="5dp"
+            app:layout_constraintTop_toTopOf="@+id/name_tv"
+            app:layout_constraintStart_toEndOf="@+id/name_tv"/>
 
         <TextView
             android:id="@+id/sheep_num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_small"
+            android:layout_marginBottom="15dp"
             android:layout_marginStart="@dimen/content_padding_10"
             android:text="绵羊号："
             android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_10"
+            android:textSize="@dimen/text_size_11"
             app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
             app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
 
-        <LinearLayout
-            android:id="@+id/vip_flag_view"
-            android:orientation="horizontal"
+        <TextView
+            android:id="@+id/vip_info_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:visibility="gone"
             android:layout_marginStart="@dimen/content_padding_10"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-            app:layout_constraintBottom_toTopOf="@+id/name_tv">
-            <ImageView
-                android:src="@mipmap/vip_1"
-                android:layout_width="12dp"
-                android:layout_height="12dp" />
-            <TextView
-                android:id="@+id/vip_flag_view_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:text="VIP"
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_12"/>
-        </LinearLayout>
+            android:text="绵羊号："
+            android:textColor="#90ffffff"
+            android:textSize="@dimen/text_size_10"
+            app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
+            app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
+
     </android.support.constraint.ConstraintLayout>
 
     <LinearLayout