zengjiebin %!s(int64=8) %!d(string=hai) anos
pai
achega
19c4b2dfda
Modificáronse 29 ficheiros con 60 adicións e 1515 borrados
  1. 29 63
      app/build.gradle
  2. 3 165
      app/src/main/AndroidManifest.xml
  3. 6 29
      app/src/main/java/com/kfzs/duanduan/ActGameDetails.java
  4. 6 22
      app/src/main/java/com/kfzs/duanduan/ActWeb.java
  5. 0 19
      app/src/main/java/com/kfzs/duanduan/bll/UrlBll.java
  6. 0 11
      app/src/main/java/com/kfzs/duanduan/db/DataSave.java
  7. 2 2
      app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
  8. 0 100
      app/src/main/java/com/kfzs/duanduan/utils/ShareUtils.java
  9. 0 45
      app/src/main/java/com/kfzs/duanduan/utils/net/ResponseAuthCaptcha.java
  10. 0 26
      app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java
  11. 0 135
      app/src/main/java/com/sheep/gamegroup/receiver/ExampleUtil.java
  12. 0 36
      app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushMessageReceiver.java
  13. 0 129
      app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java
  14. 0 340
      app/src/main/java/com/sheep/gamegroup/receiver/TagAliasOperatorHelper.java
  15. 0 45
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  16. 1 1
      app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
  17. 2 2
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  18. 0 14
      app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java
  19. 3 60
      app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
  20. 3 81
      app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java
  21. 0 168
      app/src/main/java/com/sheep/gamegroup/view/activity/MiddleAct.java
  22. 0 13
      app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java
  23. 0 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  24. 0 7
      app/src/main/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java
  25. BIN=BIN
      app/src/main/res/drawable-xxhdpi/icon.png
  26. 2 0
      app/src/main/res/layout/fgt_personalcenter_item_center_two.xml
  27. 1 0
      app/src/main/res/layout/login_act_layout.xml
  28. 2 0
      app/src/main/res/layout/x_ask_getmoney_act_layout.xml
  29. BIN=BIN
      app/src/main/res/mipmap-xhdpi/icon.png

+ 29 - 63
app/build.gradle

@@ -59,58 +59,23 @@ android {
         }
     }
     productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: "${flavor.name}",
-                                       DUANDUAN_GRAPH     : "${flavor.name}",
-                                       DUANDUAN_DATASHARE : "${flavor.name}",
+        flavor.manifestPlaceholders = [
+                DUANDUAN_GRAPH    : "${flavor.name}",
+                DUANDUAN_DATASHARE: "${flavor.name}",
         ]
     }
     productFlavors {
-        sheepzhangwei {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheeptest",
-                                    DUANDUAN_GRAPH     : "sheeptest",
-                                    DUANDUAN_DATASHARE : "sheeptest",
-                                    UMENG_APPKEY       : "58edcfeb310c93091c000be2"
-            ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'//false为不用加密
-            buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
-            signingConfig signingConfigs.config
-        }
-        sheeptest {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheeptest",
-                                    DUANDUAN_GRAPH     : "sheeptest",
-                                    DUANDUAN_DATASHARE : "sheeptest",
-                                    UMENG_APPKEY       : "58edcfeb310c93091c000be2"
-            ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
-            buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
-            signingConfig signingConfigs.config
-        }
         sheep {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheep",
-                                    DUANDUAN_GRAPH     : "sheep",
-                                    DUANDUAN_DATASHARE : "sheep",
-                                    UMENG_APPKEY       : "58edcfeb310c93091c000be2"
+            applicationId "com.shan.you"
+            manifestPlaceholders = [
+                    DUANDUAN_GRAPH    : "xmy_shanyou",
+                    DUANDUAN_DATASHARE: "xmy_shanyou",
             ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
+            buildConfigField "String", "DUANDUAN_DATASHARE", '"xmy_shanyou"'
+            buildConfigField "String", "DUANDUAN_GRAPH", '"xmy_shanyou"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
             signingConfig signingConfigs.config
 
         }
@@ -136,12 +101,12 @@ dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.10.0'
     compile 'org.greenrobot:eventbus:3.1.1'
     compile 'com.zhy:base-adapter:3.0.3'
-
-    //    compile 'com.liulishuo.filedownloader:library:1.6.9'
-    compile 'com.tencent.bugly:crashreport_upgrade:1.3.4'
-
-    //其中latest.release指代最新版本号,也可以指定明确的版本号,例如1.2.0
-    compile 'com.tencent.bugly:nativecrashreport:3.3.1'
+//
+//    //    compile 'com.liulishuo.filedownloader:library:1.6.9'
+//    compile 'com.tencent.bugly:crashreport_upgrade:1.3.4'
+//
+//    //其中latest.release指代最新版本号,也可以指定明确的版本号,例如1.2.0
+//    compile 'com.tencent.bugly:nativecrashreport:3.3.1'
 
     //其中latest.release指代最
 
@@ -196,7 +161,7 @@ dependencies {
     compile 'com.orhanobut:logger:1.15'
 
     //友盟
-    compile 'com.umeng.sdk:common:1.4.4'
+//    compile 'com.umeng.sdk:common:1.4.4'
 
     //compile 'com.umeng.sdk:analytics:latest.integration'
 
@@ -232,15 +197,15 @@ dependencies {
     //    compile files('libs/umeng_social_shareview.jar')
 
     //    compile files('libs/umeng_social_tool.jar')
-    compile files('libs/open_sdk_r5923_lite.jar')
-    compile files('libs/wechat-sdk-android-with-mta-1.1.6.jar')
-    compile files('libs/umeng_social_tool.jar')
-    compile files('libs/umeng_social_shareboard.jar')
-    compile files('libs/umeng_social_net.jar')
-    compile files('libs/umeng_social_api.jar')
-    compile files('libs/umeng_shareboard_widget.jar')
-    compile files('libs/SocialSDK_WeiXin_Full.jar')
-    compile files('libs/SocialSDK_QQ_Full.jar')
+//    compile files('libs/open_sdk_r5923_lite.jar')
+//    compile files('libs/wechat-sdk-android-with-mta-1.1.6.jar')
+//    compile files('libs/umeng_social_tool.jar')
+//    compile files('libs/umeng_social_shareboard.jar')
+//    compile files('libs/umeng_social_net.jar')
+//    compile files('libs/umeng_social_api.jar')
+//    compile files('libs/umeng_shareboard_widget.jar')
+//    compile files('libs/SocialSDK_WeiXin_Full.jar')
+//    compile files('libs/SocialSDK_QQ_Full.jar')
     compile 'com.zhy:okhttputils:2.6.2'
 
     //    compile 'com.kf.framework:kf-utils:latest.integration@aar'
@@ -274,10 +239,11 @@ dependencies {
     compile 'com.github.nanchen2251:CompressHelper:1.0.5'
     compile files('libs/alipaySdk-20170922.jar')
     //极光
-    compile files('libs/jcore-android-1.2.0.jar')
-    compile files('libs/jpush-android-3.1.2.jar')
+//    compile files('libs/jcore-android-1.2.0.jar')
+//    compile files('libs/jpush-android-3.1.2.jar')
 
 }
+
 def releaseTime() {
     return new Date().format("MMddHHmm", TimeZone.getDefault())
 }
@@ -285,6 +251,6 @@ def releaseTime() {
 android.applicationVariants.all {
     variant ->
         variant.outputs.each {
-            output -> buildType.name == "release" ? output.outputFile = new File(output.outputFile.parent, productFlavors[0].name + "_" + buildType.name + "_v" + android.defaultConfig.versionName  + "_" + android.defaultConfig.versionCode + "-${releaseTime()}.apk") : null
+            output -> buildType.name == "release" ? output.outputFile = new File(output.outputFile.parent, "shanyou_"+productFlavors[0].name + "_" + buildType.name + "_v" + android.defaultConfig.versionName + "_" + android.defaultConfig.versionCode + "-${releaseTime()}.apk") : null
         }
 }

+ 3 - 165
app/src/main/AndroidManifest.xml

@@ -3,10 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.sheep.jiuyan.samllsheep">
     <!--极光推送-->
-    <!-- Required -->
-    <permission
-        android:name="${applicationId}.permission.JPUSH_MESSAGE"
-        android:protectionLevel="signature" />
 
     <!-- Required  一些系统要求的权限,如访问网络等-->
     <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
@@ -72,11 +68,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".wxapi.WXEntryActivity"
-            android:exported="true"
-            android:launchMode="singleTop"/>
         <activity
             android:name="com.sheep.gamegroup.view.activity.WebviewAct"
             android:screenOrientation="portrait"/>
@@ -114,14 +105,13 @@
         </provider>
 
 
-
-        <!--必须配置-->
+<!--        &lt;!&ndash;必须配置&ndash;&gt;
         <activity
             android:name="com.tencent.bugly.beta.ui.BetaActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:theme="@android:style/Theme.Translucent"/>
 
-        <!-- 必须配置 fileProvider, 注意: android:authorities="${applicationId}.fileProvider" 不要直接copy,设置为你的包名.fileProvider-->
+        &lt;!&ndash; 必须配置 fileProvider, 注意: android:authorities="${applicationId}.fileProvider" 不要直接copy,设置为你的包名.fileProvider&ndash;&gt;
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
@@ -131,7 +121,7 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths"/>
 
-        </provider>
+        </provider>-->
 
         <activity
             android:name="com.sheep.gamegroup.view.activity.PersionInfoAct"
@@ -253,27 +243,6 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name="com.tencent.tauth.AuthActivity"
-            android:launchMode="singleTask"
-            android:noHistory="true" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="tencent101461115" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name="com.tencent.connect.common.AssistActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-
-
-
         <activity android:name="com.sheep.gamegroup.view.activity.CommitWxAct"
             android:windowSoftInputMode="stateVisible|adjustPan"
             android:screenOrientation="portrait" />
@@ -324,137 +293,6 @@
         <activity android:name="com.sheep.gamegroup.view.activity.SignRecordAct" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.SignRechargeAct" android:screenOrientation="portrait"/>
 
-
-        <!--友盟start-->
-
-
-        <!--友盟start-->
-        <meta-data
-            android:name="UMENG_APPKEY"
-            android:value="5ab0a1da8f4a9d742900035f"/>
-        <meta-data android:value="xxx" android:name="UMENG_CHANNEL"/>
-
-
-        <!--极光推送-->
-
-        <!-- For test only 测试状态通知栏,需要打开的Activity -->
-        <activity android:name="com.sheep.gamegroup.view.activity.MiddleAct" android:exported="false">
-            <intent-filter>
-                <action android:name="jpush.testAction" />
-                <category android:name="jpush.testCategory" />
-            </intent-filter>
-        </activity>
-        <!-- Rich push 核心功能 since 2.0.6-->
-        <activity
-            android:name="cn.jpush.android.ui.PopWinActivity"
-            android:theme="@style/MyDialogStyle"
-            android:exported="false">
-        </activity>
-        <!-- Required SDK核心功能-->
-        <activity
-            android:name="cn.jpush.android.ui.PushActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="cn.jpush.android.ui.PushActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </activity>
-
-        <!-- Required SDK 核心功能-->
-        <!-- 可配置android:process参数将PushService放在其他进程中 -->
-        <service
-            android:name="cn.jpush.android.service.PushService"
-            android:process=":mult"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTER" />
-                <action android:name="cn.jpush.android.intent.REPORT" />
-                <action android:name="cn.jpush.android.intent.PushService" />
-                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
-            </intent-filter>
-        </service>
-        <!-- since 3.0.9 Required SDK 核心功能-->
-        <provider
-            android:authorities="${applicationId}.DataProvider"
-            android:name="cn.jpush.android.service.DataProvider"
-            android:exported="false"
-            />
-
-
-        <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
-        <!-- 若不启用该功能可删除该组件,将不拉起其他应用也不能被其他应用拉起 -->
-        <service
-            android:name="cn.jpush.android.service.DaemonService"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.DaemonService" />
-                <category android:name="${applicationId}" />
-            </intent-filter>
-
-        </service>
-        <!-- since 3.1.0 Required SDK 核心功能-->
-        <provider
-            android:authorities="${applicationId}.DownloadProvider"
-            android:name="cn.jpush.android.service.DownloadProvider"
-            android:exported="true"
-            />
-        <!-- Required SDK核心功能-->
-        <receiver
-            android:name="cn.jpush.android.service.PushReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
-                <category android:name="${applicationId}" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <!-- Optional -->
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Required SDK核心功能-->
-        <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false"/>
-
-        <!-- User defined.  For test only  用户自定义的广播接收器-->
-        <receiver
-            android:name="com.sheep.gamegroup.receiver.SheepJpushReceiver"
-            android:exported="false"
-            android:enabled="true">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!--Required  用户注册SDK的intent-->
-                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!--Required  用户接收SDK消息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!--Required  用户接收SDK通知栏信息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!--Required  用户打开自定义通知栏的intent-->
-                <action android:name="cn.jpush.android.intent.CONNECTION" /><!-- 接收网络变化 连接/断开 since 1.6.3 -->
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </receiver>
-
-        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
-        <receiver android:name="com.sheep.gamegroup.receiver.SheepJpushMessageReceiver">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
-                <category android:name="${applicationId}"/>
-            </intent-filter>
-        </receiver>
-
-        <!-- Required  . Enable it you can get statistics data with channel -->
-        <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
-        <meta-data android:name="JPUSH_APPKEY" android:value="28b74d520261c6f78e3e0921" /> <!--  </>值来自开发者平台取得的AppKey-->
-        <!--极光推送end-->
-
         <!-- div start-->
         <activity
             android:name="com.sheep.gamegroup.view.activity.RechargeAct"

+ 6 - 29
app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -36,7 +36,6 @@ import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.ShareUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.net.APIRequest;
@@ -235,12 +234,12 @@ public class ActGameDetails extends BaseCompatActivity {
                 onBackPressed();
             }
         });
-        mShare.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                popShare();
-            }
-        });
+//        mShare.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                popShare();
+//            }
+//        });
 
 
         if (getIntent().hasExtra(EXTRA_PAGE_NUM)) {
@@ -292,28 +291,6 @@ public class ActGameDetails extends BaseCompatActivity {
         }
     }
 
-    /**
-     * 分享游戏;
-     */
-    private void popShare() {
-        String shareUrl = "";
-        if (respGame != null && !TextUtils.isEmpty(respGame.getDownloadUrl())) {
-            shareUrl = respGame.getDownloadUrl();
-        } else if (respGame != null && !TextUtils.isEmpty(respGame.getBookDownloadUrl())) {
-            shareUrl = respGame.getBookDownloadUrl();
-        } else {
-            showToast("分享地址错误!");
-            return;
-        }
-        if (!TextUtils.isEmpty(shareUrl) && shareUrl.toLowerCase().startsWith("http")) {
-            new ShareUtils().showShareView(this, shareUrl, respGame.getGameName(),
-                    respGame.getIconImage(), respGame.getIntroduce());
-        } else {
-            String msg = "分享错误,请联系客服!\n错误链接为: " + shareUrl;
-            Log.w("DD_ERROR", msg);
-            showToast(msg);
-        }
-    }
 
     @Override
     public void onBackPressed() {

+ 6 - 22
app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -20,12 +20,10 @@ 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.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.socialize.UMShareAPI;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -245,7 +243,7 @@ public class ActWeb extends BaseCompatActivity {
         return false;
     }
 
-    @OnClick({R.id.ibtn_act_webview, R.id.btn_share})
+    @OnClick({R.id.ibtn_act_webview})
     public void onClick(View v) {
         int resId = v.getId();
         switch (resId) {
@@ -253,9 +251,6 @@ public class ActWeb extends BaseCompatActivity {
                 onBackPressed();
                 //                this.finish();
                 break;
-            case R.id.btn_share:
-                popShare();
-                break;
         }
     }
 
@@ -268,17 +263,6 @@ public class ActWeb extends BaseCompatActivity {
         this.finish();
     }
 
-    private void popShare() {
-        Logger.d("now share url: " + shareUrl);
-        if (!TextUtils.isEmpty(shareUrl) && shareUrl.toLowerCase().startsWith("http")) {
-            new ShareUtils().showShareView(this, shareUrl, extraTitle, extraShareImgUrl, extraTitle);
-        } else {
-            String msg = "分享错误,请联系客服!\n错误链接为: " + shareUrl;
-            Log.w("DD_ERROR", msg);
-            showToast(msg);
-        }
-    }
-
     private class JSCallFilter implements OnURLParseByJS {
 
         private static final String WHO_WEB = "1";
@@ -355,11 +339,11 @@ public class ActWeb extends BaseCompatActivity {
     }
 
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-    }
+//    @Override
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        super.onActivityResult(requestCode, resultCode, data);
+//        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
+//    }
 
 
 }

+ 0 - 19
app/src/main/java/com/kfzs/duanduan/bll/UrlBll.java

@@ -46,11 +46,6 @@ public final class UrlBll {
     /**
      * ******************** start所有的地址根 ********************
      */
-
-    /**
-     * 服务器地址
-     */
-    public static final String CAPTCHA_DOMAIN = PROTOCOL_HTTP + BuildConfig.CAPTCHA_DOMAIN;
     /**
      * API服务器地址
      */
@@ -87,20 +82,6 @@ public final class UrlBll {
         public static final String BIND_PHONE_STEP_TWO = "2";
     }
 
-    public final class AuthApi {
-        public static final String SHOW_CAPTCHA = CAPTCHA_DOMAIN + "/showimage?key=";
-        public static final String AUTH = API_VERSION + "/auth";
-        public static final String CAPTCHA = AUTH + "/captcha";
-        public static final String FIND_PWD = AUTH + "/findPwd";
-        public static final String LOGIN = AUTH + "/login";
-        public static final String LOGIN_SMS = AUTH + "/login_by_sms";
-        public static final String SMS_LOGIN = AUTH + "/sms_for_login";
-
-        public static final String REGISTER = AUTH + "/register";
-        public static final String SIGN_OUT = AUTH + "/signout";
-        public static final String VERIFY = AUTH + "/verify";
-    }
-
     public static class V2 {
         public static final String NEW_GAME_BOOK = API_DOMAIN + "/v2/recommend/book_recommend";
         public static final String NEW_GAME_RECOMMEND = API_DOMAIN + "/v2/recommend/new_recommend";

+ 0 - 11
app/src/main/java/com/kfzs/duanduan/db/DataSave.java

@@ -78,17 +78,6 @@ public class DataSave {
         return channelName;
     }
 
-    public String getUmengKey() {
-        if (umengKey == null) {
-            if (TextUtils.isEmpty(BuildConfig.umeng_appkey)) {
-                umengKey = BuildConfig.umeng_appkey;
-            } else {
-                umengKey = "58bd0a3475ca3518a2002436";
-            }
-        }
-        return umengKey;
-    }
-
     public static synchronized DataSave getInstance() {
         if (instance == null) {
             instance = new DataSave();

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -145,10 +145,10 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 .into(iconImgIv);
         //设置是否显示代理服务
         proxy_service_layout_line.setVisibility(
-//                BuildConfig.DEBUG ||
+                BuildConfig.DEBUG ||
                         userEntitys.getIs_agent() == 1 ? View.VISIBLE : View.GONE);
         proxy_service_layout.setVisibility(
-//                BuildConfig.DEBUG ||
+                BuildConfig.DEBUG ||
                         userEntitys.getIs_agent() == 1 ? View.VISIBLE : View.GONE);
     }
 

+ 0 - 100
app/src/main/java/com/kfzs/duanduan/utils/ShareUtils.java

@@ -1,100 +0,0 @@
-package com.kfzs.duanduan.utils;
-
-import android.app.Activity;
-
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.UMShareListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
-import com.umeng.socialize.media.UMWeb;
-import com.umeng.socialize.shareboard.SnsPlatform;
-import com.umeng.socialize.utils.ShareBoardlistener;
-
-/**
- * Created by Howie on 2017/4/10.
- * 分享工具类
- */
-
-public class ShareUtils {
-    public static final String SHARE_START = "创建分享数据中";
-    public static final String SHARE_SUCCESS = "分享成功";
-    public static final String SHARE_FAILURE = "分享失败";
-    public static final String SHARE_CANCEL = "分享取消";
-
-
-    /**
-     * 分享方法
-     *
-     * @param activity
-     * @param link     网页地址
-     * @param title
-     * @param img
-     * @param content
-     * @param listener
-     */
-    public void showShareView(final Activity activity, final String link,
-                              final String title, final String img, final String content, final UMShareListener listener) {
-        new ShareAction(activity)
-                //SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE,新浪,QQ
-//                .setDisplayList(SHARE_MEDIA.SINA, SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE)
-                .setDisplayList(SHARE_MEDIA.SINA)
-                .setShareboardclickCallback(new ShareBoardlistener() {
-                    @Override
-                    public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
-                        UMWeb web = new UMWeb(link);
-                        web.setTitle(title);
-                        web.setDescription(content);
-                        web.setThumb(new UMImage(activity, img));
-                        new ShareAction(activity).withMedia(web)
-                                .setPlatform(share_media)
-                                .setCallback(listener)
-                                .share();
-                    }
-                }).open();
-
-    }
-
-
-    public void showShareView(final Activity activity, final String link,
-                              final String title, final String img, final String content) {
-        new ShareAction(activity)
-                //SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE,新浪,QQ
-//                .setDisplayList(SHARE_MEDIA.SINA, SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE)
-                .setDisplayList(SHARE_MEDIA.SINA)
-                .setShareboardclickCallback(new ShareBoardlistener() {
-                    @Override
-                    public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
-                        UMWeb web = new UMWeb(link);
-                        web.setTitle(title);
-                        web.setDescription(content);
-                        web.setThumb(new UMImage(activity, img));
-                        new ShareAction(activity).withMedia(web)
-                                .setPlatform(share_media)
-                                .setCallback(new UMShareListener() {
-                                    @Override
-                                    public void onStart(SHARE_MEDIA share_media) {
-                                        G.showToast(SHARE_START);
-                                    }
-
-                                    @Override
-                                    public void onResult(SHARE_MEDIA share_media) {
-                                        G.showToast(SHARE_SUCCESS);
-                                    }
-
-                                    @Override
-                                    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
-                                        G.showToast(SHARE_FAILURE);
-                                    }
-
-                                    @Override
-                                    public void onCancel(SHARE_MEDIA share_media) {
-                                        G.showToast(SHARE_CANCEL);
-                                    }
-                                })
-                                .share();
-                    }
-                }).open();
-
-    }
-}

+ 0 - 45
app/src/main/java/com/kfzs/duanduan/utils/net/ResponseAuthCaptcha.java

@@ -1,45 +0,0 @@
-package com.kfzs.duanduan.utils.net;
-
-import com.android.volleyplus.Response;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Captcha;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/28.
- */
-public abstract class ResponseAuthCaptcha implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-    @Override
-    public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-        int code = apiResponse.getCodeValue();
-        if (code == ApiResponseOuterClass.Codes.Success_VALUE) {
-            Captcha.CaptchaOut captchaOut = apiResponse.getCaptchaOut();
-            if (null != captchaOut) {
-                String key = captchaOut.getKey();
-                onAuthCaptchaURL(key, UrlBll.AuthApi.SHOW_CAPTCHA + key);
-            } else {
-                onErrorAuthCaptchaURL(code, "parse error getCaptchaOut is Empty!");
-            }
-        } else {
-            onErrorAuthCaptchaURL(code, apiResponse.getMsg());
-        }
-    }
-
-    public abstract void onAuthCaptchaURL(String key, String url);
-
-    public abstract void onErrorAuthCaptchaURL(int code, String msg);
-}

+ 0 - 26
app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java

@@ -1,26 +0,0 @@
-package com.sheep.gamegroup.absBase;
-
-import android.content.Intent;
-
-
-import com.umeng.socialize.UMShareAPI;
-
-/**
- * Created by Administrator on 2018/3/21.
- */
-
-public  abstract  class BaseUMActivity extends BaseActivity {
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        try {
-            UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-}

+ 0 - 135
app/src/main/java/com/sheep/gamegroup/receiver/ExampleUtil.java

@@ -1,135 +0,0 @@
-package com.sheep.gamegroup.receiver;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.os.Looper;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.orhanobut.logger.Logger;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import cn.jpush.android.api.JPushInterface;
-
-public class ExampleUtil {
-    public static final String PREFS_NAME = "JPUSH_EXAMPLE";
-    public static final String PREFS_DAYS = "JPUSH_EXAMPLE_DAYS";
-    public static final String PREFS_START_TIME = "PREFS_START_TIME";
-    public static final String PREFS_END_TIME = "PREFS_END_TIME";
-    public static final String KEY_APP_KEY = "JPUSH_APPKEY";
-
-    public static boolean isEmpty(String s) {
-        if (null == s)
-            return true;
-        if (s.length() == 0)
-            return true;
-        if (s.trim().length() == 0)
-            return true;
-        return false;
-    }
-    /**
-     * 只能以 “+” 或者 数字开头;后面的内容只能包含 “-” 和 数字。
-     * */
-    private final static String MOBILE_NUMBER_CHARS = "^[+0-9][-0-9]{1,}$";
-    public static boolean isValidMobileNumber(String s) {
-        if(TextUtils.isEmpty(s)) return true;
-        Pattern p = Pattern.compile(MOBILE_NUMBER_CHARS);
-        Matcher m = p.matcher(s);
-        return m.matches();
-    }
-    // 校验Tag Alias 只能是数字,英文字母和中文
-    public static boolean isValidTagAndAlias(String s) {
-        Pattern p = Pattern.compile("^[\u4E00-\u9FA50-9a-zA-Z_!@#$&*+=.|]+$");
-        Matcher m = p.matcher(s);
-        return m.matches();
-    }
-
-    // 取得AppKey
-    public static String getAppKey(Context context) {
-        Bundle metaData = null;
-        String appKey = null;
-        try {
-            ApplicationInfo ai = context.getPackageManager().getApplicationInfo(
-                    context.getPackageName(), PackageManager.GET_META_DATA);
-            if (null != ai)
-                metaData = ai.metaData;
-            if (null != metaData) {
-                appKey = metaData.getString(KEY_APP_KEY);
-                if ((null == appKey) || appKey.length() != 24) {
-                    appKey = null;
-                }
-            }
-        } catch (NameNotFoundException e) {
-
-        }
-        return appKey;
-    }
-    
-    // 取得版本号
-    public static String GetVersion(Context context) {
-		try {
-			PackageInfo manager = context.getPackageManager().getPackageInfo(
-					context.getPackageName(), 0);
-			return manager.versionName;
-		} catch (NameNotFoundException e) {
-			return "Unknown";
-		}
-	}
-
-    public static void showToast(final String toast, final Context context)
-    {
-    	new Thread(new Runnable() {
-			
-			@Override
-			public void run() {
-				Looper.prepare();
-				Toast.makeText(context, toast, Toast.LENGTH_SHORT).show();
-				Looper.loop();
-			}
-		}).start();
-    }
-    
-    public static boolean isConnected(Context context) {
-        ConnectivityManager conn = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo info = conn.getActiveNetworkInfo();
-        return (info != null && info.isConnected());
-    }
-    
-	public static String getImei(Context context, String imei) {
-        String ret = null;
-		try {
-			TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-            ret = telephonyManager.getDeviceId();
-		} catch (Exception e) {
-			Logger.e(ExampleUtil.class.getSimpleName(), e.getMessage());
-		}
-		if (isReadableASCII(ret)){
-            return ret;
-        } else {
-            return imei;
-        }
-	}
-
-    private static boolean isReadableASCII(CharSequence string){
-        if (TextUtils.isEmpty(string)) return false;
-        try {
-            Pattern p = Pattern.compile("[\\x20-\\x7E]+");
-            return p.matcher(string).matches();
-        } catch (Throwable e){
-            return true;
-        }
-    }
-
-    public static String getDeviceId(Context context) {
-        return JPushInterface.getUdid(context);
-    }
-}

+ 0 - 36
app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushMessageReceiver.java

@@ -1,36 +0,0 @@
-package com.sheep.gamegroup.receiver;
-
-import android.content.Context;
-
-import cn.jpush.android.api.JPushMessage;
-import cn.jpush.android.service.JPushMessageReceiver;
-
-/**
- * 自定义JPush message 接收器,包括操作tag/alias的结果返回(仅仅包含tag/alias新接口部分)
- * Created by realicing on 2018/5/9.
- * realicing@sina.com
- */
-public class SheepJpushMessageReceiver extends JPushMessageReceiver {
-
-    @Override
-    public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
-        super.onTagOperatorResult(context, jPushMessage);
-    }
-    @Override
-    public void onCheckTagOperatorResult(Context context,JPushMessage jPushMessage){
-        TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
-        super.onCheckTagOperatorResult(context, jPushMessage);
-    }
-    @Override
-    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
-        super.onAliasOperatorResult(context, jPushMessage);
-    }
-
-    @Override
-    public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
-        super.onMobileNumberOperatorResult(context, jPushMessage);
-    }
-}

+ 0 - 129
app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java

@@ -1,129 +0,0 @@
-package com.sheep.gamegroup.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.view.activity.MiddleAct;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Iterator;
-
-import cn.jpush.android.api.JPushInterface;
-
-/**
- * Created by realicing on 2018/5/9.
- * realicing@sina.com
- * 自定义接收器
- *
- * 如果不定义这个 Receiver,则:
- * 1) 默认用户会打开主界面
- * 2) 接收不到自定义消息
- */
-public class SheepJpushReceiver extends BroadcastReceiver {
-    private static final String TAG = "JIGUANG-SmallSheep";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        try {
-            Bundle bundle = intent.getExtras();
-            Log.d(TAG, "[SheepJpushReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
-
-            if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
-                String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
-                Log.d(TAG, "[SheepJpushReceiver] 接收Registration Id : " + regId);
-                //send the Registration Id to your server...
-
-            } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {//自定义消息中有自定义字段时才会接收到,且不会有通知
-                Log.d(TAG, "[SheepJpushReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
-                processCustomMessage(context, bundle);
-
-            } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {//除了自定义消息中有自定义字段的消息,都会接收到通知
-                Log.d(TAG, "[SheepJpushReceiver] 接收到推送下来的通知");
-                int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
-                Log.d(TAG, "[SheepJpushReceiver] 接收到推送下来的通知的ID: " + notifactionId);
-
-            } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
-                Log.d(TAG, "[SheepJpushReceiver] 用户点击打开了通知");
-                //打开自定义的Activity
-                Jump2View.getInstance().newTaskTopStartAct(context, MiddleAct.class, bundle);
-
-            } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) {
-                Log.d(TAG, "[SheepJpushReceiver] 用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA));
-                //在这里根据 JPushInterface.EXTRA_EXTRA 的内容处理代码,比如打开新的Activity, 打开一个网页等..
-
-            } else if(JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
-                boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
-                Log.w(TAG, "[SheepJpushReceiver]" + intent.getAction() +" connected state change to "+connected);
-            } else {
-                Log.d(TAG, "[SheepJpushReceiver] Unhandled intent - " + intent.getAction());
-            }
-        } catch (Exception e){
-
-        }
-
-    }
-
-    // 打印所有的 intent extra 数据
-    private static String printBundle(Bundle bundle) {
-        StringBuilder sb = new StringBuilder();
-        for (String key : bundle.keySet()) {
-            if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
-                sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
-            }else if(key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)){
-                sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
-            } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
-                if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
-                    Log.i(TAG, "This message has no Extra data");
-                    continue;
-                }
-
-                try {
-                    JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
-                    Iterator<String> it =  json.keys();
-
-                    while (it.hasNext()) {
-                        String myKey = it.next();
-                        sb.append("\nkey:" + key + ", value: [" +
-                                myKey + " - " +json.optString(myKey) + "]");
-                    }
-                } catch (JSONException e) {
-                    Log.e(TAG, "Get message extra JSON error!");
-                }
-
-            } else {
-                sb.append("\nkey:" + key + ", value:" + bundle.getString(key));
-            }
-        }
-        return sb.toString();
-    }
-
-    //send msg to MainActivity
-    private void processCustomMessage(Context context, Bundle bundle) {
-//        if (MainActivity.isForeground) {
-//            String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
-//            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-//            Intent msgIntent = new Intent(MainActivity.MESSAGE_RECEIVED_ACTION);
-//            msgIntent.putExtra(MainActivity.KEY_MESSAGE, message);
-//            if (!ExampleUtil.isEmpty(extras)) {
-//                try {
-//                    JSONObject extraJson = new JSONObject(extras);
-//                    if (extraJson.length() > 0) {
-//                        msgIntent.putExtra(MainActivity.KEY_EXTRAS, extras);
-//                    }
-//                } catch (JSONException e) {
-//
-//                }
-//
-//            }
-//            LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
-//        }
-    }
-}

+ 0 - 340
app/src/main/java/com/sheep/gamegroup/receiver/TagAliasOperatorHelper.java

@@ -1,340 +0,0 @@
-package com.sheep.gamegroup.receiver;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.util.SparseArray;
-
-import com.orhanobut.logger.Logger;
-
-import java.util.Locale;
-import java.util.Set;
-
-import cn.jpush.android.api.JPushInterface;
-import cn.jpush.android.api.JPushMessage;
-
-/**
- * 处理tagalias相关的逻辑
- * */
-public class TagAliasOperatorHelper {
-    private static final String TAG = "JIGUANG-TagAliasHelper";
-    public static int sequence = 1;
-    /**增加*/
-    public static final int ACTION_ADD = 1;
-    /**覆盖*/
-    public static final int ACTION_SET = 2;
-    /**删除部分*/
-    public static final int ACTION_DELETE = 3;
-    /**删除所有*/
-    public static final int ACTION_CLEAN = 4;
-    /**查询*/
-    public static final int ACTION_GET = 5;
-
-    public static final int ACTION_CHECK = 6;
-
-    public static final int DELAY_SEND_ACTION = 1;
-
-    public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
-
-    private Context context;
-
-    private static TagAliasOperatorHelper mInstance;
-    private TagAliasOperatorHelper(){
-    }
-    public static TagAliasOperatorHelper getInstance(){
-        if(mInstance == null){
-            synchronized (TagAliasOperatorHelper.class){
-                if(mInstance == null){
-                    mInstance = new TagAliasOperatorHelper();
-                }
-            }
-        }
-        return mInstance;
-    }
-    public void init(Context context){
-        if(context != null) {
-            this.context = context.getApplicationContext();
-        }
-    }
-    private SparseArray<Object> setActionCache = new SparseArray<Object>();
-
-    public Object get(int sequence){
-        return setActionCache.get(sequence);
-    }
-    public Object remove(int sequence){
-        return setActionCache.get(sequence);
-    }
-    public void put(int sequence,Object tagAliasBean){
-        setActionCache.put(sequence,tagAliasBean);
-    }
-    private Handler delaySendHandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what){
-                case DELAY_SEND_ACTION:
-                    if(msg.obj !=null && msg.obj instanceof  TagAliasBean){
-                        Logger.i(TAG,"on delay time");
-                        sequence++;
-                        TagAliasBean tagAliasBean = (TagAliasBean) msg.obj;
-                        setActionCache.put(sequence, tagAliasBean);
-                        if(context!=null) {
-                            handleAction(context, sequence, tagAliasBean);
-                        }else{
-                            Logger.e(TAG,"#unexcepted - context was null");
-                        }
-                    }else{
-                        Logger.w(TAG,"#unexcepted - msg obj was incorrect");
-                    }
-                    break;
-                case DELAY_SET_MOBILE_NUMBER_ACTION:
-                    if(msg.obj !=null && msg.obj instanceof  String) {
-                        Logger.i(TAG, "retry set mobile number");
-                        sequence++;
-                        String mobileNumber = (String) msg.obj;
-                        setActionCache.put(sequence, mobileNumber);
-                        if(context !=null) {
-                            handleAction(context, sequence, mobileNumber);
-                        }else {
-                            Logger.e(TAG, "#unexcepted - context was null");
-                        }
-                    }else{
-                        Logger.w(TAG,"#unexcepted - msg obj was incorrect");
-                    }
-                    break;
-            }
-        }
-    };
-    public void handleAction(Context context,int sequence,String mobileNumber){
-        put(sequence,mobileNumber);
-        Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
-        JPushInterface.setMobileNumber(context,sequence,mobileNumber);
-    }
-    /**
-     * 处理设置tag
-     * */
-    public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
-        init(context);
-        if(tagAliasBean == null){
-            Logger.w(TAG,"tagAliasBean was null");
-            return;
-        }
-        put(sequence,tagAliasBean);
-        if(tagAliasBean.isAliasAction){
-            switch (tagAliasBean.action){
-                case ACTION_GET:
-                    JPushInterface.getAlias(context,sequence);
-                    break;
-                case ACTION_DELETE:
-                    JPushInterface.deleteAlias(context,sequence);
-                    break;
-                case ACTION_SET:
-                    JPushInterface.setAlias(context,sequence,tagAliasBean.alias);
-                    break;
-                default:
-                    Logger.w(TAG,"unsupport alias action type");
-                    return;
-            }
-        }else {
-            switch (tagAliasBean.action) {
-                case ACTION_ADD:
-                    JPushInterface.addTags(context, sequence, tagAliasBean.tags);
-                    break;
-                case ACTION_SET:
-                    JPushInterface.setTags(context, sequence, tagAliasBean.tags);
-                    break;
-                case ACTION_DELETE:
-                    JPushInterface.deleteTags(context, sequence, tagAliasBean.tags);
-                    break;
-                case ACTION_CHECK:
-                    //一次只能check一个tag
-                    String tag = (String)tagAliasBean.tags.toArray()[0];
-                    JPushInterface.checkTagBindState(context,sequence,tag);
-                    break;
-                case ACTION_GET:
-                    JPushInterface.getAllTags(context, sequence);
-                    break;
-                case ACTION_CLEAN:
-                    JPushInterface.cleanTags(context, sequence);
-                    break;
-                default:
-                    Logger.w(TAG,"unsupport tag action type");
-                    return;
-            }
-        }
-    }
-    private boolean RetryActionIfNeeded(int errorCode,TagAliasBean tagAliasBean){
-        if(!ExampleUtil.isConnected(context)){
-            Logger.w(TAG,"no network");
-            return false;
-        }
-        //返回的错误码为6002 超时,6014 服务器繁忙,都建议延迟重试
-        if(errorCode == 6002 || errorCode == 6014){
-            Logger.d(TAG,"need retry");
-            if(tagAliasBean!=null){
-                Message message = new Message();
-                message.what = DELAY_SEND_ACTION;
-                message.obj = tagAliasBean;
-                delaySendHandler.sendMessageDelayed(message,1000*60);
-                String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
-                ExampleUtil.showToast(logs, context);
-                return true;
-            }
-        }
-        return false;
-    }
-    private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
-        if(!ExampleUtil.isConnected(context)){
-            Logger.w(TAG,"no network");
-            return false;
-        }
-        //返回的错误码为6002 超时,6024 服务器内部错误,建议稍后重试
-        if(errorCode == 6002 || errorCode == 6024){
-            Logger.d(TAG,"need retry");
-            Message message = new Message();
-            message.what = DELAY_SET_MOBILE_NUMBER_ACTION;
-            message.obj = mobileNumber;
-            delaySendHandler.sendMessageDelayed(message,1000*60);
-            String str = "Failed to set mobile number due to %s. Try again after 60s.";
-            str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
-            ExampleUtil.showToast(str, context);
-            return true;
-        }
-        return false;
-
-    }
-    private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
-        String str = "Failed to %s %s due to %s. Try again after 60s.";
-        str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
-        return str;
-    }
-
-    private String getActionStr(int actionType){
-        switch (actionType){
-            case ACTION_ADD:
-                return "add";
-            case ACTION_SET:
-                return "set";
-            case ACTION_DELETE:
-                return "delete";
-            case ACTION_GET:
-                return "get";
-            case ACTION_CLEAN:
-                return "clean";
-            case ACTION_CHECK:
-                return "check";
-        }
-        return "unkonw operation";
-    }
-    public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
-        int sequence = jPushMessage.getSequence();
-        Logger.i(TAG,"action - onTagOperatorResult, sequence:"+sequence+",tags:"+jPushMessage.getTags());
-        Logger.i(TAG,"tags size:"+jPushMessage.getTags().size());
-        init(context);
-        //根据sequence从之前操作缓存中获取缓存记录
-        TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
-        if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
-            return;
-        }
-        if(jPushMessage.getErrorCode() == 0){
-            Logger.i(TAG,"action - modify tag Success,sequence:"+sequence);
-            setActionCache.remove(sequence);
-            String logs = getActionStr(tagAliasBean.action)+" tags success";
-            Logger.i(TAG,logs);
-            ExampleUtil.showToast(logs, context);
-        }else{
-            String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
-            if(jPushMessage.getErrorCode() == 6018){
-                //tag数量超过限制,需要先清除一部分再add
-                logs += ", tags is exceed limit need to clean";
-            }
-            logs += ", errorCode:" + jPushMessage.getErrorCode();
-            Logger.e(TAG, logs);
-            if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
-            }
-        }
-    }
-    public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
-        int sequence = jPushMessage.getSequence();
-        Logger.i(TAG,"action - onCheckTagOperatorResult, sequence:"+sequence+",checktag:"+jPushMessage.getCheckTag());
-        init(context);
-        //根据sequence从之前操作缓存中获取缓存记录
-        TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
-        if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
-            return;
-        }
-        if(jPushMessage.getErrorCode() == 0){
-            Logger.i(TAG,"tagBean:"+tagAliasBean);
-            setActionCache.remove(sequence);
-            String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
-            Logger.i(TAG,logs);
-            ExampleUtil.showToast(logs, context);
-        }else{
-            String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
-            Logger.e(TAG, logs);
-            if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
-            }
-        }
-    }
-    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
-        int sequence = jPushMessage.getSequence();
-        Logger.i(TAG,"action - onAliasOperatorResult, sequence:"+sequence+",alias:"+jPushMessage.getAlias());
-        init(context);
-        //根据sequence从之前操作缓存中获取缓存记录
-        TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
-        if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
-            return;
-        }
-        if(jPushMessage.getErrorCode() == 0){
-            Logger.i(TAG,"action - modify alias Success,sequence:"+sequence);
-            setActionCache.remove(sequence);
-            String logs = getActionStr(tagAliasBean.action)+" alias success";
-            Logger.i(TAG,logs);
-            ExampleUtil.showToast(logs, context);
-        }else{
-            String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
-            Logger.e(TAG, logs);
-            if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
-            }
-        }
-    }
-    //设置手机号码回调
-    public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
-        int sequence = jPushMessage.getSequence();
-        Logger.i(TAG,"action - onMobileNumberOperatorResult, sequence:"+sequence+",mobileNumber:"+jPushMessage.getMobileNumber());
-        init(context);
-        if(jPushMessage.getErrorCode() == 0){
-            Logger.i(TAG,"action - set mobile number Success,sequence:"+sequence);
-            setActionCache.remove(sequence);
-        }else{
-            String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
-            Logger.e(TAG, logs);
-            if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
-                ExampleUtil.showToast(logs, context);
-            }
-        }
-    }
-    public static class TagAliasBean{
-        int action;
-        Set<String> tags;
-        String alias;
-        boolean isAliasAction;
-
-        @Override
-        public String toString() {
-            return "TagAliasBean{" +
-                    "action=" + action +
-                    ", tags=" + tags +
-                    ", alias='" + alias + '\'' +
-                    ", isAliasAction=" + isAliasAction +
-                    '}';
-        }
-    }
-
-
-}

+ 0 - 45
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -17,7 +17,6 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
@@ -25,7 +24,6 @@ import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
@@ -34,9 +32,6 @@ 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;
-import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -396,46 +391,6 @@ public class CommonUtil {
 
         UMConfigUtils.onProfileSignOff();
         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
-        UMShareAPI api=  UMShareAPI.get(activity);
-        api.deleteOauth(activity, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                activity.hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                activity.hideProgress();
-            }
-        });
-
-        api.deleteOauth(activity, SHARE_MEDIA.QQ, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                activity.hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                activity.hideProgress();
-            }
-        });
         SpUtils.login(activity, "");
         SpUtils.saveWeixin(activity, "");
         SpUtils.savePhone(activity, "");

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -40,7 +40,7 @@ public enum ConnectAddress {
 
         @Override
         public String getAppUrl() {
-            return "http://ss.kfzs.com/";
+            return "http://sheepapi.lex.9yan.io/";
         }
 
         @Override

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1007,7 +1007,7 @@ public class Jump2View {
         int cur_version_code = ApkUtils.getCurrentPkgVersionCode(SheepApp.getInstance());
         PreferenceUtils.setPrefInt(SheepApp.getInstance(), "version_code", cur_version_code);
         if(
-                BuildConfig.DEBUG ||
+//                BuildConfig.DEBUG ||
                 version_code != cur_version_code){
             Intent intent = new Intent(activity, ActGuide.class);
             activity.startActivity(intent);
@@ -1023,7 +1023,7 @@ public class Jump2View {
             activity.startActivity(intent);
             activity.finish();
         } else {
-            Intent intent = new Intent(activity, LoginAct.class);
+            Intent intent = new Intent(activity, PhoneAct.class);
             activity.startActivity(intent);
             activity.finish();
         }

+ 0 - 14
app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -7,8 +7,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.event.BigEvent;
@@ -19,38 +17,26 @@ import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.UserNameChange;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.xutils.ex.DbException;
-
-import java.util.Map;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/16.

+ 3 - 60
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.fragment.FgtFriendExtractPage;
 import com.kfzs.duanduan.fragment.PagerAdapter;
-import com.sheep.gamegroup.absBase.BaseUMActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
@@ -23,11 +23,6 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.UMShareListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
-import com.umeng.socialize.media.UMWeb;
 
 import javax.inject.Inject;
 
@@ -38,7 +33,7 @@ import butterknife.OnClick;
  * Created by Administrator on 2018/3/19.
  */
 
-public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, AskGetMoneyContract.View {
+public class AskGetMoneyAct extends BaseActivity implements AskGetMoneyContract.View {
 
 
     @Inject
@@ -96,30 +91,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
         mPresenter.getTask(null);
     }
 
-    private void shareToWX() {
-        shareToOther(1);
-    }
-
-    private void shareToQQ() {
-        shareToOther(2);
-    }
-
-    private void shareToOther(int code) {
-        UMImage thumb = new UMImage(this, R.drawable.icon);
-        UMWeb web = new UMWeb(mEntity.getShare_link());
-        web.setTitle(mEntity.getShare_title());//标题
-        web.setThumb(thumb);  //缩略图
-        web.setDescription(mEntity.getShare_desc());//描述
-        ShareAction shareAction = new ShareAction(AskGetMoneyAct.this);
-        if (code == 1) {
-            shareAction.setPlatform(SHARE_MEDIA.WEIXIN);
-        } else {
-            shareAction.setPlatform(SHARE_MEDIA.QQ);
-        }
-        shareAction.setCallback(this).withMedia(web).share();
-    }
-
-
     private void shareToLink() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_reward_dialog, null);
@@ -149,28 +120,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     }
 
 
-
-
-    @Override
-    public void onStart(SHARE_MEDIA share_media) {
-
-    }
-
-    @Override
-    public void onResult(SHARE_MEDIA share_media) {
-
-    }
-
-    @Override
-    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
-
-    }
-
-    @Override
-    public void onCancel(SHARE_MEDIA share_media) {
-
-    }
-
     @Override
     public void NetSuccess(int code, String msg, String s) {
 
@@ -198,16 +147,10 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     }
 
 
-    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
+    @OnClick({R.id.rl_qr, R.id.rl_link})
     public void onViewClicked(View view) {
         try {
             switch (view.getId()) {
-                case R.id.rl_wx:
-                    shareToWX();
-                    break;
-                case R.id.rl_qq:
-                    shareToQQ();
-                    break;
                 case R.id.rl_qr:
                     ViewUtil.showQR(AskGetMoneyAct.this, mEntity.getShare_link());
                     break;

+ 3 - 81
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -5,7 +5,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.absBase.BaseUMActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
@@ -16,11 +16,6 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -31,7 +26,7 @@ import butterknife.OnClick;
  * Created by ljy on 2018/3/8.
  */
 
-public class LoginAct extends BaseUMActivity implements LoginContract.View {
+public class LoginAct extends BaseActivity implements LoginContract.View {
 
     @Inject
     LoginPresenter mPresenter;
@@ -102,73 +97,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         }
     }
 
-    private void goWeixin() {
-        UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-                showProgress();
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-                mPresenter.logByAuther(1,data.get("access_token"),data.get("openid"));
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                hideProgress();
-                String  str=t.getMessage();
-                if(str.indexOf("2008")>0) {
-                    showToast("微信授权失败,请先安装微信客户端 在登录吧!");
-
-                }else{
-                    showToast("微信授权失败  请检查网络是否正常");
-
-                }
-
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                showToast("微信授权取消");
-                hideProgress();
-            }
-        });
-
-    }
-
-
-    private void loginQQ() {
-        UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.QQ, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-                 showProgress();
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-//                mPresenter.logByAuther(2,data.get("openid"));
-                mPresenter.logByAuther(2,data.get("access_token"),data.get("openid"));
-
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("QQ授权失败  请检查网络是否正常");
-                hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-
-                hideProgress();
-            }
-        });
-
-
-    }
-
-
     @Override
     public void NetSuccess(int code, String msg, String invitation_code) {
         showToast(msg);
@@ -187,18 +115,12 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
 
 
-    @OnClick({R.id.tel_login_tv, R.id.iv_wx, R.id.iv_qq})
+    @OnClick({R.id.tel_login_tv})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tel_login_tv:
                 goTelLogin();
                 break;
-            case R.id.iv_wx:
-                goWeixin();
-                break;
-            case R.id.iv_qq:
-                loginQQ();
-                break;
         }
     }
 }

+ 0 - 168
app/src/main/java/com/sheep/gamegroup/view/activity/MiddleAct.java

@@ -1,168 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-
-import com.alibaba.fastjson.JSONObject;
-import com.arialyy.aria.core.Aria;
-import com.kfzs.duanduan.react.MainTab;
-import com.sheep.gamegroup.model.entity.JPushMessage;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import java.util.Locale;
-
-import cn.jpush.android.api.JPushInterface;
-import rx.functions.Action1;
-
-import static com.sheep.gamegroup.view.activity.CommitWxCodeAct.ALTER_CODE;
-import static com.sheep.gamegroup.view.activity.CommitWxCodeAct.ALTER_INFO;
-import static com.sheep.gamegroup.view.activity.CommitWxCodeAct.HAS_DEBLOCKED;
-
-/**
- * Created by realicing on 2018/5/10.
- * realicing@sina.com
- */
-public class MiddleAct extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        try {
-            doAction();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        this.finish();
-    }
-    private void doAction(){
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            /**
-             *  key = app,value = com.sheep.jiuyan.samllsheep
-             *  key = cn.jpush.android.ALERT,value = 带有参数的通知
-             *  key = cn.jpush.android.EXTRA,value = {"id":"976873","name":"zjb"}
-             *  key = cn.jpush.android.NOTIFICATION_ID,value = 185860616
-             *  key = cn.jpush.android.ALERT_TYPE,value = 7
-             *  key = cn.jpush.android.NOTIFICATION_CONTENT_TITLE,value = 小绵羊
-             *  key = cn.jpush.android.MSG_ID,value = 2150932953
-             *  key = sdktype,value = JPUSH
-             */
-            for (String key : bundle.keySet()) {
-                if (BuildConfig.DEBUG)
-                    System.out.println(String.format(Locale.CHINA, "key = %s,value = %s", key, bundle.get(key)));
-                if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
-//                    sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
-                } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
-//                    sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
-                } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
-                    String data;
-                    if (TextUtils.isEmpty((data = bundle.getString(JPushInterface.EXTRA_EXTRA)))) {
-                        continue;
-                    }
-                    JPushMessage msg = JSONObject.parseObject(data, JPushMessage.class);
-                    Activity activity = this;
-                    switch (msg.getType()) {
-                        case 11://试玩赚钱
-                            Jump2View.getInstance().goTryplayView(activity, null);
-                            break;
-                        case 12://任务详情: 任务的id
-                            Jump2View.getInstance().goTaskDetailView(activity, msg.getId());
-                            break;
-                        case 13://任务记录
-                            Jump2View.getInstance().goTaskList2View(activity, null);
-                            break;
-                        case 21://邀请赚钱
-                            Jump2View.getInstance().goAskGetMoney(activity, null);
-                            break;
-                        case 31://办卡赚钱
-                            Jump2View.getInstance().goCreditCardTaskList(activity, null);
-                            break;
-                        case 32://跳转到信用卡详情界面: id 信用卡任务的id
-                            Jump2View.getInstance().goCreditCardTaskDetail(activity, msg.getId());
-                            break;
-                        case 33://跳转到信用卡web申请界面; id 信用卡信息的id
-                            Jump2View.getInstance().tryGoCreditCardWeb(activity, msg.getId(), new Action1<String>() {
-                                @Override
-                                public void call(String msg) {
-                                    if(msg != null){
-                                        G.showToast(msg);
-                                    }
-                                }
-                            });
-                            break;
-                        case 41://躺着赚钱
-                            Jump2View.getInstance().tryGoLyingView(activity, null);
-                            break;
-                        case 42://跳转到修改 挂机微信账号密码 到服务器 界面
-                            Jump2View.getInstance().goCommitWxCodeOnHookView(activity, msg.getId(), msg.getMsg(), ALTER_INFO);
-                            break;
-                        case 43://跳转到提交 挂机微信验证码 到服务器 界面
-                            Jump2View.getInstance().goCommitWxCodeOnHookView(activity, msg.getId(), msg.getMsg(), ALTER_CODE);
-                            break;
-                        case 44://跳转到提交 挂机微信账号已经解封 到服务器 界面
-                            Jump2View.getInstance().goCommitWxCodeOnHookView(activity, msg.getId(), msg.getMsg(), HAS_DEBLOCKED);
-                            break;
-                        case 51://微信辅助任务
-                            Jump2View.getInstance().tryGoWxfz(activity, null);
-                            break;
-                        case 61://个人中心
-                            Jump2View.getInstance().goPersonnalCenterView(activity, null);
-                            break;
-                        case 62://提现
-                            Jump2View.getInstance().goWithdrawal(activity, null);
-                            break;
-                        case 621://提现结果页面
-                            Jump2View.getInstance().goWithdrawalResultview(activity, msg.getMsg());
-                            break;
-                        case 63://充值Q币
-                            Jump2View.getInstance().goRechargeQAct(activity,null);
-                            break;
-                        case 64://充值绵羊币
-                            Jump2View.getInstance().goRechargeAct(activity,null);
-                            break;
-                        case 65://我的资产
-                            Jump2View.getInstance().goMyMoney(activity,null);
-                            break;
-                        case 66://安全中心
-                            Jump2View.getInstance().goAccountAndSecurit(activity,null);
-                            break;
-                        case 71://浏览器打开web界面: url h5链接
-                            Jump2View.getInstance().goWeb(activity, msg.getUrl());
-                            break;
-                        case 72://App web界面: url h5链接  title 标题
-                            Jump2View.getInstance().goWeb(activity, msg.getUrl(), TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle());
-                            break;
-
-                        case 1://跳转到首页: id 0,小绵羊 1,游戏
-                            if(msg.getId() == 0)
-                                Jump2View.getInstance().goHomePageView(activity, msg.getId() % MainTab.values().length);
-                            else if(msg.getId() == 1)
-                                Jump2View.getInstance().goMainGame(activity);
-                            break;
-                        case 2://公告: title 标题   msg 内容
-                            Jump2View.getInstance().goNotice(activity, TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle(), msg.getMsg(), msg.getTime() == 0 ? System.currentTimeMillis() : msg.getTime());
-                            break;
-                        case 3://下载: url 下载链接
-                            if(msg.getUrl().startsWith("http"))
-                                TestUtil.webDownload(activity, msg.getUrl());
-                            break;
-                        case 9://打卡赚钱
-                            Jump2View.getInstance().goSignCardAct(activity, null);
-                            break;
-                        case 0://直接启动或者重启app
-                        default:
-                            Jump2View.getInstance().newTaskTopStartAct(activity, SplashAct.class, bundle);
-                            break;
-                    }
-                } else {
-//                    sb.append("\nkey:" + key + ", value:" + bundle.getString(key));
-                }
-            }
-        }
-    }
-}

+ 0 - 13
app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java

@@ -2,14 +2,10 @@ package com.sheep.jiuyan.samllsheep;
 
 
 import com.kfzs.duanduan.KFZSApp;
-import com.umeng.commonsdk.UMConfigure;
-import com.umeng.socialize.PlatformConfig;
-import com.umeng.socialize.UMShareAPI;
 
 import org.xutils.BuildConfig;
 import org.xutils.x;
 
-import cn.jpush.android.api.JPushInterface;
 
 /**
  * Created by Administrator on 2018/1/19.
@@ -23,14 +19,5 @@ public abstract class BaseApplication extends KFZSApp {
         x.Ext.init(this);
         x.Ext.setDebug(BuildConfig.DEBUG); // 是否输出debug日志, 开启debug会影响性能.
 //        ZXingLibrary.initDisplayOpinion(this);
-        UMConfigure.setLogEnabled(true);
-        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
-        UMShareAPI.get(this);
-        PlatformConfig.setWeixin("wx2be7f59bb7bb963f", "6cf7ca0f6c6ac97c6961d901fee8adb9");
-        PlatformConfig.setQQZone("101461115", "b874bc950bcf066f17fd52cf2bb959e9");
-
-        //极光推送
-        JPushInterface.setDebugMode(BuildConfig.DEBUG);
-        JPushInterface.init(this);
     }
 }

+ 0 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -20,7 +20,6 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.tencent.bugly.Bugly;
 
 /**
  * Created by kemllor on 2017/12/21.
@@ -144,7 +143,6 @@ public class SheepApp extends BaseApplication {
         public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
             ActivityManager.getInstance().pushActivity(activity);
             if(mActivityAount == 0) {
-                Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
                 LogUtil.println("SheepApp SHEEP_START");
                 UMConfigUtils.Event.SHEEP_START.onEvent();
             }

+ 0 - 7
app/src/main/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -1,7 +0,0 @@
-package com.sheep.jiuyan.samllsheep.wxapi;
-import com.umeng.socialize.weixin.view.WXCallbackActivity;
-
-public class WXEntryActivity extends WXCallbackActivity {
-
-
-}

BIN=BIN
app/src/main/res/drawable-xxhdpi/icon.png


+ 2 - 0
app/src/main/res/layout/fgt_personalcenter_item_center_two.xml

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="15dp"
+        android:visibility="gone"
         android:gravity="center">
         <ImageView
             android:id="@+id/abourt_us_item_icon_iv"
@@ -43,6 +44,7 @@
         android:background="@color/white_bg_line"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
+        android:visibility="gone"
         />
 
     <RelativeLayout

+ 1 - 0
app/src/main/res/layout/login_act_layout.xml

@@ -35,6 +35,7 @@
             android:orientation="horizontal"
             android:layout_above="@+id/tel_login_tv"
             android:layout_centerHorizontal="true"
+            android:visibility="gone"
             >
 
             <View

+ 2 - 0
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -399,6 +399,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
+                android:visibility="gone"
                 >
                 <ImageView
                     android:id="@+id/iv_wx"
@@ -452,6 +453,7 @@
                     android:src="@mipmap/x_ic_qq"
                     android:layout_alignParentStart="true"
                     android:layout_marginEnd="@dimen/content_padding_10"
+                    android:visibility="gone"
 
                     />
 

BIN=BIN
app/src/main/res/mipmap-xhdpi/icon.png