Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -368,7 +368,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 CommonUtil.getInstance()
                         .setHashMap(1,
                                 100,
-                                1,
+                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
                                 1,
                                 0,
                                 0,

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

@@ -107,7 +107,7 @@ public interface ApiService {
     Observable<BaseMessage> bindWeixin(@Query("code") String code);
 
     /**
-     * 获取已接受任务
+     * 获取任务记录列表
      */
     @GET("app/accepted_task/")
     Observable<BaseMessage> acceptedTask(@Query("page") int page, @Query("per_page") int per_page);
@@ -273,9 +273,9 @@ public interface ApiService {
     Observable<BaseMessage> getUserFriendList(@Query("page") int page, @Query("per_page") int per_page);
     @GET("app/release_task/credit_card")
     Observable<BaseMessage> getReleaseTaskCreditCard();
-    @POST("app/release_task/credit_card")
+    @POST("app/accepted_task/credit_card")
     Observable<BaseMessage> releaseTaskCreditCard(@Body JSONObject jsonObject);
-    @PUT("app/release_task/{id}/credit_card")
+    @PUT("app/accepted_task/{id}/credit_card")
     Observable<BaseMessage> releaseTaskCreditCard(@Path("id") int id, @Body JSONObject jsonObject);
     @GET("app/release_task/{id}/desc")
     Observable<BaseMessage> getReleaseTaskCreditCardDesc(@Path("id") int id);

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

@@ -17,6 +17,7 @@ public class TaskAcceptedEty implements Serializable{
     private int status =1;// 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
     private String uid;// 0,
     private String update_time;// 0
+    private int lower_num;// 任务下线后提交的次数
 
     private long end_time;
 
@@ -119,6 +120,14 @@ public class TaskAcceptedEty implements Serializable{
         this.release_task = release_task;
     }
 
+    public int getLower_num() {
+        return lower_num;
+    }
+
+    public void setLower_num(int lower_num) {
+        this.lower_num = lower_num;
+    }
+
     @Override
     public boolean equals(Object obj) {
         return obj instanceof TaskAcceptedEty && ((TaskAcceptedEty) obj).id == id;

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

@@ -25,7 +25,7 @@ public class TaskEty implements Serializable{
     private String remarks;//private String string",
     private String screenshots;//private String string",
     private String task_name;//private String string",
-    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务
+    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思
     private String update_time;// 0
     private String icon;
     private String package_size;

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -10,10 +10,13 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.NetUtil;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import retrofit2.adapter.rxjava.HttpException;
 import rx.Subscriber;
 
 /**
@@ -66,6 +69,17 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                 BaseMessage baseMessage;
                 if(throwable.message.startsWith("{")){
                     baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
+                }else if(ViewUtil.isH5Content(throwable.message)){
+                    if(BuildConfig.DEBUG){
+                        StringBuilder title = new StringBuilder("调用接口错误");
+                        if(e instanceof HttpException) {
+                            title.append(";");
+                            title.append(((HttpException) e).response().toString());
+                        }
+                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
+                    }
+                    baseMessage = new BaseMessage();
+                    baseMessage.setMsg("服务器错误");
                 }else {
                     try {
                         baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -7,9 +7,8 @@ import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.gamegroup.util.PreferenceUtils;
-import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -46,7 +45,8 @@ public class AppStatistics {
      * @param subString
      */
     synchronized public void sendDataToServer(int type,int subType,String subString){
-        String openid = PreferenceUtils.getPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID,"");
+        String id = SpUtils.getOpenId(SheepApp.mContext);
+        String openid = TextUtils.isEmpty(id) ? "" : id.split("@")[0];
         //openid要转换成int类型
         int uid = 0;
         if(!TextUtils.isEmpty(openid)){

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

@@ -47,6 +47,48 @@ public enum ConnectAddress {
         public String getName() {
             return "李抒阳";
         }
+    },
+    sheepzhangweiIOS {
+
+        @Override
+        public String getAppUrl() {
+            return "http://10.8.210.171:8080/";
+        }
+        @Override
+        public String getName() {
+            return "张伟IOS";
+        }
+    },sheeptestIOS {
+
+        @Override
+        public String getAppUrl() {
+            return "http://test.sheep.kfzs.com/";
+        }
+        @Override
+        public String getName() {
+            return "测试服IOS";
+        }
+    },sheepIOS {
+
+        @Override
+        public String getAppUrl() {
+            return "http://ss.kfzs.com/";
+        }
+
+        @Override
+        public String getName() {
+            return "正式服IOS";
+        }
+    },sheeplishuyangIOS {
+
+        @Override
+        public String getAppUrl() {
+            return "http://10.8.210.170:8080/";
+        }
+        @Override
+        public String getName() {
+            return "李抒阳IOS";
+        }
     };
     public abstract String getAppUrl();
 
@@ -56,4 +98,8 @@ public enum ConnectAddress {
     public String toString() {
         return getName();
     }
+
+    public int getPlatForm() {
+        return getName().endsWith("IOS") ? 0 : 1;//0 ios, 1 android
+    }
 }

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

@@ -0,0 +1,408 @@
+package com.sheep.gamegroup.util;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Environment;
+import android.support.v4.app.ActivityCompat;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Log;
+
+import com.sheep.gamegroup.model.api.BaseMessageConverter;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * Created by realicing on 2018/5/24.
+ * realicing@sina.com
+ */
+public class DeviceIDUtil {
+
+    /*
+     *
+     *  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+     *  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     *  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+     *
+     * */
+    private static final String SHARED_PREFERENCES_NAME = "deviceid_cache";
+    //.开头隐藏文件和隐藏文件夹
+    private static final String FILE_PATH = "data/.cache/.1270f37f6c8";
+
+    private static final String LOACL_UUID = "my_device_localuuid";
+    private static final String LOACL_MAC = "my_device_local_mac";
+    private static final String LOACL_IMEI = "my_device_local_imei";
+    private static final String LOACL_DEVICE_IMEI = "my_device_local_device_imei";
+
+
+    private static final String LOACL_DEVICE_ID = "my_device_loacl_device_id";
+
+    private static final String LOACL_FILENAME_KEY = "loacl_filename_key";
+
+
+
+
+    //获取设备唯一id
+    public static String getDeviceId(Context mContext) {
+      /*  Log.d("DeviceIDUtils", "getLocalDeviceId:" + getLocalDeviceId());
+        Log.d("DeviceIDUtils", "getMacid:" + getMacid());
+        Log.d("DeviceIDUtils", "getMac60:" + getMac60());
+        Log.d("DeviceIDUtils", "getMac60_1:" + getMac60_1());
+        Log.d("DeviceIDUtils", "getMac60_2:" + getMac60_2());
+        Log.d("DeviceIDUtils", "getimei:" + getimei());
+        Log.d("DeviceIDUtils", "getDiviceInfoIMEI:" + getDiviceInfoIMEI());
+        Log.d("DeviceIDUtils", "getLocalUUID:" + getLocalUUID());
+        Log.d("DeviceIDUtils", "getFileName:" + getFileName());
+*/
+        String localDeviceId = getLocalDeviceId(mContext);
+        if (!TextUtils.isEmpty(localDeviceId)) {
+            return localDeviceId;
+        }
+        //先获取获取默认的imei
+        String diviceid = getimei(mContext);
+
+        //如果为空获取MAC地址
+        if (TextUtils.isEmpty(diviceid)) {
+            diviceid = getMacid(mContext);
+        }
+
+        //如果还为空择取设备信息拼接出来的id
+        if (TextUtils.isEmpty(diviceid)) {
+            diviceid = getDiviceInfoIMEI(mContext);
+        }
+
+        //如果还为空则生成并保存一个唯一的UUID
+        if (TextUtils.isEmpty(diviceid)) {
+            diviceid = getLocalUUID(mContext);
+        }
+
+        Log.d("DeviceIDUtils", "return diviceid:" + diviceid);
+        saveDeviceId(mContext, diviceid);
+        return diviceid;
+    }
+
+    private static String getLocalDeviceId(Context mContext) {
+        String savaString = getSavaString(mContext, LOACL_DEVICE_ID, "");
+        if (TextUtils.isEmpty(savaString)) {
+            String s = readSDFile();
+            if (!TextUtils.isEmpty(s)) {
+                savaString(mContext, LOACL_DEVICE_ID, s);
+                return s;
+            }
+        } else {
+            return savaString;
+        }
+
+        return null;
+    }
+
+    private static void saveDeviceId(Context mContext, String diviceid) {
+        savaString(mContext, LOACL_DEVICE_ID, diviceid);
+        //加密保存
+        saveFile(BaseMessageConverter.encrypt(diviceid));
+    }
+
+    private static void saveFile(String str) {
+        String filePath = null;
+        boolean hasSDCard = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
+        if (hasSDCard) { // SD卡根目录的hello.text
+            filePath = Environment.getExternalStorageDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
+        } else {  // 系统下载缓存根目录的hello.text
+            filePath = Environment.getDownloadCacheDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
+        }
+        try {
+            File file = new File(filePath);
+            //不存在則重新保存
+            if (!file.exists()) {
+                Log.d("DeviceIDUtils", "saveFile filePath:" + filePath);
+                File dir = new File(file.getParent());
+                dir.mkdirs();
+                file.createNewFile();
+                FileOutputStream outStream = new FileOutputStream(file);
+                outStream.write(str.getBytes());
+                outStream.close();
+            } else {
+                Log.d("DeviceIDUtils", "saveFile 文件已存在:" + filePath);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static String getFileName() {
+        //两种模式，随机的文件名和固定文件名，可以根据需求自行更换
+        //随机的文件名
+       /* String savaFileName = getSavaString(LOACL_FILENAME_KEY, "");
+        if (TextUtils.isEmpty(savaFileName)) {
+            String uuid = UUID.randomUUID().toString().replace("-", "");
+            savaString(LOACL_FILENAME_KEY, uuid);
+            Log.d("DeviceIDUtils", "getFileName:" + uuid);
+            return uuid;
+        } else {
+            Log.d("DeviceIDUtils", "getFileName:" + savaFileName);
+            return savaFileName;
+        }*/
+
+
+        //固定文件名
+        return ".abcdefg60232414f87c77dcc737f2f0c";
+    }
+
+    private static String readSDFile() {
+        try {
+            String filePath = null;
+            boolean hasSDCard = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
+            if (hasSDCard) { // SD卡根目录的hello.text
+                filePath = Environment.getExternalStorageDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
+            } else {  // 系统下载缓存根目录的hello.text
+                filePath = Environment.getDownloadCacheDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
+            }
+            File file = new File(filePath);
+            FileInputStream fis = new FileInputStream(file);
+            int length = fis.available();
+
+            byte[] buffer = new byte[length];
+            fis.read(buffer);
+            String res = new String(buffer, "utf-8");
+            fis.close();
+            Log.d("DeviceIDUtils", "readSDFile filePath:" + filePath);
+            Log.d("DeviceIDUtils", "readSDFile res:" + res);
+            //解密
+            return BaseMessageConverter.decrypt(res);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+    private static String getLocalUUID(Context mContext) {
+        String localuuid = getSavaString(mContext, LOACL_UUID, "");
+        if (TextUtils.isEmpty(localuuid)) {
+            localuuid = UUID.randomUUID().toString().replace("-", "");
+            savaString(mContext, LOACL_UUID, localuuid);
+        }
+        return localuuid;
+    }
+
+    private static String getMacid(Context mContext) {
+        String WLANMAC = getSavaString(mContext, LOACL_MAC, "");
+        if (!TextUtils.isEmpty(WLANMAC)) {
+            return WLANMAC;
+        }
+
+        if (Build.VERSION.SDK_INT >= 23) {
+            WLANMAC = getMac60();
+        } else {
+            WifiManager wm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+            WLANMAC = wm.getConnectionInfo().getMacAddress();
+            if (TextUtils.isEmpty(WLANMAC) || "02:00:00:00:00:00".equals(WLANMAC)) {
+                WLANMAC = getMac60();
+            }
+        }
+
+        //在Android6.0的版本以后用原来的getMacAddress()方法获取手机的MAC地址都为：02:00:00:00:00:00这个固定的值
+        if ("02:00:00:00:00:00".equals(WLANMAC)) {
+            WLANMAC = null;
+        }
+
+        if (!TextUtils.isEmpty(WLANMAC)) {
+            WLANMAC = WLANMAC.replaceAll(":", "");
+            savaString(mContext, LOACL_MAC, WLANMAC);
+        }
+        return WLANMAC;
+    }
+
+
+    private static String getMac60() {
+        String mac = getMac60_1();
+        if (TextUtils.isEmpty(mac) || "02:00:00:00:00:00".equals(mac)) {
+            mac = getMac60_2();
+        }
+        return mac;
+    }
+
+    private static String getMac60_1() {
+        String str = "";
+        String macSerial = "";
+        try {
+            Process pp = Runtime.getRuntime().exec(
+                    "cat /sys/class/net/wlan0/address ");
+            InputStreamReader ir = new InputStreamReader(pp.getInputStream());
+            LineNumberReader input = new LineNumberReader(ir);
+
+            for (; null != str; ) {
+                str = input.readLine();
+                if (str != null) {
+                    macSerial = str.trim();// 去空格
+                    break;
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        if (TextUtils.isEmpty(macSerial)) {
+            try {
+                return loadFileAsString("/sys/class/net/eth0/address")
+                        .toUpperCase().substring(0, 17);
+            } catch (Exception e) {
+                e.printStackTrace();
+
+            }
+
+        }
+
+        //转换成小写
+        if (!TextUtils.isEmpty(macSerial)) {
+            macSerial = macSerial.toLowerCase();
+        }
+        return macSerial;
+    }
+
+    private static String getMac60_2() {
+        try {
+            List<NetworkInterface> all = Collections.list(NetworkInterface.getNetworkInterfaces());
+            for (NetworkInterface nif : all) {
+                if (!nif.getName().equalsIgnoreCase("wlan0")) continue;
+
+                byte[] macBytes = nif.getHardwareAddress();
+                if (macBytes == null) {
+                    return "";
+                }
+
+                StringBuilder res1 = new StringBuilder();
+                for (byte b : macBytes) {
+                    res1.append(String.format("%02X:", b));
+                }
+
+                if (res1.length() > 0) {
+                    res1.deleteCharAt(res1.length() - 1);
+                }
+                String mac = res1.toString();
+                //转换成小写
+                if (!TextUtils.isEmpty(mac)) {
+                    mac = mac.toLowerCase();
+                }
+                return mac;
+            }
+        } catch (Exception ex) {
+        }
+        return null;
+    }
+
+    private static String loadFileAsString(String fileName) throws Exception {
+        FileReader reader = new FileReader(fileName);
+        String text = loadReaderAsString(reader);
+        reader.close();
+        return text;
+    }
+
+    private static String loadReaderAsString(Reader reader) throws Exception {
+        StringBuilder builder = new StringBuilder();
+        char[] buffer = new char[4096];
+        int readLength = reader.read(buffer);
+        while (readLength >= 0) {
+            builder.append(buffer, 0, readLength);
+            readLength = reader.read(buffer);
+        }
+        return builder.toString();
+    }
+
+
+    //通过取出ROM版本、制造商、CPU型号、以及其他硬件信息来实现
+    private static String getDiviceInfoIMEI(Context mContext) {
+        String device_imei = getSavaString(mContext, LOACL_DEVICE_IMEI, "");
+        if (!TextUtils.isEmpty(device_imei)) {
+            return device_imei;
+        }
+
+        device_imei = "35" + //we make this look like a valid IMEI
+                Build.BOARD.length() % 10 +
+                Build.BRAND.length() % 10 +
+                Build.CPU_ABI.length() % 10 +
+                Build.DEVICE.length() % 10 +
+                Build.DISPLAY.length() % 10 +
+                Build.HOST.length() % 10 +
+                Build.ID.length() % 10 +
+                Build.MANUFACTURER.length() % 10 +
+                Build.MODEL.length() % 10 +
+                Build.PRODUCT.length() % 10 +
+                Build.TAGS.length() % 10 +
+                Build.TYPE.length() % 10 +
+                Build.USER.length() % 10; //13 digits
+
+        if (!TextUtils.isEmpty(device_imei)) {
+            savaString(mContext, LOACL_DEVICE_IMEI, device_imei);
+        }
+        return device_imei;
+    }
+
+    private static String getimei(Context mContext) {
+        String imei = getSavaString(mContext, LOACL_IMEI, "");
+        if (!TextUtils.isEmpty(imei)) {
+            return imei;
+        }
+
+        try {
+            TelephonyManager tm = (TelephonyManager) mContext
+                    .getSystemService(Context.TELEPHONY_SERVICE);
+            if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                return null;
+            }
+            if(tm == null)
+                return null;
+            imei = tm.getDeviceId();
+            if (!TextUtils.isEmpty(imei)) {
+                savaString(mContext, LOACL_IMEI, imei);
+            }
+            return imei;
+        } catch (Exception e) {
+
+        }
+        return null;
+    }
+
+    private static String getSavaString(Context mContext, String key, String defValue) {
+        SharedPreferences sp = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+        return sp.getString(key, defValue);
+    }
+
+    private static void savaString(Context mContext, String key, String value) {
+        SharedPreferences sp = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+        sp.edit().putString(key, value).apply();//提交保存键值对
+
+    }
+
+
+}

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

@@ -26,6 +26,12 @@ public class DeviceUtil {
     public static String getDeviceId(Context context) {
         String deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
         if(TextUtils.isEmpty(deviceId)){
+            try {
+                deviceId = DeviceIDUtil.getDeviceId(context);
+            } catch (Exception ignore) {
+            }
+        }
+        if(TextUtils.isEmpty(deviceId)){
             deviceId = SpUtils.getDeviceIds(context);
             if(TextUtils.isEmpty(deviceId)){
                 deviceId = deviceUtil.getRandomId();

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

@@ -740,7 +740,8 @@ public class Jump2View {
         Intent intent = new Intent(context, ActNotice.class);
         intent.putExtra("title", title);
         intent.putExtra("content", content);
-        intent.putExtra("time", time);
+        if(time > 0)
+            intent.putExtra("time", time);
         context.startActivity(intent);
     }
 

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

@@ -18,47 +18,47 @@ public class UMConfigUtils {
     public static final String LOGIN_OPENID = "sheep_login_openid";
     //统计点击次数需要的子subtype
     public enum  Event{
-        GAME_DOWNLOAD                        ("GameDownload"),//游戏下载次数
-        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//广告点击次数
-        TAB_GAME                             ,//游戏页签
-        TAB_CATEGORY                         , //分类页签
-        TAB_SHEEP                            ,//小绵羊页签
-        TAB_JIEZHEWAN                        ,//借着玩页签
-        TAB_CREDITCARD                       ,//信用卡页签,(界面已经没有显示了)
-        SHEEP_TASK_TRY                       ,//试玩赚钱
-        SHEEP_TASK_INVITE                    ,//邀请赚钱
-        SHEEP_TASK_LIE                       ,//躺着赚钱
-        SHEEP_TIXIAN                         ,//提现
-        TASK_DETAIL                          ,//任务详情
-        TASK_DOWNLOAD                        ,//任务详情中->下载游戏
-        TASK_UPLOAD_PICTURE                  ,//任务详情中->上传截图
-        USER_ACCOUNT_SAFE                    ,//个人中心 -> 账号安全
-        USER_TASK_RECORD                     ,//个人中心 -> 任务记录
-        USER_TIXIAN_DETAIL                   ,//个人中心 -> 提现明细
-        USER_BIND_PHONE                      ,//账号安全 -> 绑定手机号（确定按钮）
-        USER_BIND_WEIXIN                     ,//账号安全 -> 绑定微信号（立即绑定按钮）
-        USER_AUTHENTICATION                  ,//账号安全 -> 实名认证（提交按钮）
-        USER_LOGOUT                          ,//账号安全 -> 退出登录按钮
-        GAME_SEARCH                          ,//搜索界面-> 搜索按钮
-        GAME_DOWNLOAD_MANAGER                ,//主界面右上角 -> 下载管理按钮
-        TASK_ACCEPT                          ,//接取任务
-        SHEEP_NEWBIE_TASK_LIST               ,//新手任务列表界面,(界面已经修改为对话框了)
-        SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP   ,//一分钟了解小绵羊界面
-        SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG  ,//注册小绵羊成功对话框
-        SHEEP_NEWBIE_TASK_LIST_DIALOG        ,//新手任务列表对话框
-        SHEEP_NEWBIE_TASK_ADD_QQ             ,//加入官方QQ群任务
-        SHEEP_CREDIT_CARD                    ,//信用卡任务列表界面
-        SHEEP_CREDIT_CARD_ACCEPT_LIST        ,//信用卡任务列表界面 -> 信用卡任务接受列表
-        SHEEP_CREDIT_CARD_PROGRESS_QUERY_LIST       ,//信用卡任务列表界面 ->信用卡任务进度查询列表
-        SHEEP_CREDIT_CARD_DETAIL                    ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面
-        SHEEP_CREDIT_CARD_DETAIL_WEB                ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 -> 申请信用卡web界面
-        SHEEP_CREDIT_CARD_PROGRESS_QUERY            ,//信用卡任务列表界面 ->信用卡任务进度查询列表 -> 信用卡任务进度查询
-        TASK_START_APP            ,//打开任务应用或游戏
-        TASK_INSTALL_APP            ,//安装应用
-        SHEEP_START            ,//启动小绵羊
-        SHEEP_RESUME            ,//小绵羊进入前台
-        SHEEP_PAUSE            ,//小绵羊进入后台
-        SHEEP_STOP            ,//退出小绵羊
+        GAME_DOWNLOAD                        ("GameDownload"),//游戏下载次数 5001
+        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//广告点击次数 5002
+        TAB_GAME                             ,//游戏页签 5003
+        TAB_CATEGORY                         , //分类页签 5004
+        TAB_SHEEP                            ,//小绵羊页签 5005
+        TAB_JIEZHEWAN                        ,//借着玩页签 5006
+        TAB_CREDITCARD                       ,//信用卡页签,(界面已经没有显示了) 5007
+        SHEEP_TASK_TRY                       ,//试玩赚钱 5008
+        SHEEP_TASK_INVITE                    ,//邀请赚钱 5009
+        SHEEP_TASK_LIE                       ,//躺着赚钱 5010
+        SHEEP_TIXIAN                         ,//提现 5011
+        TASK_DETAIL                          ,//任务详情 5012
+        TASK_DOWNLOAD                        ,//任务详情中->下载游戏 5013
+        TASK_UPLOAD_PICTURE                  ,//任务详情中->上传截图 5014
+        USER_ACCOUNT_SAFE                    ,//个人中心 -> 账号安全 5015
+        USER_TASK_RECORD                     ,//个人中心 -> 任务记录 5016
+        USER_TIXIAN_DETAIL                   ,//个人中心 -> 提现明细 5017
+        USER_BIND_PHONE                      ,//账号安全 -> 绑定手机号（确定按钮）5018
+        USER_BIND_WEIXIN                     ,//账号安全 -> 绑定微信号（立即绑定按钮） 5019
+        USER_AUTHENTICATION                  ,//账号安全 -> 实名认证（提交按钮）5020
+        USER_LOGOUT                          ,//账号安全 -> 退出登录按钮 5021
+        GAME_SEARCH                          ,//搜索界面-> 搜索按钮 5022
+        GAME_DOWNLOAD_MANAGER                ,//主界面右上角 -> 下载管理按钮 5023
+        TASK_ACCEPT                          ,//接取任务 5024
+        SHEEP_NEWBIE_TASK_LIST               ,//新手任务列表界面,(界面已经修改为对话框了) 5025
+        SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP   ,//一分钟了解小绵羊界面 5026
+        SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG  ,//注册小绵羊成功对话框 5027
+        SHEEP_NEWBIE_TASK_LIST_DIALOG        ,//新手任务列表对话框 5028
+        SHEEP_NEWBIE_TASK_ADD_QQ             ,//加入官方QQ群任务 5029
+        SHEEP_CREDIT_CARD                    ,//信用卡任务列表界面 5030
+        SHEEP_CREDIT_CARD_ACCEPT_LIST        ,//信用卡任务列表界面 -> 信用卡任务接受列表 5031
+        SHEEP_CREDIT_CARD_PROGRESS_QUERY_LIST       ,//信用卡任务列表界面 ->信用卡任务进度查询列表 5032
+        SHEEP_CREDIT_CARD_DETAIL                    ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 5033
+        SHEEP_CREDIT_CARD_DETAIL_WEB                ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 -> 申请信用卡web界面 5034
+        SHEEP_CREDIT_CARD_PROGRESS_QUERY            ,//信用卡任务列表界面 ->信用卡任务进度查询列表 -> 信用卡任务进度查询 5035
+        TASK_START_APP            ,//打开任务应用或游戏 5036
+        TASK_INSTALL_APP            ,//安装应用 5037
+        SHEEP_START            ,//启动小绵羊 5038
+        SHEEP_RESUME            ,//小绵羊进入前台 5039
+        SHEEP_PAUSE            ,//小绵羊进入后台 5040
+        SHEEP_STOP            ,//退出小绵羊 5041
         ;
         private String key;
         Event(String key){
@@ -119,6 +119,7 @@ public class UMConfigUtils {
      * @param event
      */
     public static void onEvent(Event event){
+        LogUtil.println("SheepApp onEvent "+event.getId()+" "+event.getKey());
         try{
             MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
 

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

@@ -200,4 +200,8 @@ public class ViewUtil {
                 new StringBuilder("<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" /><style>img{max-width:100% !important;height:auto !important;}</style><style>body{max-width:100% !important;}</style></head><body>").append(content).append("</body></html>").toString()
                 , "text/html", "utf-8", null);
     }
+
+    public static boolean isH5Content(String content) {
+        return content.trim().startsWith("<html>") || content.trim().startsWith("<!DOCTYPE html>");
+    }
 }

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

@@ -65,14 +65,21 @@ public class ActNotice extends BaseActivity {
         String title = getIntent().getStringExtra("title");
         String content = getIntent().getStringExtra("content");
         String time = TimeUtil.TimeStamp2Date(getIntent().getLongExtra("time", System.currentTimeMillis()), "yyyy/MM/dd   HH:mm");
+
+        String noticeTitle = title;
+        if(title.contains(";")){
+            String[] items = title.split(";");
+            title = items[0];
+            noticeTitle = items[1];
+        }
         TitleBarUtils.getInstance()
                 .setTitle(this, title)
                 .setTitleFinish(this);
 
-        act_notice_title_tv.setText(title);
+        act_notice_title_tv.setText(noticeTitle);
         act_notice_time_tv.setText(time);
 
-        if(content.startsWith("<html>")){
+        if(ViewUtil.isH5Content(content)){
             act_notice_content_wb.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
         } else if(content.startsWith("<p>")){
             ViewUtil.loadDataWithBaseURL(act_notice_content_wb, content);

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.RequiresApi;
+import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.WebChromeClient;
@@ -304,6 +305,20 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     llInfos.addView(getStep("完成任务", "已完成", 0));
                     bottom_btn_layout.setVisibility(View.GONE);
                     return;
+                case 8://任务已经下线
+                    if(TextUtils.isEmpty(taskAcceptedEty.getScreenshots()) || taskAcceptedEty.getLower_num() > 0){//没有提交过截图或者已经提交过一次 下线失败后提交
+                        break;
+                    } else {//提交过一次，但是审核失败或者没有审核就下线了
+                        String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
+                        btnUpImag.setText(Html.fromHtml(sr));
+                        btnUpImag.setVisibility(View.VISIBLE);
+                        btnTaskItem.setVisibility(View.GONE);
+                        llInfos.removeAllViews();
+                        llInfos.addView(getStep("领取任务", "已完成", 0));
+                        llInfos.addView(getStep("APP下载", "已完成", 0));
+                        llInfos.addView(getStep("完成任务", "审核失败", 1));
+                        return;
+                    }
             }
             bottom_btn_layout.setVisibility(View.GONE);
             ((View)llInfos.getParent()).setVisibility(View.GONE);

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

@@ -188,7 +188,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 CommonUtil.getInstance()
                         .setHashMap(1,
                                 100,
-                                1,
+                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
                                 0,
                                 0,
                                 type==2 ? 1 : type,