删除mdl.sinlov.android:log与极光

app/build.gradle

@@ -71,10 +71,8 @@ android {
             manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimitest",
                                     DUANDUAN_GRAPH        : "bandaimitest",
                                     DUANDUAN_DATASHARE    : "bandaimitest",
-                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2",
-                                    JPUSH_PKGNAME : applicationId,
-                                    JPUSH_APPKEY : "b8b5adf7d70d0c904d46d04c",
-                                    JPUSH_CHANNEL : "developer-default"]
+                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2"
+            ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimitest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimitest"'
             buildConfigField "boolean", "KF_DEBUG", 'true'
@@ -93,10 +91,8 @@ android {
             manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimi",
                                     DUANDUAN_GRAPH        : "bandaimi",
                                     DUANDUAN_DATASHARE    : "bandaimi",
-                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2",
-                                    JPUSH_PKGNAME : applicationId,
-                                    JPUSH_APPKEY : "b8b5adf7d70d0c904d46d04c",
-                                    JPUSH_CHANNEL : "developer-default"]
+                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2"
+            ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimi"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimi"'
             buildConfigField "boolean", "KF_DEBUG", 'false'
@@ -185,18 +181,11 @@ dependencies {
     compile project(':view')
 //    compile(name: 'view-release', ext: 'aar')
 
-    //极光推送两个
-    compile 'cn.jiguang.sdk:jpush:3.0.8'
-    // 此处以JPush 3.0.3 版本为例。
-    compile 'cn.jiguang.sdk:jcore:1.1.6'
-    // 此处以JCore 1.1.1 版本为例。
-
     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(name: 'FileDownloader-1.0.0', ext: 'aar')
-    compile 'com.yalantis:ucrop:2.2.0'
     //    compile files('libs/SocialSDK_QQ_Simplify.jar')
 
 //    compile files('libs/SocialSDK_Sina_Simplify.jar')
@@ -219,7 +208,6 @@ dependencies {
     compile files('libs/SocialSDK_QQ_Full.jar')
 
     compile 'com.zhy:okhttputils:2.6.2'
-    compile 'mdl.sinlov.android:log:0.0.2'
     //    compile 'com.kf.framework:kf-utils:latest.integration@aar'
     compile 'com.kf.framework:kf-utils:1.4.5@aar'
     //    compile 'com.kf.framework:volleyplus:latest.integration@aar'

app/src/main/AndroidManifest.xml

@@ -245,9 +245,6 @@
         </activity>
 
         <activity
-            android:name="com.kfzs.duanduan.ActSimple"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.kfzs.duanduan.ActSearch"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing" />
@@ -261,12 +258,6 @@
             android:name="com.kfzs.duanduan.ActPicturesEnlarge"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.kfzs.duanduan.ActGift"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.kfzs.duanduan.ActFeedback"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.kfzs.duanduan.ActGategoryRank"
             android:screenOrientation="portrait" />
         <activity
@@ -290,27 +281,6 @@
         <service
             android:name="com.kfzs.duanduan.services.KFDownloadServices"
             android:exported="false" />
-        <activity
-            android:name="com.kfzs.duanduan.ActGameCertification"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
-        <activity
-            android:name="com.kfzs.duanduan.view.GameCertificationActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
-
-        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-
 
         <provider
             android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider"

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

@@ -65,12 +65,10 @@ import org.json.JSONObject;
 import org.wlf.filedownloader.FileDownloader;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import mdl.sinlov.android.log.ALog;
 import okhttp3.Call;
 
 

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

@@ -50,7 +50,6 @@ 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.fragment.KFDialogFragment;
 import com.sheep.jiuyan.samllsheep.R;
 
 import org.greenrobot.eventbus.EventBus;
@@ -64,8 +63,6 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import cn.jpush.android.api.JPushInterface;
-import mdl.sinlov.android.log.ALog;
 
 
 public class ActSearch extends BaseCompatActivity {
@@ -230,40 +227,6 @@ public class ActSearch extends BaseCompatActivity {
     }
 
     /**
-     * 调试专用的一些数据信息展示
-     */
-    private void testShowTips() {
-        final StringBuilder tips = new StringBuilder();
-        tips.append("极光ID：")
-                .append(JPushInterface.getRegistrationID(this))
-                .append("\n");
-        String token = DDProviderHelper.getInstance().getLastUserToken(this);
-        if (!TextUtils.isEmpty(token)) {
-            tips.append("Token：")
-                    .append(token)
-                    .append("\n");
-        } else {
-            tips.append("Token：未登录\n");
-        }
-
-        AlertDialog alertDialog = new AlertDialog.Builder(this)
-                .setTitle("信息")
-                .setMessage(tips.toString())
-                .setPositiveButton("复制", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                        cm.setText(tips.toString());
-                        showToast("复制成功！");
-                    }
-                })
-                .setCancelable(true)
-                .create();
-        alertDialog.show();
-    }
-
-
-    /**
      * 初始化游戏Tab
      */
     private void initTabGame() {
@@ -351,16 +314,6 @@ public class ActSearch extends BaseCompatActivity {
                     showRecord(true);
                     return;
                 }
-
-                if (mEdtKeyWord.getText().toString().equals("9527")) {
-                    testShowTips();
-                } else if (mEdtKeyWord.getText().toString().equals("9528")) {
-                    DDProviderHelper.getInstance().deleteAllUser(ActSearch.this);
-                    DDProviderHelper.getInstance().deleteCurrent(ActSearch.this);
-                    KFZSUserHelper.getInstance().removeHeadUser(ActSearch.this);
-                    KFZSUserHelper.getInstance().clearAllUser(ActSearch.this);
-                    showToast("所有用户数据清除成功！");
-                }
             }
         });
 
@@ -481,48 +434,6 @@ public class ActSearch extends BaseCompatActivity {
         KFZSNetwork.addRequest(bannerRequest);
     }
 
-
-    /**
-     * 载入游戏弹窗页面
-     *
-     * @param gameBookId
-     */
-    private void loadGameBook(String gameBookId) {
-        if (KFZSDDContentSession.getInstance().findOutHeadSession(app) == null) {
-            ToastBuilder.make(app, R.string.toast_user_info_you_ara_not_sign
-                    , ToastBuilder.DEFAULT_TOAST_SINGLE);
-            return;
-        }
-
-        ApiRequestOuterClass.ApiRequest.Builder request = ApiRequestOuterClass.ApiRequest.newBuilder();
-        GameBookOuterClass.GameBooked.Builder gameBook = GameBookOuterClass.GameBooked.newBuilder();
-        gameBook.setGameBookId(Long.valueOf(gameBookId));
-        request.setGameBooked(gameBook);
-
-        HashMap<String, String> params = new HashMap<>();
-        String token = KFZSDDContentSession.getInstance().findOutHeadSession(app).getToken();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-
-        APIRequest bannerRequest = APIRequestInstance.postReq(TAG, UrlBll.GameBookApi.GAME_BOOK_POST, params, request.build().toByteArray(), new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_BOOK_ICON));
-                doQueryTask(mEdtKeyWord.getText().toString());
-                new KFDialogFragment().show(getSupportFragmentManager(), "book");
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                ToastBuilder.make(app, msg, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
     /**
      * 格式化搜索结果显示
      *

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

@@ -35,7 +35,6 @@ import java.util.Set;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import mdl.sinlov.android.log.ALog;
 
 import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
 

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

@@ -11,16 +11,11 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.db.DataSave;
 import com.kfzs.duanduan.services.KFDownloadServices;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
-import com.umeng.socialize.Config;
-import com.umeng.socialize.PlatformConfig;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.common.QueuedWork;
 
 import org.wlf.filedownloader.FileDownloadConfiguration;
 import org.wlf.filedownloader.FileDownloader;
@@ -31,9 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import cn.jpush.android.api.JPushInterface;
-import mdl.sinlov.android.log.ALog;
-import mdl.sinlov.android.log.ALogLevel;
 
 /**
  * <pre>
@@ -88,11 +80,6 @@ public class KFZSApp extends MultiDexApplication{
 
     private void initUtils(boolean debug) {
         KFZSNetwork.init(application);
-        if (debug) {
-            ALog.initTag();
-        } else {
-            ALog.initTag().logLevel(ALogLevel.NONE);
-        }
         DisplayMetrics metric = getResources().getDisplayMetrics();
         G.DENSITY = metric.density;
         G.HEIGHT=metric.heightPixels;
@@ -109,8 +96,6 @@ public class KFZSApp extends MultiDexApplication{
         MobclickAgent.UMAnalyticsConfig umAnalyticsConfig = new MobclickAgent.UMAnalyticsConfig(application, umengKey, channelName);
         MobclickAgent.startWithConfigure(umAnalyticsConfig);
         MobclickAgent.setDebugMode(debug);
-        JPushInterface.setDebugMode(debug);
-        JPushInterface.init(this);
         //Log.e("JPushRegzid", JPushInterface.getRegistrationID(this));
         MobclickAgent.setCatchUncaughtExceptions(!debug);
         MobclickAgent.enableEncrypt(true);

app/src/main/res/drawable-hdpi/richpush_btn_selector.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<selector xmlns:android="http://schemas.android.com/apk/res/android" > 
-    <!-- 获得焦点但未按下时的背景图片 --> 
-    <item 
-        android:state_focused="true" 
-        android:state_enabled="true" 
-        android:state_pressed="false" 
-        android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
-     <!-- 按下时的背景图片 --> 
-    <item 
-        android:state_enabled="true" 
-        android:state_pressed="true" 
-        android:drawable="@android:color/darker_gray" /> 
-    <!-- 按下时的背景图片 --> 
-    <item 
-        android:state_enabled="true" 
-        android:state_checked="true" 
-        android:drawable="@android:color/darker_gray" /> 
-    <!-- 默认时的背景图片 --> 
-    <item android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
-</selector> 

app/src/main/res/drawable-hdpi/richpush_progressbar.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- 背景  gradient是渐变,corners定义的是圆角 -->
-    <item android:id="@android:id/background">
-        <shape>
-            <solid android:color="#ffffff" />
-        </shape>
-    </item>
-    
-    <!-- 进度条 -->
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="#4393ea" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>