Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -292,9 +292,9 @@ public class DataUtil {
         return null;
     }
     //是否使用小绵羊截图方案
-    public static final boolean IS_USE_SCREEN_SHOT = false;
+    public static final boolean IS_USE_SCREEN_SHOT = true;
     //是否监听媒体库图片变化
-    public static final boolean IS_LISTEN_SCREEN_SHOT = false;
+    public static final boolean IS_LISTEN_SCREEN_SHOT = true;
     /**
      * 截图路径
      *

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

@@ -11,7 +11,6 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 
-import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.Agreement;
@@ -23,8 +22,6 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.FindItem;
-import com.sheep.gamegroup.model.entity.GiftBag;
-import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
@@ -56,7 +53,6 @@ import com.sheep.gamegroup.view.activity.ActLoadH5;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActMiDong;
 import com.sheep.gamegroup.view.activity.ActModifyThird;
-import com.sheep.gamegroup.view.activity.ActSysNfDetail;
 import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.gamegroup.view.activity.ActMyWelfare;
 import com.sheep.gamegroup.view.activity.ActNewAboutUs;
@@ -67,6 +63,9 @@ import com.sheep.gamegroup.view.activity.ActReservation;
 import com.sheep.gamegroup.view.activity.ActSearchApp;
 import com.sheep.gamegroup.view.activity.ActSearchGame;
 import com.sheep.gamegroup.view.activity.ActSetting;
+import com.sheep.gamegroup.view.activity.ActSignCard;
+import com.sheep.gamegroup.view.activity.ActSignCardRecord;
+import com.sheep.gamegroup.view.activity.ActSysNfDetail;
 import com.sheep.gamegroup.view.activity.ActUnderstandSheep;
 import com.sheep.gamegroup.view.activity.ActUserLabelList;
 import com.sheep.gamegroup.view.activity.ActWeb;
@@ -90,10 +89,8 @@ import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
 import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.gamegroup.view.activity.RechargeQAct;
 import com.sheep.gamegroup.view.activity.RechargeResultAct;
-import com.sheep.gamegroup.view.activity.SignCardAct;
 import com.sheep.gamegroup.view.activity.SignRankingsAct;
 import com.sheep.gamegroup.view.activity.SignRechargeAct;
-import com.sheep.gamegroup.view.activity.SignRecordAct;
 import com.sheep.gamegroup.view.activity.TaskDetailAct;
 import com.sheep.gamegroup.view.activity.TaskDetailAddQQAct;
 import com.sheep.gamegroup.view.activity.TaskDetailCreditCardAct;
@@ -1143,7 +1140,7 @@ public class Jump2View {
      * @param o
      */
     public void goSignCardAct(Context context, Object o){
-        Intent intent = new Intent(context, SignCardAct.class);
+        Intent intent = new Intent(context, ActSignCard.class);
         context.startActivity(intent);
         UMConfigUtils.Event.PUNCH.onEvent();
     }
@@ -1167,7 +1164,7 @@ public class Jump2View {
      * @param o
      */
     public void goSignRecordAct(Context context, Object o){
-        Intent intent = new Intent(context, SignRecordAct.class);
+        Intent intent = new Intent(context, ActSignCardRecord.class);
         context.startActivity(intent);
         UMConfigUtils.Event.PUNCH_RECORD.onEvent();
     }

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

@@ -77,7 +77,6 @@
                 android:gravity="center"
                 android:text="累计奖励"
                 android:textColor="#282828"
-                android:visibility="gone"
                 android:textSize="@dimen/text_size_12" />
         </LinearLayout>
 

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

@@ -56,7 +56,6 @@
         android:layout_height="match_parent"
         android:layout_weight="2"
         android:gravity="center"
-        android:visibility="gone"
         android:text="1.4元"
         android:textColor="#cc282828"
         android:textSize="@dimen/text_size_10" />