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

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

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/9/19.
+ * realicing@sina.com
+ */
+public class ScreenShotConfig {
+    private boolean need = true;//默认为true
+
+    public boolean isNeed() {
+        return need;
+    }
+
+    public void setNeed(boolean need) {
+        this.need = need;
+    }
+}

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

@@ -15,7 +15,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.SystemNotification;
+import com.sheep.gamegroup.model.entity.ScreenShotConfig;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -305,9 +305,11 @@ public class DataUtil {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                boolean isOpen = baseMessage.getData(Boolean.class);
-                                IS_USE_SCREEN_SHOT = isOpen;
-                                IS_LISTEN_SCREEN_SHOT = isOpen;
+                                ScreenShotConfig config = baseMessage.getData(ScreenShotConfig.class);
+                                if(config != null) {
+                                    IS_USE_SCREEN_SHOT = config.isNeed();
+                                    IS_LISTEN_SCREEN_SHOT = config.isNeed();
+                                }
                             }
 
                             @Override

app/src/main/java/com/sheep/gamegroup/util/upfile/UpFileUtils.java

@@ -65,15 +65,26 @@ public class UpFileUtils {
         if (index < size) {
             File file;
             if ((file = new File(photos.get(index))).exists()) {
-                File newFile = new CompressHelper.Builder(SheepApp.getInstance())
-                        .setMaxWidth(2000)  // 默认最大宽度为720
-                        .setMaxHeight(2000) // 默认最大高度为960
-                        .setQuality(80)    // 默认压缩质量为80
-                        .setCompressFormat(Bitmap.CompressFormat.PNG) // 设置默认压缩为png格式
-                        .build().compressToFile(file);
-//                org.xutils.common.util.FileUtil.copy(newFile.getAbsolutePath(), ClassFileHelper.DIR+"/1.png");
-                if(action1 != null)
-                    action1.call(newFile.getAbsolutePath(), size, index);
+                File newFile = null;
+                try {
+                    newFile = new CompressHelper.Builder(SheepApp.getInstance())
+                            .setMaxWidth(1080)  // 默认最大宽度为720
+                            .setMaxHeight(1080) // 默认最大高度为960
+                            .setQuality(80)    // 默认压缩质量为80
+                            .setCompressFormat(Bitmap.CompressFormat.PNG) // 设置默认压缩为png格式
+                            .build().compressToFile(file);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                if(newFile == null || !newFile.exists()){
+                    newFile = file;
+                }
+                try {
+                    if(action1 != null)
+                        action1.call(newFile.getAbsolutePath(), size, index);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 OkHttpUtils.post()
                         .addFile("uploadfile", "1.png", newFile)//
                         .url(URL_RN_UP_IMAGE)

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

@@ -2,10 +2,8 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
@@ -18,21 +16,19 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActInvitation;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -283,7 +279,7 @@ public class FgtAskgetmoney extends BaseFragment {
         CommonUtil.getInstance().reflex(indicator, activity);
     }
 
-    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.ask_invite_rl})
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.ask_invite_rl, R.id.ask_act_rule})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.copy_my_invitation_tv:
@@ -293,7 +289,11 @@ public class FgtAskgetmoney extends BaseFragment {
                 StringUtils.CopyText(userEntity.getInvitation_code() + "");
                 G.showToast("复制邀请码成功");
                 break;
-            case R.id.ask_invite_rl:
+            case R.id.ask_act_rule:
+                ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动规则").setBtnLeftText("我知道了").setTheme(DialogConfig.THEME_PURPLE)
+                    .setMsg("首邀好友，好友下载并登录小绵羊，既可获得2.5绵羊币\n首邀好友完成新手任务，邀请人可额外再获得2.5绵羊币"));
+                break;
+            case R.id.ask_invite_rl://只是一个点击，用来遮盖底部不可见的view的点击
                 break;
             case R.id.ask_invite_tv:
                 Jump2View.getInstance().goActInvitation(activity);

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

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

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

@@ -189,6 +189,21 @@
 
                     <include layout="@layout/ask_getmoney_act_item_three_notice_layout" />
                 </LinearLayout>
+
+                <TextView
+                    android:id="@+id/ask_act_rule"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="6dp"
+                    android:gravity="center"
+                    android:layout_marginTop="32dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:text="活动规则"
+                    android:textColor="#ffffffff"
+                    android:textSize="10sp"
+                    android:background="@drawable/sp_bg_purple_left_radius_12"/>
             </RelativeLayout>
         </android.support.v4.widget.NestedScrollView>
     </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>