删除友盟统计；修复各种bug

app/build.gradle

@@ -211,7 +211,7 @@ dependencies {
     compile 'com.flipboard:bottomsheet-core:1.5.3'
     compile 'com.flipboard:bottomsheet-commons:1.5.3'
     compile 'com.google.protobuf:protobuf-java:3.2.0'
-    compile 'com.umeng.analytics:analytics:6.0.9'
+//    compile 'com.umeng.analytics:analytics:6.0.9'
 
     //    compile(name: 'FileDownloader-1.0.0', ext: 'aar')
 

app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -27,27 +27,25 @@ import com.kfzs.android.view.tag.FlowLayout;
 import com.kfzs.android.view.tag.TagAdapter;
 import com.kfzs.android.view.tag.TagFlowLayout;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.kfzs.duanduan.adp.AdpSearchGame;
+import com.kfzs.duanduan.adp.AdpSearchRecord;
+import com.kfzs.duanduan.adp.AdpSearchViewPager;
 import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.datashare.KFZSDDContentSession;
 import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.kfzs.duanduan.proto.HotWordsOuterClass;
 import com.kfzs.duanduan.proto.MistinessNamesOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
+import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.adp.AdpSearchGame;
-import com.kfzs.duanduan.adp.AdpSearchRecord;
-import com.kfzs.duanduan.adp.AdpSearchViewPager;
+import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -433,7 +431,7 @@ public class ActSearch extends BaseCompatActivity {
                     }
                 }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
         KFZSNetwork.addRequest(bannerRequest);
-        MobclickAgent.onEvent(SheepApp.mContext, UMConfigUtils.Event.GAME_SEARCH.getKey());
+        UMConfigUtils.Event.GAME_SEARCH.onEvent();
     }
 
     /**

app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -20,12 +20,11 @@ import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.kfzs.duanduan.data.graph.provider.current.Current;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.utils.net.OnURLParseByJS;
 import com.kfzs.duanduan.utils.ShareUtils;
+import com.kfzs.duanduan.utils.net.OnURLParseByJS;
 import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
-import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.UMShareAPI;
 
 import java.util.HashMap;
@@ -188,7 +187,7 @@ public class ActWeb extends BaseCompatActivity {
     private void setUmengOnEvent(String extInfo) {
         Map<String, String> map = new HashMap<>();
         map.put("gameUnique", extInfo);
-        MobclickAgent.onEvent(ActWeb.this, UMConfigUtils.Event.GAME_DOWNLOAD.getKey(), map);
+        UMConfigUtils.Event.GAME_DOWNLOAD.onEvent(map);
     }
 
 

app/src/main/java/com/kfzs/duanduan/BaseCompatActivity.java

@@ -11,8 +11,6 @@ import android.view.View;
 
 import com.kf.utils.ToastBuilder;
 import com.kfzs.android.view.CompatActivity;
-import com.sheep.gamegroup.util.ActivityManager;
-import com.umeng.analytics.MobclickAgent;
 
 import java.util.List;
 

app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -59,7 +59,6 @@ public class KFZSApp extends MultiDexApplication {
     public static String path_download;
     public static String path_Log;
     public static ActMain actMain;
-    public String GameCode = null;
 
 
     public static final int MAX_DOWNLOAD_TASK_SIZE = 5;
@@ -71,47 +70,17 @@ public class KFZSApp extends MultiDexApplication {
         TAG = this.getPackageName();
         mRealDownloadUrl = new HashMap<>();
         setOnlyContext(this);
-        initUtils(DEBUG);
+        initUtils();
         initOwnCatchPath();
         startService(new Intent(this, DownloadService.class));
     }
 
-    private void initUtils(boolean debug) {
+    private void initUtils() {
         KFZSNetwork.init(application);
         DisplayMetrics metric = getResources().getDisplayMetrics();
         G.DENSITY = metric.density;
         G.HEIGHT = metric.heightPixels;
         G.WIDTH = metric.widthPixels;
-
-        DataSave dataSave = DataSave.getInstance();
-        String umengKey = dataSave.getUmengKey();
-        String channelName = dataSave.getChannelName();
-//        Log.w("DDINIT", "API_VERSION: " + UrlBll.API_VERSION + " |CAPTCHA: " + UrlBll.CAPTCHA_DOMAIN);
-//        Log.w("DDINIT", "GRAPH" + BuildConfig.DUANDUAN_GRAPH + " |GRAPH" + BuildConfig.DUANDUAN_GRAPH);
-//        Log.w("DDINIT", "umengKey: " + umengKey + " |channelName: " + channelName + " |debug: " + debug);
-//        Log.w("DDINIT", "wxAppId: " + BuildConfig.WX_APPID + " |wxAppSecret: " + BuildConfig.WX_APPSECRET + " |debug: " + debug);
-//        Log.w("DDINIT", "wbAppId: " + BuildConfig.WB_APPID + " |wbAppSecret: " + BuildConfig.WB_APPSECRET + " |debug: " + debug);
-        //先注释掉，报错了
-//        MobclickAgent.UMAnalyticsConfig umAnalyticsConfig = new MobclickAgent.UMAnalyticsConfig(application, umengKey, channelName);
-//        MobclickAgent.startWithConfigure(umAnalyticsConfig);
-//        MobclickAgent.setDebugMode(debug);
-        //Log.e("JPushRegzid", JPushInterface.getRegistrationID(this));
-//        MobclickAgent.setCatchUncaughtExceptions(!debug);
-//        MobclickAgent.enableEncrypt(true);
-
-//        //um Share
-//        Config.DEBUG = true;
-//        QueuedWork.isUseThreadPool = false;
-//        UMShareAPI.get(this);
-//        //end
-//        initShareSDK();
-//    }
-//
-//    //各个平台的配置，建议放在全局Application或者程序入口
-//    private void initShareSDK() {
-//        PlatformConfig.setWeixin(BuildConfig.WX_APPID, BuildConfig.WX_APPSECRET);
-//        PlatformConfig.setSinaWeibo(BuildConfig.WB_APPID, BuildConfig.WB_APPSECRET, "http://sns.whalecloud.com");
-//        PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
     }
 
     /**

app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java

@@ -18,9 +18,6 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CateGameBean;
 import com.kfzs.duanduan.bean.GuessYouLike;
 import com.kfzs.duanduan.bean.KFIntentKeys;
@@ -37,7 +34,9 @@ import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.kfzs.duanduan.view.ImageGlarry;
 import com.kfzs.duanduan.view.KFProgressButton;
-import com.umeng.analytics.MobclickAgent;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -531,7 +530,7 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
                 Map<String, String> map = new HashMap<>();
                 map.put("BANNER_TYPE", clickedGameObj.getType() == KFIntentKeys.BANNER_TYPE_GAME ? "游戏Banner" : "广告Banner");
                 //TODO 小刁，这些事件分析以后要专门弄个静态类来统一管理
-                MobclickAgent.onEvent(mContext, UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL.getKey(), map);
+                UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL.onEvent(map);
                 switch (clickedGameObj.getType()) {
                     case KFIntentKeys.BANNER_TYPE_GAME:
                         SkipUtils.getInstance().goGameDetails(mContext, clickedGameObj.getGameId());

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

@@ -20,6 +20,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -45,6 +46,7 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
     private ArrayAdapter<ILog> adapter;
     @Override
     public void onViewCreated() {
+        ButterKnife.bind(this, mView);
         if(getActivity() != null) {
             swipe_container.setFooterView(getActivity(), list_view, R.layout.listview_footer);
             adapter = new ArrayAdapter<ILog>(getActivity(), R.layout.x_my_money_act_layout_item, list){

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

@@ -42,6 +42,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
     private CreditCardProgressQueryAdp adapter;
     @Override
     public void onViewCreated() {
+        ButterKnife.bind(this, mView);
         swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
         adapter = new CreditCardProgressQueryAdp(getActivity(), list);
         credit_card_task_list.setAdapter(adapter);

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

@@ -15,11 +15,13 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -43,13 +45,18 @@ public class FgtCreditCardTaskList extends BaseFragment {
     private CreditCardTaskAdp adapter;
     @Override
     public void onViewCreated() {
+        ButterKnife.bind(this, mView);
         swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
         adapter = new CreditCardTaskAdp(getActivity(), list);
         credit_card_task_list.setAdapter(adapter);
         credit_card_task_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                onItemClickTask(list.get(i));
+                try {
+                    onItemClickTask(list.get(i));
+                } catch (Exception ignore) {
+                    G.showToast(R.string.service_error);
+                }
             }
         });
         swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {

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

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -41,6 +42,7 @@ public class FgtFriendExtractPage extends BaseFragment {
     private List<Friend> list = new ArrayList<>();
     @Override
     public void onViewCreated() {
+        ButterKnife.bind(this, mView);
         initData();
     }
 

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

@@ -909,6 +909,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         showToast("打卡赚钱");
                         Jump2View.getInstance().goSignCardAct(activity, balance);
                         break;
+                    default:
+                        G.showToast(R.string.coming_soon);
+                        break;
                 }
             }
         });

app/src/main/java/com/kfzs/duanduan/services/CrashHandler.java

@@ -1,210 +0,0 @@
-package com.kfzs.duanduan.services;
-
-import android.content.Context;
-import android.os.Environment;
-import android.os.Looper;
-import android.util.Log;
-import android.view.Gravity;
-import android.widget.Toast;
-
-import com.kfzs.duanduan.KFZSApp;
-import com.umeng.analytics.MobclickAgent;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.Thread.UncaughtExceptionHandler;
-
-public class CrashHandler implements UncaughtExceptionHandler {
-
-    /**
-     * Debug Log tag
-     */
-    public static final String TAG = "CrashHandler";
-
-    public static final boolean DEBUG = false;
-    /**
-     * 系统默认的UncaughtException处理类
-     */
-    private UncaughtExceptionHandler mDefaultHandler;
-    /**
-     * CrashHandler实例
-     */
-    private static CrashHandler INSTANCE;
-    /**
-     * 程序的Context对象
-     */
-    private Context mContext;
-
-    /** 保证只有一个CrashHandler实例 */
-//	private CrashHandler() {
-//	}
-
-
-    /**
-     * @return
-     */
-    public static CrashHandler getInstance(Context ctx) {
-        if (INSTANCE == null) {
-            INSTANCE = new CrashHandler(ctx);
-        }
-        return INSTANCE;
-    }
-
-
-    private CrashHandler(Context ctx) {
-        super();
-        this.mContext = ctx;
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
-        Thread.setDefaultUncaughtExceptionHandler(this);
-    }
-
-
-    /**
-     * 初始化,注册Context对象, 获取系统默认的UncaughtException处理器, 设置该CrashHandler为程序的默认处理器
-     *
-     */
-    public void init() {
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
-        Thread.setDefaultUncaughtExceptionHandler(this);
-    }
-
-    /**
-     * 当UncaughtException发生时会转入该函数来处理
-     */
-    @Override
-    public void uncaughtException(Thread thread, Throwable ex) {
-        Log.e(TAG, ex.getMessage(), ex);
-        if (!handleException(ex) && mDefaultHandler != null) {
-            // 如果用户没有处理则让系统默认的异常处理器来处理
-            mDefaultHandler.uncaughtException(thread, ex);
-        } else {
-            // Sleep一会后结束程序
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                Log.e(TAG, "Error : ", e);
-            }
-//			android.os.Process.killProcess(android.os.Process.myPid());
-//			System.exit(10);
-        }
-    }
-
-    /**
-     * 自定义错误处理,收集错误信息 发送错误报告等操作均在此完成. 开发者可以根据自己的情况来自定义异常处理逻辑
-     *
-     * @param ex
-     * @return true:如果处理了该异常信息;否则返回false
-     */
-    private boolean handleException(Throwable ex) {
-        if (ex == null) {
-            Log.w(TAG, "handleException --- ex==null");
-            return true;
-        }
-        final String msg = ex.getLocalizedMessage();
-        if (msg == null) {
-            return false;
-        }
-        // 使用Toast来显示异常信息
-        new Thread() {
-            @Override
-            public void run() {
-                Looper.prepare();
-                String errorMsg = "程序出错，即将退出:\r\n" + msg;
-                if (!KFZSApp.DEBUG) {
-                    MobclickAgent.reportError(mContext, errorMsg);
-                }
-                Toast toast = Toast.makeText(mContext, errorMsg, Toast.LENGTH_LONG);
-                toast.setGravity(Gravity.CENTER, 0, 0);
-                toast.show();
-                Looper.loop();
-            }
-        }.start();
-        // 保存错误报告文件
-        saveCrashInfoToFile(ex);
-        // 发送错误报告到服务器
-        sendCrashReportsToServer(mContext);
-        return true;
-    }
-
-    /**
-     * 在程序启动时候, 可以调用该函数来发送以前没有发送的报告
-     */
-    public void sendPreviousReportsToServer() {
-        sendCrashReportsToServer(mContext);
-    }
-
-    /**
-     * 把错误报告发送给服务器,包含新产生的和以前没发送的.
-     *
-     * @param ctx
-     */
-    private void sendCrashReportsToServer(Context ctx) {
-//		String msg = SharedPreferencesHelper.getValue(ctx, C.CONFIG_FILENAME,  Context.MODE_PRIVATE, "exmsg");
-//		if(msg ==null || "".equals(msg)){
-//
-//		}else{
-//
-//		}
-    }
-
-
-    /**
-     * 错误信息通过SharedPreferencesHelper保存到文件中
-     *
-     * @param ex
-     * @return
-     */
-    private String saveCrashInfoToFile(Throwable ex) {
-        Writer info = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(info);
-        ex.printStackTrace(printWriter);
-        Throwable cause = ex.getCause();
-        while (cause != null) {
-            cause.printStackTrace(printWriter);
-            cause = cause.getCause();
-        }
-        String re = info.toString();
-        printWriter.close();
-
-        long timestamp = System.currentTimeMillis();
-        String time = String.valueOf(timestamp).substring(0, String.valueOf(timestamp).length() - 3);
-        String result = "[" + re + "#" + time + "]";
-        String fileDir = getCacheFileDir();
-        String fileName = "Crash_" +time +".log";
-        String filePath = fileDir +"/" + fileName;
-        Log.d(TAG , filePath);
-        File file = new File(filePath);
-        try {
-            file.createNewFile();
-            RandomAccessFile raf = new RandomAccessFile(file, "rwd");
-            raf.seek(file.length());
-            raf.write(result.getBytes());
-            raf.close();
-        } catch (Exception e) {
-
-            e.printStackTrace();
-        }
-
-
-        return null;
-    }
-
-
-    private String getCacheFileDir(){
-        String cachePath = "";
-        if (Environment.MEDIA_MOUNTED.equals(Environment
-                .getExternalStorageState())
-                || !Environment.isExternalStorageRemovable()) {
-            cachePath = mContext.getExternalCacheDir().getPath();
-        } else {
-            cachePath = mContext.getCacheDir().getPath();
-        }
-
-        return cachePath;
-    }
-
-
-}

app/src/main/java/com/kfzs/duanduan/utils/GameStatusScanner.java

@@ -6,28 +6,27 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CompareResult;
 import com.kfzs.duanduan.bean.DownloadStatus;
 import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.datashare.KFZSDDContentSession;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.db.DataSave;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.proto.ApiRequestOuterClass;
 import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.proto.UserPlayedGameOuterClass;
+import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
+import com.kfzs.duanduan.view.KFProgressButton;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.umeng.analytics.MobclickAgent;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -386,7 +385,7 @@ public abstract class GameStatusScanner {
     public static void setUmengOnEvent(Context mContext,String extInfo) {
         Map<String, String> map = new HashMap<>();
         map.put("gameUnique", extInfo);
-        MobclickAgent.onEvent(mContext, UMConfigUtils.Event.GAME_DOWNLOAD.getKey(), map);
+        UMConfigUtils.Event.GAME_DOWNLOAD.onEvent(map);
     }
 
     public static DownLoadInfo addNewDownloadTask(final DownloadTaskService downloadTaskService, String gameName, String downloadUrl,

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -7,18 +7,6 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
-import com.sheep.gamegroup.util.ActivityManager;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.umeng.analytics.MobclickAgent;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-
-import java.util.Map;
-
 import butterknife.ButterKnife;
 
 /**

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

@@ -121,7 +121,7 @@ public interface ApiService {
     /**
      * 获取自己正在运行的任务
      */
-    @GET("app/accepted_task/run_task/")
+    @GET("app/accepted_task/new_run_task/")
     Observable<BaseMessage> returnTask(@Query("is_succession") int is_succession);
     /**
      * 自动提交时长任务

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

@@ -52,7 +52,6 @@ public class AppStatistics {
         if(!TextUtils.isEmpty(openid)){
             uid = Integer.parseInt(openid);
         }
-        String deviceId = DeviceUtil.getDeviceId(SheepApp.mContext);
         ApiService apiService =SheepApp.getInstance().getNetComponent().getApiService();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("uid",uid);

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
@@ -371,7 +372,7 @@ public class CommonUtil {
                 Jump2View.getInstance().goWeb(context, entity.getUrl());
                 break;
             default:
-
+                G.showToast(R.string.coming_soon);
                 break;
 
         }

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

@@ -102,4 +102,7 @@ public enum ConnectAddress {
     public int getPlatForm() {
         return getName().endsWith("IOS") ? 0 : 1;//0 ios, 1 android
     }
+    public boolean isUseUMStatistics(){//只有正式服不使用友盟统计
+        return !getName().equals("sheep");
+    }
 }

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

@@ -3,10 +3,13 @@ package com.sheep.gamegroup.util;
 
 import android.content.Context;
 
+import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.statistics.AppStatistics;
 import com.sheep.gamegroup.statistics.AppStatisticsConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.umeng.analytics.MobclickAgent;
+//import com.umeng.analytics.MobclickAgent;
+
+import java.util.Map;
 
 /**
  * Created by zhanghai on 2018/3/30.
@@ -81,6 +84,9 @@ public class UMConfigUtils {
         public void onEvent(){
             UMConfigUtils.onEvent(this);
         }
+        public void onEvent(Map<String, String> map){
+            UMConfigUtils.onEvent(this, map);
+        }
     }
 
     public static class Source{
@@ -97,7 +103,8 @@ public class UMConfigUtils {
         String source = PreferenceUtils.getPrefString(SheepApp.mContext,LOGIN_TYPE,Source.SHEEP);
         String openid = PreferenceUtils.getPrefString(SheepApp.mContext,LOGIN_OPENID,"");
 
-        MobclickAgent.onProfileSignIn(source,openid);
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onProfileSignIn(source,openid);
 
         //自己的统计信息
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signIn,"");
@@ -107,7 +114,8 @@ public class UMConfigUtils {
      * 登出
      */
     public static void onProfileSignOff(){
-        MobclickAgent.onProfileSignOff();
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onProfileSignOff();
 
         //自己的统计退出
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signOff,"");
@@ -121,13 +129,28 @@ public class UMConfigUtils {
     public static void onEvent(Event event){
         LogUtil.println("SheepApp onEvent "+event.getId()+" "+event.getKey());
         try{
-            MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
+//            if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//                MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
 
             AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(),"");
         }catch (Exception e){
             e.printStackTrace();
         }
+    }
+    /**
+     * Umeng事件统计
+     * @param event
+     */
+    public static void onEvent(Event event, Map<String, String> map){
+        LogUtil.println("SheepApp onEvent "+event.getId()+" "+event.getKey());
+        try{
+//            if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//                MobclickAgent.onEvent(SheepApp.mContext,event.getKey(), map);
 
+            AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(), JSON.toJSONString(map));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
 
@@ -136,7 +159,8 @@ public class UMConfigUtils {
      * @param context
      */
     public static void onPageStart(Context context){
-        MobclickAgent.onResume(context);
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onResume(context);
 
         String tag = context.getClass().getCanonicalName();
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
@@ -147,7 +171,8 @@ public class UMConfigUtils {
      * @param tag
      */
     public static void onPageStart(String tag){
-        MobclickAgent.onPageStart(tag);
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onPageStart(tag);
 
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
     }
@@ -157,7 +182,8 @@ public class UMConfigUtils {
      * @param context
      */
     public static void onPageEnd(Context context){
-        MobclickAgent.onPause(context);
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onPause(context);
 
         String tag = context.getClass().getCanonicalName();
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
@@ -168,7 +194,8 @@ public class UMConfigUtils {
      * @param tag
      */
     public static void onPageEnd(String tag){
-        MobclickAgent.onPageEnd(tag);
+//        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
+//            MobclickAgent.onPageEnd(tag);
 
         AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
     }

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

@@ -184,6 +184,11 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         if (BuildConfig.DEBUG)
                             System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
+                        if(taskReleaseEty == null){
+                            baseMessage.setMsg("暂无数据");
+                            onError(baseMessage);
+                            return;
+                        }
                         taskEty = taskReleaseEty.getTask();
                         initData();
                         taskSchedule();

app/src/main/java/com/sheep/gamegroup/view/adapter/CreditCardProgressQueryAdp.java

@@ -67,29 +67,33 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
 
         final CreditCardProgressQuery creditCardProgressQuery = (CreditCardProgressQuery) getItem(position);
         final TaskReleaseEty ety = creditCardProgressQuery.getRelease_task();
-        Glide.with(context).load(ety.getTask().getIcon())
-                .into(holder.credit_card_task_iv);
-        holder.credit_card_task_name_tv.setText(ety.getName());
-        String[] remarks = ety.getTask().getRemarks().split(";");
-        holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
-        holder.credit_card_task_tip2_tv.setText("¥"+ety.getBonus());
-        holder.credit_card_task_find_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Jump2View.getInstance().goWeb(context, EntityUtils.getExtInfo(ety.getTask().getExt()).getQuery_url(), "进度查询");
-            }
-        });
-        holder.credit_card_task_upload_tv.setEnabled(BtStatusUtil.getEnabled(creditCardProgressQuery.getStatus()));
-        holder.credit_card_task_upload_tv.setText(BtStatusUtil.getUploadText(creditCardProgressQuery));
-        holder.credit_card_task_upload_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if(context instanceof ActCreditCardTaskList){
-                    ((ActCreditCardTaskList) context).setCreditCardProgressQuery(creditCardProgressQuery);
-                    ((ActCreditCardTaskList) context).showChooseDialog(false, true, AbsChooseImageActivity.DEFAULT_MAX_COUNT);
+        try {
+            Glide.with(context).load(ety.getTask().getIcon())
+                    .into(holder.credit_card_task_iv);
+            holder.credit_card_task_name_tv.setText(ety.getName());
+            String[] remarks = ety.getTask().getRemarks().split(";");
+            holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
+            holder.credit_card_task_tip2_tv.setText("¥"+ety.getBonus());
+            holder.credit_card_task_find_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Jump2View.getInstance().goWeb(context, EntityUtils.getExtInfo(ety.getTask().getExt()).getQuery_url(), "进度查询");
                 }
-            }
-        });
+            });
+            holder.credit_card_task_upload_tv.setEnabled(BtStatusUtil.getEnabled(creditCardProgressQuery.getStatus()));
+            holder.credit_card_task_upload_tv.setText(BtStatusUtil.getUploadText(creditCardProgressQuery));
+            holder.credit_card_task_upload_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if(context instanceof ActCreditCardTaskList){
+                        ((ActCreditCardTaskList) context).setCreditCardProgressQuery(creditCardProgressQuery);
+                        ((ActCreditCardTaskList) context).showChooseDialog(false, true, AbsChooseImageActivity.DEFAULT_MAX_COUNT);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return convertView;
     }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/CreditCardTaskAdp.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -59,13 +60,22 @@ public class CreditCardTaskAdp extends BaseAdapter {
         }
 
         final TaskReleaseEty ety = (TaskReleaseEty) getItem(position);
-        Glide.with(context).load(ety.getTask().getIcon())
-                .into(holder.credit_card_task_iv);
-        holder.credit_card_task_tv.setText("+"+ety.getBonus()+"元");
-        holder.credit_card_task_name_tv.setText(ety.getName());
-        String[] remarks = ety.getTask().getRemarks().split(";");
-        holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
-        holder.credit_card_task_tip2_tv.setText(remarks.length > 1 ? remarks[1] : "");
+        if(ety != null) {
+            holder.credit_card_task_tv.setText("+");
+            holder.credit_card_task_tv.append(ety.getBonus());
+            holder.credit_card_task_tv.append("元");
+            holder.credit_card_task_name_tv.setText(ety.getName());
+            String[] remarks = new String[0];
+            if(ety.getTask() != null) {
+                if(!TextUtils.isEmpty(ety.getTask().getIcon()))
+                    Glide.with(context).load(ety.getTask().getIcon()).into(holder.credit_card_task_iv);
+                if(!TextUtils.isEmpty(ety.getTask().getRemarks())) {
+                    remarks = ety.getTask().getRemarks().split(";");
+                }
+            }
+            holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
+            holder.credit_card_task_tip2_tv.setText(remarks.length > 1 ? remarks[1] : "");
+        }
         return convertView;
     }
 

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

@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
@@ -40,6 +41,8 @@ import java.util.List;
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * 试玩赚钱
@@ -53,6 +56,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     SwipeRefreshLayout refresh;
     @BindView(R.id.empty_view)
     View empty_view;
+    Unbinder unbinder;
 
     @Inject
     TryMakeMoneyPresenter presenter;
@@ -88,6 +92,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
         Bundle bundle = getArguments();
         if(bundle != null){
             type = bundle.getInt("type", 0);
@@ -107,7 +112,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
 
 
-//    @Override
+    //    @Override
 //    protected void initView(Bundle savedInstanceState) {
 //
 //        setContentView(R.layout.fgt_try_makemoney_layout);
@@ -194,6 +199,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        unbinder.unbind();
+
         EventBus.getDefault().unregister(this);
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -9,9 +9,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  BaseFragment</p>
@@ -79,7 +76,6 @@ public abstract class BaseFragment extends Fragment {
 
 
 
-    Unbinder unbinder;
     /**
      * 注意用 mIsFirstInit 判断，防止重复加载
      *
@@ -93,7 +89,6 @@ public abstract class BaseFragment extends Fragment {
         if (mView == null) {
             mIsFirstInit = true;
             mView = inflater.inflate(getLayoutId(), null);
-            unbinder = ButterKnife.bind(this, mView);
         } else {
             mIsFirstInit = false;
         }
@@ -116,12 +111,6 @@ public abstract class BaseFragment extends Fragment {
         onViewCreated();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     /**
      * 万能的找View类
      *

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

@@ -40,7 +40,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="7dp"
                         android:paddingLeft="@dimen/content_padding_big"
-                        android:text="充值金额" />
+                        android:text="充值金额（不可提现）" />
 
 
 

app/src/main/res/values/strings.xml

@@ -12,6 +12,7 @@
     <string name="no_bind_wx_notice_text">未绑定微信号，无法入账到你的微信零钱</string>
     <string name="no_bind_tel_notice_text">我们已将你的手机号与该帐号绑定，如有变更，请点击</string>
     <string name="coming_soon">敬请期待</string>
+    <string name="service_error">服务器错误，请稍候再试</string>
     <string name="error_download_link">下载地址错误，请联系客服</string>
     <string name="last_page">&#060;</string>
     <string name="next_page">&#062;</string>