Merge branch 'sheep2.0' of 10.8.230.114:kemllor/small_sheep_android into sheep2.0

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'
@@ -123,16 +119,13 @@ dependencies {
     //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
     //        exclude group: 'com.android.support', module: 'support-annotations'
     //    })
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:support-v4:27.0.2'
     compile 'com.android.support:design:27.0.2'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     //    compile 'com.shark:screencapture:1.0.0'
-    compile 'com.google.code.gson:gson:2.7'
+    compile 'com.google.code.gson:gson:2.8.2'
     compile 'com.jcodecraeer:xrecyclerview:1.5.2'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.squareup.okhttp3:okhttp:3.9.1'
+    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'
@@ -148,7 +141,8 @@ dependencies {
     compile 'com.mylhyl:acp:1.1.7'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
     compile 'com.github.huburt-Hu:NewbieGuide:v1.2.0'
-    compile 'com.android.support:multidex:1.0.1'
+    debugCompile 'com.android.support:multidex:1.0.1'
+    releaseCompile 'com.android.support:multidex:1.0.3'
     compile(name: 'com.kfzs.safe', ext: 'aar')
 
     //butterknife
@@ -183,29 +177,15 @@ dependencies {
     compile 'com.alibaba:fastjson:+'
 
     //添加半袋米相关
-//    compile 'com.jakewharton:butterknife:8.1.0'
-//    annotationProcessor 'com.jakewharton:butterknife-compiler:8.1.0'
     compile(name: 'appstoreutils', ext: 'aar')
     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.google.code.gson:gson:2.8.1'
-
-    //    compile 'com.android.support:design:24.2.0'
     compile 'com.flipboard:bottomsheet-core:1.5.3'
     compile 'com.flipboard:bottomsheet-commons:1.5.3'
-    //    compile 'org.greenrobot:greendao:3.2.0'
     compile 'com.google.protobuf:protobuf-java:3.2.0'
     compile 'com.umeng.analytics:analytics:6.0.9'
-    compile(name: 'com.kfzs.safe', ext: 'aar')
     compile(name: 'FileDownloader-1.0.0', ext: 'aar')
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.yalantis:ucrop:2.2.0'
     //    compile files('libs/SocialSDK_QQ_Simplify.jar')
 
 //    compile files('libs/SocialSDK_Sina_Simplify.jar')
@@ -228,22 +208,14 @@ dependencies {
     compile files('libs/SocialSDK_QQ_Full.jar')
 
     compile 'com.zhy:okhttputils:2.6.2'
-    compile files('libs/alipaySdk-20170922.jar')
-    compile 'com.github.bumptech.glide:glide:3.5.2'
-    compile 'jp.wasabeef:glide-transformations:2.0.2'
-    compile 'com.nineoldandroids:library:2.4.0'
-    compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
-    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'
     compile 'com.kf.framework:volleyplus:1.4.5@aar'
-    compile 'com.android.support:support-annotations:23.1.1'
-    compile 'com.android.support:recyclerview-v7:27.1.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.1.6'
-    compile 'top.zibin:Luban:1.0.9'
+    compile 'com.android.support:support-annotations:27.0.2'
+    compile 'com.android.support:recyclerview-v7:27.0.2'
     compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')
+    compile 'io.reactivex:rxandroid:1.2.1'
 }

app/src/main/AndroidManifest.xml

@@ -174,6 +174,10 @@
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">
 
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN"/>-->
+                <!--<category android:name="android.intent.category.LAUNCHER"/>-->
+            <!--</intent-filter>-->
         </activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskRewardAct"
@@ -241,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" />
@@ -251,30 +252,12 @@
             android:name="com.kfzs.duanduan.ActGameDetails"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.kfzs.duanduan.ActLogin"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.kfzs.duanduan.ActRegist"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.kfzs.duanduan.ActDuJiaShouFa"
             android:screenOrientation="portrait" />
         <activity
             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.ActPersonPage"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.kfzs.duanduan.ActFeedback"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.kfzs.duanduan.ActNewGameBook"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.kfzs.duanduan.ActGategoryRank"
             android:screenOrientation="portrait" />
         <activity
@@ -299,77 +282,6 @@
             android:name="com.kfzs.duanduan.services.KFDownloadServices"
             android:exported="false" />
 
-        <activity
-            android:name="com.kfzs.duanduan.ActUser"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTask"
-            android:parentActivityName="com.kfzs.duanduan.ActMain"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateHidden">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.kfzs.duanduan.ActMain" />
-        </activity>
-
-        <activity
-            android:name="com.kfzs.duanduan.ActAuth"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
-
-        <activity
-            android:name="com.kfzs.duanduan.ActTest"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:hardwareAccelerated="false"
-            android:label="测试Act"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateHidden">
-            <!--<intent-filter>-->
-            <!--<action android:name="android.intent.action.MAIN" />-->
-            <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
-        </activity>
-
-        <activity
-            android:name="com.kfzs.duanduan.ActAccountManage"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
-
-        <!--android:hardwareAccelerated="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" />
-        <activity
-            android:name="com.umeng.socialize.editorpage.ShareActivity"
-            android:excludeFromRecents="true"
-            android:theme="@style/Theme.UMDefault" />
-
-
         <provider
             android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider"
             android:authorities="com.kfzs.duanduan.data.graph.provider.${DUANDUAN_GRAPH}"

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

@@ -1,311 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.kfzs.duanduan.data.graph.KFZSUserHelper;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.event.AccountManagementEvent;
-import com.kfzs.duanduan.event.ReStartEvent;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.kfzs.duanduan.utils.sys.HomeListenByBroadcast;
-import com.kfzs.duanduan.fragment.ManagementAccountFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import mdl.sinlov.android.log.ALog;
-
-public class ActAccountManage extends BaseCompatActivity {
-    public static final int JOB_FINISH_SELF_BY_ERROR = -2;
-    public static final int JOB_FINISH_SELF_BY_SUCCESS = -1;
-    public static final int JOB_CHANGE_TITLE = 1;
-    public static final int JOB_CODE_LOGIN = 2;
-    public static final int JOB_NEW_ACCOUNT = 3;
-    public static final int JOB_NEW_ACCOUNT_SUCCESS = 4;
-    public static final int JOB_REPLACE_HEAD_ACCOUNT = 5;
-    public static final int JOB_CHANGE_ACCOUNT_SHOW_LIST = 6;
-    public static final int JOB_CHANGE_ACCOUNT_BY_CHECK = 7;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION = 8;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION_SUCCESS = 9;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK = 10;
-    public static final int JOB_NEW_ACCOUNT_CERTIFICATION = 11;
-    public static final int JOB_REMOVE_ACCOUNT = 12;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_CHECK = 13;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD = 14;
-    public static final int JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_SUCCESS = 15;
-    public static final String KEY_SKIP_JOB_CODE = ActAccountManage.class.getCanonicalName() + ".job";
-    public static final String KEY_CHANGE_ACCOUNT_BY_ACTION = "key:change:account:by:action";
-    public static final String EXTRAS_NEED_GET_TOKEN = "extras:act:game:certification:need:get:token:string";
-    public static final String EXTRAS_NEED_GET_UID = "extras:act:game:certification:need:get:uid:string";
-    public static final String EXTRAS_NEED_GET_NICKNAME = "extras:act:game:certification:need:get:nickname:string";
-    public static final String EXTRAS_NEED_GET_OPENID = "extras:act:game:certification:need:get:openid:string";
-    @BindView(R.id.fl_act_management_account_replace_fgt)
-    FrameLayout flActManagementAccountReplaceFgt;
-    @BindView(R.id.nsv_content_management_account)
-    NestedScrollView nsvContentManagementAccount;
-
-    private String titleString = "";
-    private Bundle extras;
-    private HomeListenByBroadcast homeListenByBroadcast;
-    public boolean isCertification = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        homeListenByBroadcast = new HomeListenByBroadcast(this);
-        EventBus.getDefault().register(this);
-        setContentView(R.layout.activity_management_account);
-
-        ButterKnife.bind(this);
-        TitleBarUtils.getInstance().setTitleFinish(this)
-                .setTitle(this, getString(R.string.title_management_activity_account));
-        initListeners();
-        extras = getIntent().getExtras();
-        if (extras != null) {
-            int skipCode = extras.getInt(KEY_SKIP_JOB_CODE, 0);
-            AccountManagementEvent event = new AccountManagementEvent();
-            event.setSkipCode(skipCode);
-            filterSkipJobByCode(event);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        homeListenByBroadcast.start();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        homeListenByBroadcast.stop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    private void filterSkipJobByCode(final AccountManagementEvent accountManagementEvent) {
-        int skipCode = accountManagementEvent.getSkipCode();
-        ALog.i("accountManagementEvent skipCode: " + skipCode);
-        switch (skipCode) {
-            case JOB_CHANGE_TITLE:
-                setActionBarTitle(accountManagementEvent.getTitleID());
-                break;
-            case JOB_FINISH_SELF_BY_ERROR:
-                ALog.d("error: " + accountManagementEvent.getMsg());
-                showToast(accountManagementEvent.getMsg());
-                ActAccountManage.this.finish();
-                break;
-            case JOB_FINISH_SELF_BY_SUCCESS:
-                ALog.d("success: " + accountManagementEvent.getMsg());
-                showToast(accountManagementEvent.getMsg());
-                ActAccountManage.this.finish();
-                break;
-            case JOB_CODE_LOGIN:
-                Bundle loginBundle = new Bundle();
-                loginBundle.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_LOGIN);
-                skip2Activity(ActAuth.class, loginBundle);
-                ActAccountManage.this.finish();
-                break;
-            case JOB_CHANGE_ACCOUNT_SHOW_LIST:
-                Bundle caShowList = new Bundle(extras);
-                caShowList.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_DEFAULT);
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), caShowList, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CHANGE_ACCOUNT_BY_CHECK:
-                Bundle changeAccountByCheck = new Bundle(extras);
-                changeAccountByCheck.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD);
-                changeAccountByCheck.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, accountManagementEvent.getNewUid());
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), changeAccountByCheck, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION:
-                isCertification = true;
-                Bundle changeAccountCModeBundle = new Bundle(extras);
-                changeAccountCModeBundle.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION);
-                changeAccountCModeBundle.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, accountManagementEvent.getNewUid());
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), changeAccountCModeBundle, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION_SUCCESS:
-                extras.putInt(ActGameCertification.SKIP_CODE_USER_BEHAVIOR, ActGameCertification.JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS);
-                extras.putString(ActGameCertification.EXTRAS_NEED_GET_TOKEN, accountManagementEvent.getToken());
-                skip2Activity(ActGameCertification.class, extras);
-                ActAccountManage.this.finish();
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK:
-                Bundle checkChangeAccountCModeBundle = new Bundle(extras);
-                checkChangeAccountCModeBundle.putString(EXTRAS_NEED_GET_TOKEN, accountManagementEvent.getToken());
-                checkChangeAccountCModeBundle.putString(EXTRAS_NEED_GET_UID, accountManagementEvent.getNewUid() + "");
-                checkChangeAccountCModeBundle.putString(EXTRAS_NEED_GET_NICKNAME, accountManagementEvent.getNickName());
-                checkChangeAccountCModeBundle.putString(EXTRAS_NEED_GET_OPENID, accountManagementEvent.getOpenId());
-                checkChangeAccountCModeBundle.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK);
-                int newUid = accountManagementEvent.getNewUid();
-                if (newUid == 0) {
-                    newUid = extras.getInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, 0);
-                }
-                checkChangeAccountCModeBundle.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, newUid);
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), checkChangeAccountCModeBundle, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_NEW_ACCOUNT:
-                Bundle newAccount = new Bundle();
-                newAccount.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_NEW_ACCOUNT);
-                skip2Activity(ActAuth.class, newAccount);
-                //                ActAccountManage.this.finish();
-                break;
-            case JOB_NEW_ACCOUNT_CERTIFICATION:
-                Bundle newAccountCertification = new Bundle(extras);
-                newAccountCertification.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_LOGIN_CERTIFICATION);
-                skip2Activity(ActAuth.class, newAccountCertification);
-                ActAccountManage.this.finish();
-                break;
-            case JOB_NEW_ACCOUNT_SUCCESS:
-                Bundle newAccountSuccess = new Bundle();
-                newAccountSuccess.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_NEW_ACCOUNT_CHECK);
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), newAccountSuccess, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_REPLACE_HEAD_ACCOUNT:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle("是否切换帐户");
-                builder.setMessage("昵称:" + accountManagementEvent.getNickName() + "\n");
-                builder.setPositiveButton(R.string.btn_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Bundle replaceHeadAccount = new Bundle();
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD);
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, accountManagementEvent.getNewUid());
-                        replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(),
-                                replaceHeadAccount, false,
-                                AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                    }
-                });
-                builder.setNegativeButton(R.string.btn_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-
-                    }
-                });
-                builder.create().show();
-                break;
-            case JOB_REMOVE_ACCOUNT:
-                AlertDialog.Builder removeBuilder = new AlertDialog.Builder(this);
-                removeBuilder.setTitle("是否移除帐户");
-                removeBuilder.setMessage("昵称:" + accountManagementEvent.getNickName() + "\n");
-                removeBuilder.setPositiveButton(R.string.btn_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Bundle replaceHeadAccount = new Bundle();
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REMOVE_ONE);
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_REMOVE_UID, accountManagementEvent.getNewUid());
-                        replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), replaceHeadAccount, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                    }
-                });
-                removeBuilder.setNegativeButton(R.string.btn_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-
-                    }
-                });
-                removeBuilder.create().show();
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_CHECK:
-                final int uuid = extras.getInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID);
-                String uNickName = "";
-                List<UserBean> userBeen = KFZSUserHelper.getInstance().checkOutFullUser(app);
-                for (UserBean user : userBeen) {
-                    if (uuid == user.getUid()) {
-                        uNickName = user.getNickname();
-                    }
-                }
-                AlertDialog.Builder builderChangePwd = new AlertDialog.Builder(this);
-                builderChangePwd.setTitle("是否换帐户，来修改密码");
-                builderChangePwd.setMessage("昵称:" + uNickName + "\n");
-                builderChangePwd.setPositiveButton(R.string.btn_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Bundle replaceHeadAccount = new Bundle(extras);
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD_CHECK);
-                        replaceHeadAccount.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, uuid);
-                        replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), replaceHeadAccount, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                    }
-                });
-                builderChangePwd.setNegativeButton(R.string.btn_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        extras.putInt(ActGameCertification.SKIP_CODE_USER_BEHAVIOR, ActGameCertification.JOB_CHANGE_ACCOUNT_CANCEL);
-                        skip2Activity(ActGameCertification.class, extras);
-                        ActAccountManage.this.finish();
-                    }
-                });
-                builderChangePwd.create().show();
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD:
-                Bundle changeAccountSuccessByChangePassword = new Bundle(extras);
-                changeAccountSuccessByChangePassword.putInt(ManagementAccountFragment.KEY_ACCOUNT_TYPE, ManagementAccountFragment.TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD);
-                replaceSupportFragment(R.id.fl_act_management_account_replace_fgt, new ManagementAccountFragment(), changeAccountSuccessByChangePassword, false, AccountManagementEvent.CHANGE_ACCOUNT, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_SUCCESS:
-                Bundle changePsd = new Bundle(extras);
-                changePsd.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_SELF_CHANGE_PASSWORD_BY_CERTIFICATION);
-                skip2Activity(ActAuth.class, changePsd);
-                this.finish();
-                break;
-            default:
-                showToast("默认帐户管理行为为错误行为,关闭管理界面");
-                ActAccountManage.this.finish();
-                break;
-        }
-    }
-
-    private void initListeners() {
-        homeListenByBroadcast.setOnHomeBtnPressListener(new HomeListenByBroadcast.OnHomeBtnPressListener() {
-            @Override
-            public void onHomeBtnPress() {
-                ActAccountManage.this.finish();
-            }
-
-            @Override
-            public void onHomeBtnLongPress() {
-
-            }
-        });
-    }
-
-    @Subscribe
-    public void onEventMainThread(ReStartEvent startEvent) {
-        if (startEvent != null && startEvent.isReStart()) {
-            Intent intent = getIntent();
-            finish();
-            startActivity(intent);
-        }
-    }
-
-    @Subscribe
-    public void onEventMainThread(AccountManagementEvent accountManagementEvent) {
-        filterSkipJobByCode(accountManagementEvent);
-    }
-
-
-    protected void setActionBarTitle(@StringRes int resId) {
-        titleString = getString(resId);
-        TitleBarUtils.getInstance().setTitle(this, titleString);
-    }
-}

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

@@ -1,374 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.widget.NestedScrollView;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.CertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDCertificationDog;
-import com.kfzs.duanduan.db.UserGraphUtils;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.ReStartEvent;
-import com.kfzs.duanduan.fragment.AuthBindPhoneFragment;
-import com.kfzs.duanduan.fragment.ChangeSelfNickNameFragment;
-import com.kfzs.duanduan.fragment.ChangeSelfPasswordFragment;
-import com.kfzs.duanduan.fragment.ManagementAccountFragment;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.sheep.jiuyan.samllsheep.R;
-import com.umeng.socialize.UMShareAPI;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import mdl.sinlov.android.log.ALog;
-
-/**
- * 这些类写得就像一索粑粑，sign.Diao
- */
-public class ActAuth extends BaseCompatActivity {
-    public static final int JOB_CHANGE_EXTRAS = 0;
-    public static final int JOB_CODE_SELF_UPDATE_USER_INFO_HEAD = -1;
-    public static final int JOB_CODE_SELF_UPDATE_USER_INFO_HEAD_CERTIFICATION_NO_NEED_LOGIN = -2;
-    public static final int JOB_FINISH_SELF = 1;
-    public static final int JOB_CHANGE_TITLE = 1 << 1;
-    public static final int JOB_CODE_LOGIN = 2 << 1;
-    public static final int JOB_CODE_LOGIN_CERTIFICATION = 3 << 1;
-    public static final int JOB_CODE_LOGIN_CERTIFICATION_SUCCESS = 4 << 1;
-    public static final int JOB_CODE_REGISTER_PHONE = 5 << 1;
-    public static final int JOB_CODE_REGISTER_ORDINARY = 6 << 1;
-    public static final int JOB_CODE_FORGET_PASSWORD = 7 << 1;
-    public static final int JOB_CODE_NEW_ACCOUNT = 8 << 1;
-    public static final int JOB_CODE_NEW_ACCOUNT_SUCCESS = 9 << 1;
-    public static final int JOB_CODE_NEW_ACCOUNT_CERTIFICATION = 10 << 1;
-    public static final int JOB_CODE_NEW_ACCOUNT_CERTIFICATION_SUCCESS = 11 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_PASSWORD = 12 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_NICKNAME = 13 << 1;
-    public static final int JOB_CODE_SELF_BIND_PHONE = 14 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_PASSWORD_BY_CERTIFICATION = 15 << 1;
-    public static final int JOB_CODE_SELF_LOGIN_BY_CHANGE_PASSWORD_CERTIFICATION = 16 << 1;
-    public static final int JOB_CODE_SELF_BIND_PHONE_BY_CERTIFICATION = 17 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_NICK_NAME_BY_CERTIFICATION = 18 << 1;
-    public static final String KEY_SKIP_JOB_CODE = ActAuth.class.getCanonicalName() + ".job";
-
-    @BindView(R.id.fl_act_auth_replace_fgt)
-    FrameLayout flActAuthReplaceFgt;
-    @BindView(R.id.nsv_content_auth)
-    NestedScrollView nsvContentAuth;
-    private Bundle extras;
-    private String titleString;
-    private KFZSDDCertificationDog certificationDog;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
-
-        setContentView(R.layout.activity_auth);
-        ButterKnife.bind(this);
-        certificationDog = KFZSDDCertificationDog.getInstance();
-        certificationDog.init(this.getApplication(), new CertificationDog() {
-            @Override
-            public void onCertificationCodeCallBack(User user, String gamePackageName, String gameCode, String extrasString) {
-                try {
-                    if (certificationDog != null) {
-                        certificationDog.doCertificationCancel();
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void onCertificationSuccess() {
-                KFZSApp.getInstance().quit();
-
-            }
-
-            @Override
-            public void onCertificationCancel() {
-                KFZSApp.getInstance().quit();
-
-            }
-
-            @Override
-            public void onLoginJob() {
-
-            }
-
-            @Override
-            public void onError(int errorCode, String msg) {
-
-            }
-        });
-        TitleBarUtils.getInstance().setTitleListen(this, -1, new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                InputMethodUtils.closeInputPan(ActAuth.this);
-                //                ActAuth.this.finish();
-                try {
-                    if (certificationDog != null) {
-                        certificationDog.doCertificationCancel();
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                onBackPressed();
-                //finish();
-            }
-        });
-        extras = getIntent().getExtras();
-        if (extras != null) {
-            int skipCode = extras.getInt(KEY_SKIP_JOB_CODE, 0);
-            AuthEvent event = new AuthEvent();
-            event.setSkipCode(skipCode);
-            filterSkipJobByCode(event);
-        }
-        TitleBarUtils.getInstance().setRightBotton(this, "注册", -1,
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        AuthEvent authEvent = new AuthEvent();
-                        authEvent.setSkipCode(ActAuth.JOB_CODE_REGISTER_PHONE);
-                        EventBus.getDefault().post(authEvent);
-                    }
-                });
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Subscribe
-    public void onEventMainThread(AuthEvent authEvent) {
-        filterSkipJobByCode(authEvent);
-    }
-
-    private void filterSkipJobByCode(AuthEvent authEvent) {
-        int skipCode = authEvent.getSkipCode();
-        switch (skipCode) {
-            case JOB_CHANGE_TITLE:
-                titleString = getString(authEvent.getTitleID());
-                TitleBarUtils.getInstance().setTitle(ActAuth.this, titleString);
-                TitleBarUtils.getInstance().setRightBtnVisibility(ActAuth.this,
-                        authEvent.getTitleID() == R.string.title_user_activity_login ? View.VISIBLE : View.GONE);
-                break;
-            case JOB_FINISH_SELF:
-                removeAllFragment();
-                this.finish();
-                break;
-            case JOB_CHANGE_EXTRAS:
-                String extrasKey = authEvent.getExtrasKey();
-                String extrasValue = authEvent.getExtrasValue();
-                if (!TextUtils.isEmpty(extrasKey) && !TextUtils.isEmpty(extrasValue)) {
-                    extras.putString(extrasKey, extrasValue);
-                } else {
-                    ALog.w("empty extrasKey: " + extrasKey + " |extrasValue: " + extrasValue);
-                }
-                break;
-            case JOB_CODE_SELF_UPDATE_USER_INFO_HEAD:
-                updateHeadUserGraph(false, true);
-                break;
-            case JOB_CODE_SELF_UPDATE_USER_INFO_HEAD_CERTIFICATION_NO_NEED_LOGIN:
-                updateHeadUserGraph(true, false);
-                break;
-            case JOB_CODE_LOGIN:
-                SkipUtils.getInstance().goLogin(this);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_LOGIN_CERTIFICATION_SUCCESS:
-                extras.putInt(ActGameCertification.SKIP_CODE_USER_BEHAVIOR, ActGameCertification.JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS);
-                extras.putBoolean(getString(R.string.kfzs_duanduan_datashare_certificationed), authEvent.isAuth());
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_userid), String.valueOf(authEvent.getNewUid()));
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_token), authEvent.getToken());
-                skip2Activity(ActGameCertification.class, extras);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_LOGIN_CERTIFICATION:
-                SkipUtils.getInstance().goLogin(this, ActLogin.LOGIN_TYPE_IS_CERTIFICATION);
-                ActAuth.this.finish();
-                break;
-//            case JOB_CODE_REGISTER_PHONE:
-//                SkipUtils.getInstance().goRegist(this,ActLogin.LOGIN_TYPE_IS_CERTIFICATION);
-//                finish();
-//                break;
-//            case JOB_CODE_REGISTER_ORDINARY:
-//                SkipUtils.getInstance().goRegist(this,ActLogin.LOGIN_TYPE_IS_CERTIFICATION);
-//                finish();
-//                break;
-//          case JOB_CODE_FORGET_PASSWORD:
-//                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new AuthForgetPasswordFragment(),
-//                        true, AuthEvent.FORGET_PASSWORD_TAG, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-//                break;
-            case JOB_CODE_NEW_ACCOUNT:
-                SkipUtils.getInstance().goLogin(this, ActLogin.LOGIN_TYPE_CODE_IS_NEW_ACCOUNT);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_NEW_ACCOUNT_CERTIFICATION:
-                SkipUtils.getInstance().goLogin(this, ActLogin.LOGIN_TYPE_CODE_IS_NEW_ACCOUNT_CERTIFICATION);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_NEW_ACCOUNT_SUCCESS:
-                ReStartEvent event = new ReStartEvent();
-                event.setReStart(true);
-                EventBus.getDefault().post(event);
-                Bundle newAccountSuccess = new Bundle(extras);
-                newAccountSuccess.putInt(ActAccountManage.KEY_SKIP_JOB_CODE,
-                        ActAccountManage.JOB_NEW_ACCOUNT_SUCCESS);
-                skip2Activity(ActAccountManage.class, newAccountSuccess);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_NEW_ACCOUNT_CERTIFICATION_SUCCESS:
-                Bundle newAccountModeCSuccess = new Bundle(extras);
-                newAccountModeCSuccess.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, authEvent.getNewUid());
-                newAccountModeCSuccess.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK);
-                skip2Activity(ActAccountManage.class, newAccountModeCSuccess);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_SELF_CHANGE_PASSWORD:
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new ChangeSelfPasswordFragment(), true, AuthEvent.CHANGE_PASSWORD, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_CHANGE_NICKNAME:
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new ChangeSelfNickNameFragment(), true, AuthEvent.CHANGE_NICKNAME, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_BIND_PHONE:
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new AuthBindPhoneFragment(), false, AuthEvent.CHANGE_NICKNAME, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_CHANGE_PASSWORD_BY_CERTIFICATION:
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new ChangeSelfPasswordFragment(), extras, true, AuthEvent.CHANGE_PASSWORD, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_LOGIN_BY_CHANGE_PASSWORD_CERTIFICATION:
-                SkipUtils.getInstance().goLogin(this, ActLogin.LOGIN_TYPE_IS_CERTIFICATION);
-                ActAuth.this.finish();
-                break;
-            case JOB_CODE_SELF_BIND_PHONE_BY_CERTIFICATION:
-                Bundle certificationBindPhoneBundle = new Bundle(extras);
-                certificationBindPhoneBundle.putInt(AuthBindPhoneFragment.KEY_BIND_TYPE, AuthBindPhoneFragment.BIND_TYPE_IS_CERTIFICATION);
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new AuthBindPhoneFragment(), certificationBindPhoneBundle, false, AuthEvent.CHANGE_NICKNAME, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_CHANGE_NICK_NAME_BY_CERTIFICATION:
-                Bundle certificationChangeNickNameBundle = new Bundle(extras);
-                certificationChangeNickNameBundle.putInt(ChangeSelfNickNameFragment.KEY_CHANGE_TYPE, ChangeSelfNickNameFragment.CHANGE_TYPE_IS_CERTIFICATION);
-                replaceSupportFragment(R.id.fl_act_auth_replace_fgt, new ChangeSelfNickNameFragment(), certificationChangeNickNameBundle, true, AuthEvent.CHANGE_NICKNAME, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            default:
-                ALog.w("develop use error JOB Code: " + skipCode);
-                break;
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-    }
-
-    private void updateHeadUserGraph(final boolean isCertification, final boolean isNeedLogin) {
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(app, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                needLogin(isCertification);
-            }
-        });
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF,
-                null, new OnHeadSessionUserGraph(isCertification, isNeedLogin), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        private final boolean isCertification;
-        private final boolean isNeedLogin;
-
-        public OnHeadSessionUserGraph(boolean isCertification, boolean isNeedLogin) {
-            this.isCertification = isCertification;
-            this.isNeedLogin = isNeedLogin;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        UserBean userGraph = UserGraphUtils.saveNewUserGraph(user);
-                        if (userGraph != null) {
-                            closeSelf(isNeedLogin, isCertification);
-                        } else {
-                            if (isNeedLogin) {
-                                needLogin(isCertification);
-                            }
-                        }
-                    } else {
-                        if (isNeedLogin) {
-                            needLogin(isCertification);
-                        }
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    ALog.d("popHeadToken: Unauthorized_VALUE");
-                    if (isNeedLogin) {
-                        needLogin(isCertification);
-                    }
-                    break;
-                default:
-                    if (isNeedLogin) {
-                        needLogin(isCertification);
-                    }
-                    break;
-            }
-
-        }
-    }
-
-    private void closeSelf(boolean isNeedLogin, boolean isCertification) {
-        if (isCertification && !isNeedLogin) {
-            extras.putBoolean(ActGameCertification.EXTRAS_NEED_GET_CODE, false);
-            skip2Activity(ActGameCertification.class, extras);
-            ActAuth.this.finish();
-        }
-        InputMethodUtils.closeInputPan(this);
-        this.finish();
-    }
-
-    private void needLogin(boolean isCertification) {
-        AuthEvent loginEvent = new AuthEvent();
-        if (isCertification) {
-            loginEvent.setSkipCode(JOB_CODE_LOGIN_CERTIFICATION);
-        } else {
-            loginEvent.setSkipCode(JOB_CODE_LOGIN);
-        }
-        EventBus.getDefault().post(loginEvent);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
-            certificationDog.doCertificationCancel();
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-}

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

@@ -1,121 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.AdviceOuterClass;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.HashMap;
-
-/**
- * zjb  2017-08-08
- */
-public class ActFeedback extends BaseCompatActivity {
-
-    private EditText mEdtContact;
-    private EditText mEdtContent;
-    private String[] mTypes;
-    private int mIntSelectType = -1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_feedback);
-
-        TitleBarUtils.getInstance().setTitleFinish(this)
-                .setTitle(this, getString(R.string.nav_main_activity_action_feedback));
-        mEdtContact = (EditText) findViewById(R.id.btn_activity_feedback_contact);
-        mEdtContent = (EditText) findViewById(R.id.btn_activity_feedback_content);
-        mTypes = getResources().getStringArray(R.array.type_feedback);
-
-        findViewById(R.id.btn_activity_feedback).setOnClickListener(cls_Submit);
-
-        findViewById(R.id.txt_activity_feedback_type)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(final View v) {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(ActFeedback.this);
-                        builder.setTitle("请选择反馈类型");
-                        builder.setSingleChoiceItems(mTypes, mIntSelectType, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                mIntSelectType = which;
-                                ((TextView) v).setText(mTypes[which]);
-                                dialog.dismiss();
-                            }
-                        });
-                        builder.create().show();
-                    }
-                });
-    }
-
-
-    /**
-     * 提交
-     *
-     * @param view
-     */
-    private View.OnClickListener cls_Submit = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (!KFZSDDContentSession.getInstance().isHasHeadSession(ActFeedback.this)) {
-                showToast(getString(R.string.toast_user_login_pre));
-                SkipUtils.getInstance().goLogin(ActFeedback.this);
-                return;
-            }
-            if (mIntSelectType < 0) {
-                showToast("请选择反馈类型哦~");
-                return;
-            }
-            if (mEdtContent.length() < 1) {
-                showToast("请输入至少6字建议哦~");
-                return;
-            }
-            HashMap<String, String> params = new HashMap<>();
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(ActFeedback.this).getToken();
-            params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            AdviceOuterClass.Advice.Builder builder
-                    = AdviceOuterClass.Advice.newBuilder();
-            builder.setAdviceContent(mEdtContent.getText().toString());
-            builder.setContactWay(mEdtContact.getText().toString());
-            builder.setType(mIntSelectType + 1);
-            reqBuild.setAdvice(builder);
-
-            APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AppStoreApi.ADVICE,
-                    params, reqBuild.build().toByteArray(), new ResponseNetworkTask() {
-                        @Override
-                        public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                            showToast("提交成功，感谢您的支持！");
-                            finish();
-                        }
-
-                        @Override
-                        public void onFail(int code, String msg) {
-                            showToast(msg);
-                        }
-                    }, HelperUtils.makeErr("网络错误，请稍后再试。"));
-            KFZSNetwork.addRequest(apiRequest);
-        }
-    };
-
-}

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

@@ -1,639 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.CertificationDog;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDCertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.utils.ApkUtils;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Sdk;
-import com.kfzs.duanduan.proto.UpdateContentOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.dlg.UpdateUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.view.DialogUpdateFragment;
-import com.kfzs.duanduan.fragment.ManagementAccountFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import mdl.sinlov.android.log.ALog;
-
-public class ActGameCertification extends BaseCompatActivity {
-
-    public static final String SKIP_CODE_USER_BEHAVIOR = "skip:code:act:game:certification:user:behavior";
-    public static final String EXTRAS_NEED_GET_CODE = "extras:act:game:certification:need:get:code:boolean";
-    public static final String EXTRAS_NEED_GET_TOKEN = "extras:act:game:certification:need:get:token:string";
-    public static final int JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS = 1 << 1;
-    public static final int JOB_CHANGE_ACCOUNT_CANCEL = 2 << 1;
-    public static final long SKIP_TIME = 3000;
-
-    @BindView(R.id.img_act_game_certification_self)
-    ImageView imgFgtGameCertificationSelf;
-    @BindView(R.id.img_act_game_certification_target)
-    ImageView imgFgtGameCertificationTarget;
-    @BindView(R.id.tv_act_game_certification_now)
-    TextView tvFgtGameCertificationNow;
-    @BindView(R.id.tv_act_game_certification_change_account)
-    TextView tvFgtGameCertificationChangeAccount;
-    @BindView(R.id.btn_act_game_certification)
-    Button btnFgtGameCertification;
-    @BindView(R.id.tv_act_game_certification_self)
-    TextView tvActGameCertificationSelf;
-    @BindView(R.id.tv_act_game_certification_target)
-    TextView tvActGameCertificationTarget;
-    @BindView(R.id.ll_act_game_certification_content)
-    LinearLayout llActGameCertificationContent;
-    private KFZSDDCertificationDog certificationDog;
-    private ProgressDialog progressDialog;
-    private boolean isAuthOutOfTime = false;
-    private boolean isLoginParamError = false;
-    private Bundle extras;
-    private String certificationKey;
-    private String extrasStr;
-    private int userBehavior;
-    private boolean isNeedGetCode = true;
-    private boolean cancelUpdateApp = false;
-
-    private UpdateContentOuterClass.UpdateContent mUpdateContent;
-    private String update_version_Name;
-    private String mStrUpdateDesc;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_game_certification);
-        //noinspection deprecation
-
-        ButterKnife.bind(this);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar supportActionBar = getSupportActionBar();
-        if (null != supportActionBar) {
-            supportActionBar.setTitle(R.string.title_game_activity_certification);
-        }
-        extras = getIntent().getExtras();
-        if (extras != null) {
-            cancelUpdateApp = extras.getBoolean(getString(R.string.kfzs_duanduan_datashare_certificationed), false);
-            userBehavior = extras.getInt(SKIP_CODE_USER_BEHAVIOR, 0);
-            isNeedGetCode = extras.getBoolean(EXTRAS_NEED_GET_CODE, true);
-            certificationDog = KFZSDDCertificationDog.getInstance();
-            certificationDog.init(this.getApplication(), new GameDog());
-            ((KFZSApp) getApplication()).GameCode = extras.getString(getString(com.kfzs.duanduan.datashare.R.string.kfzs_duanduan_datashare_game_code), "");
-            progressDialog = new ProgressDialog(this);
-            progressDialog.setMessage(getString(R.string.dialog_progress_waiting));
-        } else {
-            showCertificationErrorAndExit("基础配置参数错误,请检查后再次请求授权!");
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        isAuthOutOfTime = false;
-        isLoginParamError = false;
-        if (isNeedGetCode && !cancelUpdateApp) {
-            popUpdateAPP();
-        } else {
-            checkCertification();
-        }
-    }
-
-    private void checkCertification() {
-        if (certificationDog != null) {
-            if (extras != null) {
-                certificationDog.doCertificationCode(extras);
-            } else {
-                showCertificationErrorAndExit("授权异常\n, 参数未传入");
-            }
-        } else {
-            showCertificationErrorAndExit("授权异常\n, 未初始化");
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (progressDialog != null)
-            progressDialog.dismiss();
-        super.onDestroy();
-    }
-
-    private void popUpdateAPP() {
-        Response.ErrorListener updateErrorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showCertificationErrorAndExitApp("获取更新网络异常，取消授权 code: " + code);
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        String channelName = DataSave.getInstance().getChannelName();
-        params.put("cp_id", channelName);
-        ALog.d("channelName: " + channelName);
-        APIRequest updateAPP = APIRequestInstance.getReqUrl(TAG, UrlBll.VersionControlApi.APP_VERSION_INFO, params, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                if (apiResponse.getUpdateContentsList().isEmpty()) {
-                    showCertificationErrorAndExitApp("获取更新数据异常，取消授权");
-                    return;
-                }
-                handleVersionCallBack(apiResponse.getUpdateContentsList().get(0));
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                showCertificationErrorAndExitApp("获取更新数据回调异常，取消授权\ncode" + code);
-            }
-
-        }, updateErrorListener);
-        KFZSNetwork.addRequest(updateAPP);
-    }
-
-    private void handleVersionCallBack(UpdateContentOuterClass.UpdateContent updateContent) {
-        String strUpdateDesc = updateContent.getContent();
-        if (TextUtils.isEmpty(strUpdateDesc)) {
-            showCertificationErrorAndExitApp("获取更新内容异常，取消授权");
-        } else {
-            this.mUpdateContent = updateContent;
-            mStrUpdateDesc = updateContent.getContent();
-            Boolean force = updateContent.getForce() == 1;
-            UpdateUtils.getInstance(this).setmUpdateSetting(updateSetting)
-                    .setmIsForceUpdate(force)
-                    .update(updateContent.getPackageName()
-                            , updateContent.getApkUrl(), updateContent.getVersionNum());
-        }
-    }
-
-    private UpdateUtils.UpdateSetting updateSetting = new UpdateUtils.UpdateSetting() {
-
-        @Override
-        public void updateForce() {
-            showForciblyUpdateUI(mStrUpdateDesc, true);
-        }
-
-        @Override
-        public void updateSilent() {
-
-        }
-
-        @Override
-        public void updateNormal() {
-            showForciblyUpdateUI(mStrUpdateDesc, false);
-        }
-
-        @Override
-        public void updateNo() {
-            checkCertification();
-        }
-
-        @Override
-        public void udateProcess(int process) {
-
-        }
-
-        @Override
-        public void updateComplete() {
-
-        }
-    };
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
-            certificationDog.doCertificationCancel();
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    private void showCertificationErrorAndExit(String errorMsg) {
-//        ToastBuilder.make(app, errorMsg, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                ActGameCertification.this.finish();
-            }
-        }, SKIP_TIME);
-    }
-
-    private void showCertificationErrorAndExitApp(String errorMsg) {
-        ToastBuilder.make(app, errorMsg, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        progressDialog.show();
-        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                ActGameCertification.this.finish();
-                KFZSApp.getInstance().quit();
-            }
-        }, SKIP_TIME);
-    }
-
-    private void initViewByBundle(String targetPackageName) {
-        llActGameCertificationContent.setVisibility(View.VISIBLE);
-        try {
-            Current lastUser = DDProviderHelper.getInstance().getLastUser(app);
-            String account = getString(R.string.str_act_certification_now_hint) + lastUser.getMNickName();
-            tvFgtGameCertificationNow.setText(account);
-            ApkUtils apkUtil = ApkUtils.getInstance();
-            Drawable selfIcon = apkUtil.getAppIconOnce(app, this.getPackageName());
-            if (selfIcon != null) {
-                imgFgtGameCertificationSelf.setImageDrawable(selfIcon);
-            }
-            String selfAPPName = apkUtil.getAppLabelOnce(app, this.getPackageName());
-            tvActGameCertificationSelf.setText(selfAPPName);
-            Drawable targetPackageNameIcon = apkUtil.getAppIconOnce(app, targetPackageName);
-            if (targetPackageNameIcon != null) {
-                imgFgtGameCertificationTarget.setImageDrawable(targetPackageNameIcon);
-            }
-            String targetAppName = apkUtil.getAppLabelOnce(app, targetPackageName);
-            tvActGameCertificationTarget.setText(targetAppName);
-        } catch (Exception e) {
-            e.printStackTrace();
-            showCertificationErrorAndExit("获取应用数据错误,取消授权!");
-        }
-    }
-
-    private void popSDKOut(User user, String gameCode) {
-        String token = user.getMToken();
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(app, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showCertificationErrorAndExit("网络错误,检查网络后后再次请求授权");
-            }
-        });
-        if (TextUtils.isEmpty(token)) {
-            isLoginParamError = true;
-            certificationDog.doForceNeedReLogin();
-            return;
-        }
-        //如果yog端的token返回的是空，而自己端端却有token，传给PLAYER
-        if (!TextUtils.isEmpty(KFZSApp.getInstance().GameCode)) {
-            DDProviderHelper.getInstance().addOrUpdatePlayer(this, user, KFZSApp.getInstance().GameCode);
-        }
-
-        HashMap<String, String> urlParams = new HashMap<>();
-        urlParams.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        String url = UrlBll.SDKApi.SDK + "/" + gameCode;
-        APIRequest apiRequest = APIRequestInstance.getReq(TAG, url, urlParams, new OnSDKOut(), errorListener);
-        KFZSNetwork.addRequest(apiRequest);
-        progressDialog.show();
-    }
-
-
-    @OnClick({R.id.tv_act_game_certification_change_account, R.id.btn_act_game_certification})
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_act_game_certification_change_account:
-                Bundle bundle = new Bundle(extras);
-                bundle.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION);
-                skip2Activity(ActAccountManage.class, bundle);
-                this.finish();
-                break;
-            case R.id.btn_act_game_certification:
-                if (!TextUtils.isEmpty(certificationKey) && !TextUtils.isEmpty(extrasStr)) {
-                    certificationDog.doCertification(certificationKey, extrasStr);
-                } else {
-                    showCertificationErrorAndExit("授权错误!未获取到\n认证: " + certificationKey + "\n或者没获取到渠道值: " + extrasStr);
-                }
-                break;
-        }
-    }
-
-    private class OnSDKOut implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            String msg = apiResponse.getMsg();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Sdk.SdkOut sdkOut = apiResponse.getSdkOut();
-                    filterSDKOut(msg, sdkOut);
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    isAuthOutOfTime = true;
-                    certificationDog.doForceNeedReLogin();
-                    showToast(msg);
-                    Log.w("AUTH", "get code error msg: " + msg);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showCertificationErrorAndExit("请求授权错误 " + msg);
-                    break;
-                default:
-                    showCertificationErrorAndExit("请求授权错误 " + msg);
-                    break;
-            }
-        }
-
-        private void filterSDKOut(String msg, Sdk.SdkOut sdkOut) {
-            if (sdkOut != null) {
-                certificationKey = sdkOut.getCode();
-                /*String userID = extras.getString(getString(R.string.kfzs_duanduan_datashare_certification_userid));
-                if (userID != null) {
-                    ContentValues values = new ContentValues();
-                    values.put(YogConfig.Player.CODE, certificationKey);
-                    values.put(YogConfig.Player.DD_USERID, userID);
-                    DDProviderHelper.getInstance().insertOrUpdatePalyer(ActGameCertification.this, values);
-                }*/
-                try {
-                    JSONObject jsonObject;
-                    String extrasFromGame = DataSave.getInstance().getExtrasFromGame();
-                    ALog.d("extrasFromGame from : " + extrasFromGame);
-                    if (TextUtils.isEmpty(extrasFromGame)) {
-                        jsonObject = new JSONObject();
-                    } else {
-                        jsonObject = new JSONObject(extrasFromGame);
-                    }
-                    jsonObject.put("dd_channel", DataSave.getInstance().getChannelName());
-                    extrasStr = jsonObject.toString();
-                    progressDialog.hide();
-                    if (userBehavior == JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS) {
-                        if (!TextUtils.isEmpty(certificationKey) && !TextUtils.isEmpty(extrasStr)) {
-                            ALog.d("extrasFromGame to : " + extrasStr);
-                            certificationDog.doCertification(certificationKey, extrasStr);
-                        } else {
-                            showCertificationErrorAndExit("授权错误!未获取到\n认证: " + certificationKey + "\n或者没获取到渠道值: " + extrasStr);
-                        }
-                    }
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                    showCertificationErrorAndExit("授权错误!透传参数拼装错误\n认证: " + certificationKey + "\n或者没获取到渠道值: " + extrasStr);
-                }
-            } else {
-                showCertificationErrorAndExit("请求授权错误!未获取到输出 " + msg);
-            }
-        }
-    }
-
-
-    private class GameDog implements CertificationDog {
-
-
-        @Override
-        public void onCertificationCodeCallBack(User user, String gamePackageName, String gameCode, String ext) {
-            Log.e("gamePackageName: ", gamePackageName + " |gameCode: " + gameCode + " ext: " + ext);
-            if (isNeedGetCode) {
-                switch (userBehavior) {
-                    case JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS:
-                        doCertificationByChangeAccount(gameCode, user);
-                        break;
-                    case JOB_CHANGE_ACCOUNT_CANCEL:
-                        if (certificationDog != null) {
-                            certificationDog.doCertificationCancel();
-                        }
-                        break;
-                    default:
-                        if (TextUtils.isEmpty(ext)) {
-                            initViewByBundle(gamePackageName);
-                            popSDKOut(user, gameCode);
-                        } else {
-                            DataSave.getInstance().setExtrasFromGame(ext);
-                            filterUserBehavior(ext, user);
-                        }
-                        break;
-                }
-            } else {
-                try {
-                    JSONObject jsonObject;
-                    String extrasFromGame = DataSave.getInstance().getExtrasFromGame();
-                    if (TextUtils.isEmpty(extrasFromGame)) {
-                        jsonObject = new JSONObject();
-                    } else {
-                        jsonObject = new JSONObject(extrasFromGame);
-                    }
-                    jsonObject.put("dd_channel", DataSave.getInstance().getChannelName());
-                    String user_behavior = jsonObject.optString("user_behavior", "");
-                    jsonObject.remove("user_behavior");
-                    jsonObject.put("user_behavior", user_behavior + "_callback");
-                    extrasStr = jsonObject.toString();
-                    progressDialog.hide();
-                    ALog.d("extrasFromGame from : " + extrasStr);
-                    certificationKey = jsonObject.optString("user_behavior");
-                    certificationDog.doCertification(certificationKey, extrasStr);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                    showCertificationErrorAndExit("授权错误!透传参数拼装错误\n认证: " + certificationKey + "\n或者没获取到渠道值: " + extrasStr);
-                }
-            }
-        }
-
-        @Override
-        public void onCertificationSuccess() {
-            showToast("授权成功", ToastBuilder.DEFAULT_TOAST_SINGLE);
-            KFZSApp.getInstance().quit();
-        }
-
-        @Override
-        public void onCertificationCancel() {
-            showToast("授权取消", ToastBuilder.DEFAULT_TOAST_SINGLE);
-            KFZSApp.getInstance().quit();
-        }
-
-        @Override
-        public void onLoginJob() {
-            needLogin();
-        }
-
-        @Override
-        public void onError(int code, String message) {
-            ALog.e("code:----------- " + code + " |message: " + message);
-            switch (code) {
-                default:
-                    showCertificationErrorAndExit("参数错误, 请检查后再次请求授权\n" + message);
-                    break;
-            }
-        }
-    }
-
-    private void doCertificationByChangeAccount(String gameCode, User user) {
-        popSDKOut(user, gameCode);
-    }
-
-    private void filterUserBehavior(String ext, User user) {
-        try {
-            JSONObject extObj = new JSONObject(ext);
-            String user_behavior = extObj.getString("user_behavior");
-            switch (user_behavior) {
-                case "change_account":
-                    Bundle bundle = new Bundle(extras);
-                    bundle.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION);
-                    skip2Activity(ActAccountManage.class, bundle);
-                    this.finish();
-                    break;
-                case "change_password":
-                    filterOpenIDDoJob(user_behavior, user, extObj);
-                    break;
-                case "bind_phone":
-                    filterOpenIDDoJob(user_behavior, user, extObj);
-                    break;
-                case "change_nick_name":
-                    filterOpenIDDoJob(user_behavior, user, extObj);
-                    break;
-                default:
-                    showCertificationErrorAndExit("筛选用户行为错误，错误行为: " + user_behavior);
-                    break;
-            }
-        } catch (JSONException e) {
-            e.printStackTrace();
-            showCertificationErrorAndExit("请求授权错误!透传字段设置错误: " + e.getMessage());
-        }
-    }
-
-    private void filterOpenIDDoJob(String behavior, User user, JSONObject extObj) {
-        String openId = user.getMOpenId();
-        String open_id = extObj.optString("openid", "");
-        int sameOpenIDJob = 0;
-        int oldOpenIDJob = 0;
-        switch (behavior) {
-            case "change_password":
-                sameOpenIDJob = ActAuth.JOB_CODE_SELF_CHANGE_PASSWORD_BY_CERTIFICATION;
-                oldOpenIDJob = ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_CHECK;
-                break;
-            case "bind_phone":
-                sameOpenIDJob = ActAuth.JOB_CODE_SELF_BIND_PHONE_BY_CERTIFICATION;
-                // TODO bind phone by change account
-                oldOpenIDJob = ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK;
-                break;
-            case "change_nick_name":
-                // TODO change nick name
-                sameOpenIDJob = ActAuth.JOB_CODE_SELF_CHANGE_NICK_NAME_BY_CERTIFICATION;
-                // TODO bind phone by change account
-                oldOpenIDJob = ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK;
-                break;
-            default:
-                showCertificationErrorAndExit("筛选用户错误，错误行为: " + behavior);
-                break;
-        }
-        if (open_id.equals(openId)) {
-            Bundle changePsd = new Bundle(extras);
-            changePsd.putInt(ActAuth.KEY_SKIP_JOB_CODE, sameOpenIDJob);
-            skip2Activity(ActAuth.class, changePsd);
-            this.finish();
-        } else {
-            List<User> sessionBeen = KFZSDDContentSession.getInstance().checkOutAllUser(app);
-            User sessionOld = null;
-            for (User session : sessionBeen) {
-                if (open_id.equals(session.getMOpenId())) {
-                    sessionOld = session;
-                }
-            }
-            if (sessionOld != null) {
-                Bundle bundlePwd = new Bundle(extras);
-                Integer uid = Integer.parseInt(sessionOld.getMUserId());
-                if (uid != 0) {
-                    bundlePwd.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, oldOpenIDJob);
-                    bundlePwd.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, uid);
-                    skip2Activity(ActAccountManage.class, bundlePwd);
-                    this.finish();
-                } else {
-                    needLogin();
-                }
-            } else {
-                needLogin();
-            }
-        }
-    }
-
-    private void needLogin() {
-        if (isLoginParamError) {
-            showToast(R.string.toast_user_info_you_sign_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            KFZSDDContentSession.getInstance().removeHeadSession(app);
-        }
-        if (isAuthOutOfTime) {
-            showToast(R.string.toast_user_info_you_sign_out_of_time, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            KFZSDDContentSession.getInstance().removeHeadSession(app);
-            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_FAIL));
-        }
-        if (!isLoginParamError && !isAuthOutOfTime) {
-            showToast(R.string.toast_user_info_you_ara_not_sign, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-        progressDialog.show();
-        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                Bundle bundle = new Bundle(extras);
-                bundle.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_LOGIN_CERTIFICATION);
-                skip2Activity(ActAuth.class, bundle);
-                ActGameCertification.this.finish();
-            }
-        }, SKIP_TIME);
-    }
-
-
-    private void showForciblyUpdateUI(String strUpdateDesc, boolean isForce) {
-        String update_time_date = DateFormatUtils.doSecondDate(mUpdateContent.getCreatedTime());
-
-        update_version_Name = mUpdateContent.getVersionName();
-        new DialogUpdateFragment().init(isForce,
-                strUpdateDesc,
-                mUpdateContent.getVersionName(),
-                update_time_date,
-                mUpdateContent.getSize(),
-                new DialogUpdateFragment.CancelCallback() {
-                    @Override
-                    public void onCancel() {
-                        checkCertification();
-                    }
-                })
-                .show(getSupportFragmentManager(), "update");
-    }
-
-    private static void canCloseDialog(DialogInterface dialogInterface, boolean close) {
-        try {
-            Field field = dialogInterface.getClass().getSuperclass().getDeclaredField("mShowing");
-            field.setAccessible(true);
-            field.set(dialogInterface, close);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}

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

@@ -43,7 +43,6 @@ import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import com.kfzs.duanduan.utils.ShareUtils;
 import com.kfzs.duanduan.adp.AdpViewPagerDetail;
-import com.kfzs.duanduan.fragment.FgtGift;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 import com.sheep.jiuyan.samllsheep.R;

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

@@ -1,183 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GiftCodeOuterClass;
-import com.kfzs.duanduan.proto.ShelvesGiftOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.HashMap;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActGift</p>
- * @ <p>Description:礼包详情页</p>
- * @ date:  2017/8/4 11:21
- * @ QQ:    315096953
- */
-
-public class ActGift extends BaseCompatActivity {
-
-    private ShelvesGiftOuterClass.ShelvesGift mGift;
-    public final static String INTENT_GIFT = "INTENT_GIFT";
-    private Button mBtnSubmit;
-    private final int ALREADY_GET = 1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (!getIntent().hasExtra(INTENT_GIFT)) {
-            showToast("未找到该礼包");
-            finish();
-            return;
-        }
-        setContentView(R.layout.activity_gift);
-
-
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        initView();
-
-        initLisener();
-    }
-
-    private void initView() {
-        if (mGift == null) {
-            mGift = (ShelvesGiftOuterClass.ShelvesGift) getIntent().getSerializableExtra(INTENT_GIFT);
-        }
-        mBtnSubmit = (Button) findViewById(R.id.btn_activity_gift);
-        findViewById(R.id.img_activity_icon)
-                .setVisibility(mGift.getGame().getExistGift() == 1 ? View.VISIBLE : View.GONE);
-        Glide.with(this)
-                .load(mGift.getGame().getIconImage())
-                .into((ImageView) findViewById(R.id.img_activity_gift));
-        ((TextView) findViewById(R.id.txt_activity_gift_title))
-                .setText(mGift.getGame().getGameName() + " - " + mGift.getGiftName());
-        ((TextView) findViewById(R.id.txt_activity_gift_number))
-                .setText(getString(R.string.gift_get_number) + mGift.getPlanNum());
-        ((TextView) findViewById(R.id.txt_activity_gift_descp))
-                .setText(mGift.getUseInstruction());
-        long remain = mGift.getRemainNum();
-        ((TextView) findViewById(R.id.txt_activity_gift_remain))
-                .setText(getString(R.string.gift_get_remain) + (remain < 1 ? 0 : remain));
-        ((TextView) findViewById(R.id.txt_activity_gift_content))
-                .setText(mGift.getGiftContent());
-        ((TextView) findViewById(R.id.txt_activity_gift_time))
-                .setText(DateFormatUtils.doDefaultDate(mGift.getCreatedTime())
-                        + " 至 " + DateFormatUtils.doDefaultDate(mGift.getEndTime()));
-
-
-//        final int percent = HelperUtils.getPercent(mGift.getTotalNum(), mGift.getReceiveNum());
-        final int percent = (int) Math.ceil((mGift.getPercentum() * 100));
-        ((TextView) findViewById(R.id.txt_activity_gift_progress))
-                .setText(percent + "%");
-        ((ProgressBar) findViewById(R.id.view_activity_gift_progress))
-                .setProgress(percent);
-
-
-        if (mGift.getStatus() == ALREADY_GET) {
-            //如果已经领取了 ，按钮变色等操作
-            mBtnSubmit.setBackgroundResource(ThemeUtils.getInstance()
-                    .getThemeResId(this, R.attr.button_full_normal, R.drawable.button_full_normal_main));
-            mBtnSubmit.setText("复制兑换码");
-            findViewById(R.id.txt_activity_gift_code).setVisibility(View.VISIBLE);
-            findViewById(R.id.layout_activity_gift_head).setVisibility(View.GONE);
-            ((TextView) findViewById(R.id.txt_activity_gift_code)).setText("激活码：" + mGift.getGiftCode());
-        }//实际上不用写else，因为是不可逆的
-
-    }
-
-    /**
-     * 领取码
-     */
-    private void initLisener() {
-        findViewById(R.id.ibtn_act_webview)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        finish();
-                    }
-                });
-        findViewById(R.id.layout_activity_gift_title)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        SkipUtils.getInstance().goGameDetails(ActGift.this, mGift.getGameId());
-                    }
-                });
-        mBtnSubmit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mGift.getStatus() == ALREADY_GET) {
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setText(mGift.getGiftCode());
-                    showToast("复制成功！");
-                    return;
-                }
-
-                GiftCodeOuterClass.GiftCode.Builder builder = GiftCodeOuterClass.GiftCode.newBuilder();
-                builder.setGiftId(mGift.getId());
-
-                HashMap<String, String> headParams = new HashMap<>();
-                SessionBean outHeadSession = KFZSDDContentSession.getInstance()
-                        .findOutHeadSession(ActGift.this);
-                if (outHeadSession == null) {
-                    SkipUtils.getInstance().goLogin(ActGift.this);
-                    showToast(R.string.toast_user_login_pre);
-                    return;
-                }
-                headParams.put(UrlBll.HeadParams.AUTHORIZATION, outHeadSession.getToken());
-
-                ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-                reqBuild.setGiftCode(builder);
-
-                APIRequest bannerRequest = APIRequestInstance.putReq(TAG, UrlBll.Gift.GIFT_EXCHANGE,
-                        reqBuild.build().toByteArray(), headParams, new ResponseNetworkTask() {
-                            @Override
-                            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                                showToast("领取成功！");
-                                //领取后，置1，这些暂时没有用常量。
-                                mGift = mGift.toBuilder()
-                                        .setStatus(ALREADY_GET)
-                                        .setGiftCode(apiResponse.getGiftCode().getGiftCode())
-                                        .setReceiveNum(mGift.getReceiveNum() + 1)
-                                        .build();
-                                initView();
-                            }
-
-                            @Override
-                            public void onFail(int code, String msg) {
-                                showToast(msg);
-                            }
-                        }, HelperUtils.makeErr(getString(R.string.toast_gift_get_fail)));
-                KFZSNetwork.addRequest(bannerRequest);
-            }
-        });
-    }
-
-}

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

@@ -1,666 +0,0 @@
-package com.kfzs.duanduan;
-
-
-import android.content.ContentValues;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.bll.AppBaseBll;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.YogConfig;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.fragment.ManagementAccountFragment;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.react.ReactUtil;
-import com.kfzs.duanduan.utils.dlg.CheckUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.view.TimeButton;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActLogin</p>
- * @ <p>Description: 下面不全是我的代码，移植了很多代码过来，以前的全是eventbus恶心死了</p>
- * @ <p>Description: 虽然代码优化了很多，但这些垃圾代码我怕背锅，备注一下。</p>
- * @ date:  2018/1/24 11:57
- * @ QQ:    315096953
- */
-
-public class ActLogin extends BaseCompatActivity implements View.OnClickListener {
-
-    public static final int LOGIN_TYPE_IS_APP_LOGIN = 1;
-    public static final int LOGIN_TYPE_IS_CERTIFICATION = 2 << 1;
-    public static final int LOGIN_TYPE_CODE_IS_NEW_ACCOUNT = 3 << 1;
-    public static final int LOGIN_TYPE_CODE_IS_NEW_ACCOUNT_CERTIFICATION = 4 << 1;
-
-    public static final String KEY_LOGIN_TYPE = "fragment:auth:login:type";
-    private AppCompatAutoCompleteTextView mEdtUserName;
-    private TextInputLayout mEdtPass;
-    private TextInputLayout mEdtValicode;
-    private LinearLayout mLayoutValicode;
-    private TimeButton mBtnTime;
-    private CheckBox mChkUserList;
-    private boolean mIsLogin = false;
-    private boolean mIsLoginErr = false;
-    private TextView mTxtLoginType;
-    private int loginType = LOGIN_TYPE_IS_APP_LOGIN;//登录的方式，顶上的四个登录方式
-
-
-    private static final int LOGIN_ENTER_USERNAME_PASSWORD = 0;
-    private static final int LOGIN_ENTER_PHONE_SMS = 1;
-    /**
-     * 登录模式是密码登录还是短信登录
-     */
-    private int mIntCurrentLoginStyle = LOGIN_ENTER_USERNAME_PASSWORD;
-    private Bundle extras;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);//去掉标题栏
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
-        extras = getIntent().getExtras();
-        if (extras == null) {
-            extras = new Bundle();
-        }
-
-        setContentView(R.layout.act_login);
-        if (getIntent().hasExtra(KEY_LOGIN_TYPE)) {
-            loginType = getIntent().getIntExtra(KEY_LOGIN_TYPE, LOGIN_TYPE_IS_APP_LOGIN);
-        }
-        initView();
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!TextUtils.isEmpty(AuthEvent.getRegisterback())) {
-            mEdtUserName.setText(AuthEvent.getUserName());
-            mEdtPass.getEditText().setText(AuthEvent.getUserPassword());
-        }
-        if (mEdtUserName != null && mEdtPass != null) {
-            mEdtUserName.setFocusable(true);
-        }
-
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mIsLogin = false;
-        mIsLoginErr = false;
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_act_login_submit:
-                mIsLoginErr = false;
-                AuthEvent.setRegisterback("");
-                loginByStatus();
-                break;
-            case R.id.txt_act_login_forget:
-                SkipUtils.getInstance().goActSimple(this, ActSimple.ACTION.FORGET_PASS);
-                break;
-            case R.id.txt_act_login_phone:
-                if (mIntCurrentLoginStyle == LOGIN_ENTER_USERNAME_PASSWORD) {
-                    mIntCurrentLoginStyle = LOGIN_ENTER_PHONE_SMS;
-                    mTxtLoginType.setText(getString(R.string.login_type_sms));
-                    mLayoutValicode.setVisibility(View.VISIBLE);
-                    mEdtPass.setVisibility(View.GONE);
-                } else {
-                    mIntCurrentLoginStyle = LOGIN_ENTER_USERNAME_PASSWORD;
-                    mTxtLoginType.setText(getString(R.string.login_type_pass));
-                    mLayoutValicode.setVisibility(View.GONE);
-                    mEdtPass.setVisibility(View.VISIBLE);
-                }
-                break;
-            case R.id.btn_act_login_time:
-                postGetCaptchaPhone();
-                break;
-            case R.id.txt_act_login_regist:
-                SkipUtils.getInstance().goRegist(this, loginType);
-                break;
-            case R.id.img_act_login_back:
-                finish();
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * 短信登录方式
-     *
-     * @param phone
-     * @param valicode
-     */
-    private void submit_SMS(String phone, String valicode) {
-        if (!CheckUtils.getInstance().isPhoneSucc(phone)) {
-            return;
-        }
-        if (TextUtils.isEmpty(valicode)) {
-            G.showToast(R.string.tv_user_login_act_please_input_captcha_phone);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-                if (KFZSApp.DEBUG) {
-                    showToast("网络服务错误", ToastBuilder.MIDDLE_TOAST_SINGLE);
-                } else {
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                }
-                mIsLogin = false;
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(phone);
-        sessionBuild.setSmsSeccode(valicode);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN_SMS,
-                null, apiRequest1.toByteArray(), 20 * 1000,
-                new ResponseAuthLogin(phone), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-        mIsLogin = true;
-    }
-
-    /**
-     * 密码方式登录
-     *
-     * @param account
-     * @param psd
-     */
-    private void submit_Pass(String account, String psd) {
-        if (!CheckUtils.getInstance().isLoginParamsSuccs(account, psd)) {
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-                mIsLogin = false;
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(account);
-        sessionBuild.setPwd(psd);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        byte[] bytes = apiRequest1.toByteArray();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN, null, bytes,
-                new ResponseAuthLogin(account), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-        mIsLogin = true;
-    }
-
-    /**
-     * 验证登录返回的token是否有效
-     *
-     * @param token
-     */
-    private void popHeadSessionUserGraphInfo(String token) {
-        ALog.d("Auth popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(this, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_error_repeat + "==错误码：" + code);
-                mIsLogin = false;
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params,
-                new OnHeadSessionUserGraph(token), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-        mIsLogin = true;
-    }
-
-    private void loginByStatus() {
-        if (mIsLoginErr) {
-            G.showToast(R.string.toast_user_login_act_login_error_repeat);
-            return;
-        }
-        if (!mIsLogin) {
-            if (mIntCurrentLoginStyle == LOGIN_ENTER_PHONE_SMS) {
-                submit_SMS(mEdtUserName.getText().toString().trim(),
-                        mEdtValicode.getEditText().getText().toString().trim());
-            } else {
-                submit_Pass(mEdtUserName.getText().toString().trim(),
-                        mEdtPass.getEditText().getText().toString().trim());
-            }
-        } else {
-            G.showToast(R.string.toast_user_login_act_is_login);
-        }
-    }
-
-
-    /**
-     * 密码框输入时的监听处理
-     */
-    private void setEtOnEditorAction() {
-        mEdtPass.getEditText().setOnEditorActionListener(new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(ActLogin.this);
-                            mIsLoginErr = false;
-                            loginByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-    }
-
-
-    private void initView() {
-        this.mTxtLoginType = findViewByIdT(R.id.txt_act_login_phone);
-        this.mBtnTime = findViewByIdT(R.id.btn_act_login_time);
-        this.mEdtUserName = findViewByIdT(R.id.edt_act_login_user);
-        this.mEdtPass = findViewByIdT(R.id.edt_act_login_pass);
-        this.mEdtValicode = findViewByIdT(R.id.edt_act_login_valicode);
-        this.mLayoutValicode = findViewByIdT(R.id.layout_act_login_valicode);
-        this.mChkUserList = findViewByIdT(R.id.chk_act_login);
-
-        findViewByIdT(R.id.txt_act_login_forget).setOnClickListener(this);
-        findViewByIdT(R.id.btn_act_login_submit).setOnClickListener(this);
-        findViewByIdT(R.id.img_act_login_back).setOnClickListener(this);
-        findViewByIdT(R.id.txt_act_login_regist).setOnClickListener(this);
-
-        if (Build.VERSION.SDK_INT > 20) {
-            findViewByIdT(R.id.layout_act_login)
-                    .setPadding(0, G.getRealPix(25), 0, 0);
-        }
-
-
-        mBtnTime.setOnClickListener(this);
-        setEtOnEditorAction();
-        mTxtLoginType.setOnClickListener(this);
-        mChkUserList.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (b) {
-                    mEdtUserName.showDropDown();
-                    InputMethodUtils.closeInputPan(ActLogin.this);
-                } else {
-                    mEdtUserName.dismissDropDown();
-                }
-            }
-        });
-
-        quickLogin();
-    }
-
-    /**
-     * 方便测试时快速登录账号
-     */
-    private void quickLogin() {
-        boolean isRnTest = false;//帮你到这儿了。。
-        List<String> userlist = getUserList();
-        //如果用户资料为空，才去看RN用户有没有。
-        if (userlist == null || userlist.size() < 1) {
-            userlist = ReactUtil.initArr();
-            isRnTest = true;
-        }
-
-        if (userlist != null && userlist.size() > 0) {
-            ArrayAdapter arrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, userlist);
-            mEdtUserName.setAdapter(arrayAdapter);
-            mEdtUserName.setThreshold(99);
-            mEdtUserName.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                @Override
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    mChkUserList.setChecked(false);
-                    if (ReactUtil.MAP_PWD == null) {
-                        return;
-                    }
-                    Object obj = parent.getItemAtPosition(position);
-                    String pwd = ReactUtil.MAP_PWD.get(obj.toString());
-                    if (TextUtils.isEmpty(pwd)) {
-                        pwd = "123456";
-                    }
-                    mEdtPass.getEditText().setText(pwd);
-                    findViewById(R.id.btn_act_login_submit).performClick();
-                }
-            });
-
-
-            if (isRnTest) {
-                mEdtUserName.setDropDownVerticalOffset(-90);
-                mEdtUserName.setThreshold(1);
-                mEdtUserName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                    @Override
-                    public void onFocusChange(View view, boolean hasFocus) {
-                        if (hasFocus && view instanceof AppCompatAutoCompleteTextView) {
-                            ((AppCompatAutoCompleteTextView) view).showDropDown();
-                        }
-                    }
-                });
-            }
-        } else if (KFZSApp.DEBUG) {
-            mEdtUserName.setText("tianran6");
-            mEdtPass.getEditText().setText("qwer1234");
-        }
-    }
-
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mChkUserList.isChecked()) {
-            mChkUserList.setChecked(false);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-    private List<String> getUserList() {
-        List<User> userList = DDProviderHelper.getInstance().getUserList(this);
-        List<String> list = new ArrayList<>();
-        if (userList != null && userList.size() > 0) {
-            for (User user : userList) {
-                if (TextUtils.isEmpty(user.getMMobile())) {
-                    if (mIntCurrentLoginStyle != LOGIN_ENTER_PHONE_SMS
-                            && !TextUtils.isEmpty(user.getMUserName())) {
-                        list.add(user.getMUserName());
-                    }
-                } else {
-                    list.add(user.getMMobile());
-                }
-            }
-        }
-        return list;
-    }
-
-    /**
-     * 两种登录模式的回调处理
-     */
-    private class ResponseAuthLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        private final String account;
-
-        public ResponseAuthLogin(String account) {
-            this.account = account;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int code = apiResponse.getCodeValue();
-            switch (code) {
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    mIsLoginErr = true;
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Session.SessionOut sessionOut = apiResponse.getSessionOut();
-                    popHeadSessionUserGraphInfo(sessionOut.getToken());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat + ",错误码：" + code, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            mIsLogin = false;
-        }
-    }
-
-    private void filterByDifferentLoginType(UserOuterClass.User user, String token) {
-        mIsLogin = true;
-        InputMethodUtils.closeInputPan(this);
-        EventBus eventBus = EventBus.getDefault();
-        ALog.e("-loginType: " + loginType);
-        switch (loginType) {
-            case LOGIN_TYPE_IS_APP_LOGIN:
-                upDateUserInfo(user, token, true);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                new AppBaseBll().reloadVipStyle(this);
-                break;
-            case LOGIN_TYPE_IS_CERTIFICATION://游戏认证登录；
-                upDateUserInfo(user, token, false);
-                setPlayer(user, token);
-                extras.putInt(ActGameCertification.SKIP_CODE_USER_BEHAVIOR, ActGameCertification.JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS);
-                extras.putBoolean(getString(R.string.kfzs_duanduan_datashare_certificationed), true);
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_userid), String.valueOf(user.getId()));
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_token), token);
-                skip2Activity(ActGameCertification.class, extras);
-                this.finish();
-                break;
-            case LOGIN_TYPE_CODE_IS_NEW_ACCOUNT:
-                upDateUserInfo(user, token, true);
-                AuthEvent authNewAccountEvent = new AuthEvent();
-                authNewAccountEvent.setSkipCode(ActAuth.JOB_CODE_NEW_ACCOUNT_SUCCESS);
-                eventBus.post(authNewAccountEvent);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                new AppBaseBll().reloadVipStyle(this);
-                break;
-            case LOGIN_TYPE_CODE_IS_NEW_ACCOUNT_CERTIFICATION://游戏认证登录；
-                Bundle newAccountModeCSuccess = new Bundle(extras);
-                newAccountModeCSuccess.putInt(ManagementAccountFragment.KEY_ACCOUNT_NEW_UID, user.getId());
-                newAccountModeCSuccess.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK);
-                skip2Activity(ActAccountManage.class, newAccountModeCSuccess);
-                this.finish();
-                break;
-            default:
-                ALog.d("filterByDifferentLoginType default develop use!");
-                break;
-        }
-    }
-
-    //游戏授权 保存数据；
-    private void setPlayer(UserOuterClass.User user, String token) {
-        ContentValues values = new ContentValues();
-        values.put(YogConfig.Player.TOKEN, token);
-        values.put(YogConfig.Player.DD_USERID, String.valueOf(user.getId()));
-        values.put(YogConfig.Player.OPENID, user.getOpenId());
-        values.put(YogConfig.Player.USERNAME, user.getName());
-        values.put(YogConfig.Player.CHANNEL, DataSave.getInstance().getChannelName());
-        String gameCode = KFZSApp.getInstance().GameCode;
-
-        try {
-            DDProviderHelper.getInstance().insertOrUpdatePalyer(this, values, gameCode);
-            DDProviderHelper.getInstance().setGameLastPalyer(this, String.valueOf(user.getOpenId()), gameCode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 获取手机验证码的操作
-     */
-    private void postGetCaptchaPhone() {
-        mBtnTime.reset();
-        if (CheckUtils.getInstance().isPhoneSucc(mEdtUserName.getText().toString())) {
-            Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-            sessionBuild.setAccount(mEdtUserName.getText().toString().trim());
-
-            Session.SessionIn sessionOut = sessionBuild.build();
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setSessionIn(sessionOut);
-
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_error);
-                    mBtnTime.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.SMS_LOGIN,
-                    null, reqBuild.build().toByteArray(), 20 * 1000,
-                    new OnSmsLogin(), errorListener
-            );
-
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            mBtnTime.star();
-        }
-    }
-
-
-    /**
-     * 获取手机验证码的回调接口
-     */
-    private class OnSmsLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    mBtnTime.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    mBtnTime.reset();
-                    break;
-            }
-        }
-    }
-
-    /**
-     * 登录得到token后，去验证这个token后的回调实现
-     */
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        String token;
-
-        public OnHeadSessionUserGraph(String token) {
-            this.token = token;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    mIsLoginErr = false;
-                    mIsLogin = false;
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        filterByDifferentLoginType(user, token);
-                    } else {
-                        G.showToast(R.string.toast_user_login_act_login_error_repeat);
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    mIsLoginErr = true;
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                default:
-                    showToast("出现未知错误：code：" + codeValue, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            mIsLogin = false;
-        }
-
-    }
-
-    /**
-     * 补全用户信息到数据库
-     *
-     * @param user
-     * @param token
-     * @param isApp
-     */
-    private void upDateUserInfo(UserOuterClass.User user, String token, boolean isApp) {
-        int id = user.getId();
-        if (isApp) {
-            Current lastUser = DDProviderHelper.getInstance().getLastUser(this);
-            if (lastUser == null)
-                lastUser = new Current();
-            lastUser.setMUserId(String.valueOf(id));
-            lastUser.setMUserName(user.getName());
-            lastUser.setMVipType(user.getVipType());
-            lastUser.setMNickName(user.getNickname());
-            lastUser.setMMobile(user.getPhone());
-            lastUser.setMOpenId(user.getOpenId());
-            lastUser.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-            lastUser.setMAvatar(user.getAvatar());
-            lastUser.setMToken(token);
-            DDProviderHelper.getInstance().setLastUser(this, lastUser);
-        }
-
-        User player = DDProviderHelper.getInstance().getUser(this, String.valueOf(id));
-        if (player == null)
-            player = new User();
-        player.setMUserId(String.valueOf(id));
-        player.setMUserName(user.getName());
-        player.setMVipType(user.getVipType());
-        player.setMNickName(user.getNickname());
-        player.setMMobile(user.getPhone());
-        player.setMOpenId(user.getOpenId());
-        player.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-        player.setMAvatar(user.getAvatar());
-        player.setMToken(token);
-
-        DDProviderHelper.getInstance().addOrUpdateUser(this, player);
-        if (!TextUtils.isEmpty(KFZSApp.getInstance().GameCode)) {
-            DDProviderHelper.getInstance().addOrUpdatePlayer(this, player, KFZSApp.getInstance().GameCode);
-        }
-    }
-}

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;
 
 
@@ -214,9 +212,6 @@ public class ActMain extends BaseCompatActivity{
     @Subscribe
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {
-            case USER_LOGIN_SUCC:
-                checkHeadSessionUserGraph();
-                break;
             case TIPS_DOWN_ICON:
                 mImgDot.setVisibility(View.VISIBLE);
                 break;
@@ -405,74 +400,6 @@ public class ActMain extends BaseCompatActivity{
         return backStr;
     }
 
-    //从下面开始是一堆没有注释的一堆原始代码，以后有空再分析。
-    private void checkSessionHead() {
-        hasHeadSession = mKFZSDDContentSession.isHasHeadSession(app);
-        if (hasHeadSession) {
-            popHeadSessionUserGraphInfo();
-        }
-    }
-
-    private void checkHeadSessionUserGraph() {
-        if (mKFZSDDContentSession.isHeadSessionChange(app)) {
-            popHeadSessionUserGraphInfo();
-        } else {
-            //TODO if not change what time for recheck?
-            popHeadSessionUserGraphInfo();
-        }
-    }
-
-    private void popHeadSessionUserGraphInfo() {
-        SessionBean saveHeadSessionInMem = KFZSDDContentSession.getInstance().findOutHeadSession(this);
-        if (saveHeadSessionInMem == null) {
-            return;
-        }
-        String token = saveHeadSessionInMem.getToken();
-        ALog.d("popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            KFZSDDContentSession.getInstance().removeHeadSession(app);
-            DDProviderHelper.getInstance().deleteCurrent(app);
-            return;
-        }
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF,
-                params, new OnHeadSessionUserGraph(), HelperUtils
-                        .makeErr(getString(R.string.toast_user_info_you_sign_error)));
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        UserBean userGraph = UserGraphUtils.saveNewUserGraph(user);
-                        if (userGraph != null) {
-                            hasHeadSession = true;
-                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.WEB_TRY_LOGIN_BY_TOKEN));
-                        }
-                    }
-                    break;
-                //这一句一定要加上，不然会出现Token error
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    showToast(R.string.toast_user_login_pre);
-                    KFZSUserHelper.getInstance().removeHeadUser(ActMain.this);
-                    DDProviderHelper.getInstance().deleteCurrent(ActMain.this);
-                    SkipUtils.getInstance().goLogin(ActMain.this);
-                    if (gameDialog != null) {
-                        gameDialog.dismiss();
-                    }
-                    break;
-            }
-        }
-    }
-
-
     private Animation animationShow;
     private Animation animationHide;
 

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

@@ -1,301 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.Html;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.fragment.KFDialogFragment;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameBookOuterClass;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.view.ListMore;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActNewGameBook</p>
- * @ <p>Description:新游预约页</p>
- * @ date:  2017/12/14 16:32
- * @ QQ:    315096953
- */
-
-public class ActNewGameBook extends BaseCompatActivity {
-
-    private ListMore mListMore;
-    private List<GameBookOuterClass.GameBook> lGameBookCollection = new ArrayList<>();
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.act_new_game_book);
-
-        mListMore = findViewByIdT(R.id.list_act_new_game_book);
-        mListMore.getmListView().setAdapter(adapter);
-
-        doNetworkTask(100, 1);
-        mListMore.setmPullMoreEnable(false);
-        mListMore.setmOnListMoreListener(new ListMore.OnListMoreListener() {
-            @Override
-            public void onRefresh() {
-                doNetworkTask(100, 1);
-            }
-
-            @Override
-            public void onLoadMore() {
-
-            }
-        });
-        findViewById(R.id.txt_act_new_game_book)
-                .setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        finish();
-                    }
-                });
-    }
-
-    /**
-     * 这里是以前的代码写得稀烂。。。
-     */
-    private BaseAdapter adapter = new BaseAdapter() {
-        @Override
-        public int getCount() {
-            return lGameBookCollection.size();
-        }
-
-        @Override
-        public GameBookOuterClass.GameBook getItem(int position) {
-            return lGameBookCollection.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return 0;
-        }
-
-        @Override
-        public View getView(final int position, View convertView, ViewGroup parent) {
-            if (convertView == null) {
-                convertView = View.inflate(ActNewGameBook.this, R.layout.listview_item_game_order, null);
-            }
-
-            ViewFindUtils.hold(convertView, R.id.game_order_introduces, TextView.class)
-                    .setText(getItem(position).getGame().getIntroduce());
-            ViewFindUtils.hold(convertView, R.id.game_order_tv_name, TextView.class)
-                    .setText(getItem(position).getGame().getGameName());
-            ViewFindUtils.hold(convertView, R.id.game_order_tv_date, TextView.class)
-                    .setText(DateFormatUtils.doSecond2Date(getItem(position).getGame().getStartTime()));
-            ViewFindUtils.hold(convertView, R.id.game_order_tv_count, TextView.class)
-                    .setText(Html.fromHtml(getHTMLStr(String.valueOf(getItem(position).getCount()))));
-
-            Glide.with(ActNewGameBook.this)
-                    .load(getItem(position).getGame().getIconImage())
-                    .transform(new KFGlideRoundTransform(ActNewGameBook.this, 5))
-                    .into(ViewFindUtils.find(convertView, R.id.game_order_iv_icon, ImageView.class));
-            Glide.with(ActNewGameBook.this)
-                    .load(VipStyle.getInstance().getGamebookimg())
-                    .transform(new KFGlideRoundTransform(ActNewGameBook.this, 2))
-                    .into(ViewFindUtils.find(convertView, R.id.img_listview_item_game_order_vip, ImageView.class));
-
-            ViewFindUtils.find(convertView, R.id.txt_listview_item_game_order_gift, TextView.class)
-                    .setText(getItem(position).getGiftContent());
-
-            final String[] strUrlArray = getItem(position).getGame().getDetailImage().split("&&");
-            final Map<Integer, String> mUrlsCollection = new HashMap<>();
-            for (int index = 0; index < strUrlArray.length; index++) {
-                if (index > 2) {
-                    break;
-                }
-                final int mPostion = index;
-                int resImageId = getResources().getIdentifier("game_order_iv_" + (index + 1), "id", ActNewGameBook.this.getPackageName());
-
-                ImageView vpImageChildItem = ViewFindUtils.hold(convertView, resImageId);
-                Glide.with(ActNewGameBook.this)
-                        .load(strUrlArray[index])
-                        .placeholder(R.drawable.loading)
-                        .into(vpImageChildItem);
-
-                vpImageChildItem.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        startPictureEnlarge(mPostion, mUrlsCollection);
-                    }
-                });
-                mUrlsCollection.put(index, strUrlArray[index]);
-
-            }
-            ViewFindUtils.hold(convertView, R.id.img_listview_item_game_order)
-                    .setVisibility(View.VISIBLE);
-
-            KFProgressButton btnTarget = ViewFindUtils.hold(convertView, R.id.game_order_btn_order);
-            if (KFZSDDContentSession.getInstance().isHasHeadSession(ActNewGameBook.this)
-                    && getItem(position).getBooked()) {
-                btnTarget.setText(R.string.btn_ordered);
-                btnTarget.setClickable(false);
-            } else {
-                btnTarget.setText(R.string.btn_order);
-                btnTarget.setClickable(true);
-            }
-
-            btnTarget.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (!KFZSDDContentSession.getInstance().isHasHeadSession(ActNewGameBook.this)) {
-                        Bundle bundle = new Bundle();
-                        bundle.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActUser.JOB_CODE_LOGIN);
-                        Intent intent = new Intent(ActNewGameBook.this, ActAuth.class);
-                        intent.putExtras(bundle);
-                        ActNewGameBook.this.startActivity(intent);
-                    } else {
-                        postGameBook(String.valueOf(getItem(position).getId()));
-                    }
-                }
-            });
-            ViewFindUtils.hold(convertView, R.id.rl_item_list_view_game_order_title)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-//                            int id = getItem(position).getId();
-//                            String url = getItem(position).getUrl();
-//                            long gameId = getItem(position).getGameId();
-//                            String name = getItem(position).getName();
-//                            String packageName = getItem(position).getGame().getPackageName();
-//                            String versionCode = getItem(position).getGame().getVersionCode();
-//                            String iconImage = getItem(position).getGame().getIconImage();
-//                            String size = getItem(position).getGame().getSize();
-//                            Bundle bundle = new Bundle();
-//                            bundle.putString(KFIntentKeys.EXTRA_BEHAIOR, ActWeb.BEHAVIOR_GAME_BOOK);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_URL, url);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_TITLE, name);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_SHARE_IMGURL, iconImage);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_BOOK_ID, String.valueOf(id));
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_ID, String.valueOf(gameId));
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_PACKAGENAME, packageName);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_VERSION, versionCode);
-//                            bundle.putString(KFIntentKeys.EXTRA_WEBVIEW_GAME_SIZE, size);
-//                            Intent intent = new Intent(ActNewGameBook.this, ActWeb.class);
-//                            intent.putExtras(bundle);
-//                            startActivity(intent);
-                            SkipUtils.getInstance().goGameDetails(ActNewGameBook.this,getItem(position).getGame().getId());
-                        }
-                    });
-
-            return convertView;
-        }
-    };
-
-    private void doNetworkTask(int limit, int offset) {
-        mListMore.setRefreshing(true);
-        HashMap<String, String> params = new HashMap<>();
-        params.put("limit", limit + "");
-        params.put("offset", offset + "");
-        if (null != KFZSDDContentSession.getInstance().findOutHeadSession(this)) {
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(this).getToken();
-            params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        }
-
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.GameBookAllApi.GAME_ALL_BOOK, params, new ResponseNetworkTask() {
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                lGameBookCollection.clear();
-                lGameBookCollection.addAll(apiResponse.getGameBooksList());
-                adapter.notifyDataSetChanged();
-                mListMore.setRefreshing(false);
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                mListMore.setRefreshing(false);
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-    private final String getHTMLStr(String strCount) {
-        return "已有 <font color='#fa6324' size='30'>" + strCount + "</font>" + " 人预约";
-    }
-
-
-    private void startPictureEnlarge(int position, Map<Integer, String> mUrlsCollection) {
-        Intent picEnlargeIntent = new Intent(ActNewGameBook.this, ActPicturesEnlarge.class);
-        picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_INDEX, position);
-        picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_COLLECTIONS, (Serializable) mUrlsCollection);
-        ActNewGameBook.this.startActivity(picEnlargeIntent);
-    }
-
-
-    /**
-     * 发起预约请求
-     *
-     * @param gameBookId
-     */
-    public void postGameBook(String gameBookId) {
-
-        if (KFZSDDContentSession.getInstance().findOutHeadSession(this) == null) {
-            showToast(R.string.toast_user_info_you_ara_not_sign);
-            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(this).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));
-                doNetworkTask(100, 1);
-                new KFDialogFragment().show(ActNewGameBook.this.getSupportFragmentManager(), "book");
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                showToast(msg);
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-}

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

@@ -1,350 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.appstore.utils.update.UriUtils;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.PictureAssetOuterClass;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.kfzs.duanduan.utils.net.ApiUploadFileCallBack;
-import com.kfzs.duanduan.utils.net.UploadHttpURLConnectionUtils;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-import mdl.sinlov.android.log.ALog;
-import top.zibin.luban.Luban;
-import top.zibin.luban.OnCompressListener;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActPersonPage</p>
- * @ <p>Description:个人信息页的页面</p>
- * @ date:  2017/8/7 18:44
- * @ QQ:    315096953
- */
-
-public class ActPersonPage extends PicBottomSheetActivity implements View.OnClickListener {
-
-    public static final int WHAT_COMPRESS_IMG_START = -100;
-    public static final int WHAT_COMPRESS_IMG_SUCCESS = -101;
-    public static final int WHAT_COMPRESS_IMG_ERROR = -102;
-    public static final int WHAT_SEND_IMG_START = -103;
-    public static final int WHAT_SEND_IMG_IN_PROGRESS = -104;
-    public static final int WHAT_SEND_IMG_SUCCESS = -105;
-    public static final int WHAT_SEND_IMG_ERROR = -106;
-    public static final int JOB_CHANGE_TITLE = 1;
-    public static final int JOB_CODE_LOGIN = 2 << 1;
-    public static final int JOB_CODE_SELF_CENTER = 3 << 1;
-    public static final int JOB_CODE_SELF_INFO_SHOW = 4 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_PASSWORD = 5 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_NICKNAME = 6 << 1;
-    public static final int JOB_CODE_SELF_BIND_PHONE = 7 << 1;
-
-
-    private TextView mTxtPhone;
-    private ImageView mImgHead;
-    private final int INTENT_BACK_PIC = 2;
-    private ProgressDialog userAvatarProgressDialog;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_person_page);
-        TitleBarUtils.getInstance().setTitleFinish(this).setTitle(this, "个人信息");
-
-
-        mTxtPhone = (TextView) findViewById(R.id.txt_person_page_phone);
-        mImgHead = (ImageView) findViewById(R.id.img_activity_person_page_icon);
-
-        findViewById(R.id.btn_activity_person_page)
-                .setOnClickListener(this);
-        findViewById(R.id.layout_activity_person_page_head)
-                .setOnClickListener(this);
-        findViewById(R.id.activity_person_page_nick)
-                .setOnClickListener(this);
-        findViewById(R.id.activity_person_page_changepass)
-                .setOnClickListener(this);
-
-
-        initView();
-        initPicChoose();
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        initView();
-    }
-
-    /**
-     * 载入初始化数据
-     */
-    private void initView() {
-        /**
-         * 没有绑定，就要绑定
-         */
-        UserBean userBean = DDProviderHelper.getInstance().getLastUserBean(this);
-        if (userBean == null) {
-            return;
-        }
-        if (TextUtils.isEmpty(userBean.getPhone())) {
-            findViewById(R.id.activity_person_page_phone)
-                    .setOnClickListener(this);
-            mTxtPhone.setText("绑定手机");
-        } else {
-            findViewById(R.id.img__person_page_phone).setVisibility(View.INVISIBLE);
-            mTxtPhone.setText(userBean.getPhone());
-        }
-        ((TextView) findViewById(R.id.txt_activity_person_page_nick))
-                .setText(userBean.getNickname());
-        ((TextView) findViewById(R.id.txt_activity_person_page_account))
-                .setText(TextUtils.isEmpty(userBean.getUserName())
-                        ? userBean.getPhone() : userBean.getUserName());
-
-        Glide.with(this)
-                .load(userBean.getAvatar())
-                .transform(new KFGlideRoundTransform(this, 5))
-                .error(R.drawable.ic_user_head_default)
-                .into(mImgHead);
-    }
-
-    /**
-     * 更改图片相关的初始化
-     */
-    private void initPicChoose() {
-        initBottomSheetLayoutByID(R.id.bottom_sheet_layout_activity_person_page, R.string.title_bottom_select_image_view);
-        initPicBottomSheetHandler();
-        userAvatarProgressDialog = new ProgressDialog(this);
-        userAvatarProgressDialog.setCancelable(false);
-        userAvatarProgressDialog.setCanceledOnTouchOutside(false);
-    }
-
-    @Override
-    public void onClick(View v) {
-        Intent intent;
-        switch (v.getId()) {
-            //点切换帐号
-            case R.id.btn_activity_person_page:
-                Bundle bundle = new Bundle();
-                bundle.putInt(ActAccountManage.KEY_SKIP_JOB_CODE, ActAccountManage.JOB_CHANGE_ACCOUNT_SHOW_LIST);
-                skip2Activity(ActAccountManage.class, bundle);
-                break;
-            //点击头像换头像
-            case R.id.activity_person_page_nick:
-                intent = new Intent(ActPersonPage.this, ActSimple.class);
-                intent.putExtra(ActSimple.INTENT_ACTION, ActSimple.ACTION.CHANGE_NICK_NAME);
-                startActivity(intent);
-                break;
-            //修改密码
-            case R.id.activity_person_page_changepass:
-                intent = new Intent(ActPersonPage.this, ActSimple.class);
-                intent.putExtra(ActSimple.INTENT_ACTION, ActSimple.ACTION.CHANGE_PASS);
-                startActivity(intent);
-                break;
-            //绑定手机号
-            case R.id.activity_person_page_phone:
-                intent = new Intent(ActPersonPage.this, ActSimple.class);
-                intent.putExtra(ActSimple.INTENT_ACTION, ActSimple.ACTION.BIND_PHONE);
-                startActivity(intent);
-                break;
-            //修改用户头像
-            case R.id.layout_activity_person_page_head:
-                System.gc();
-                callSheetImageViewPop();
-                break;
-        }
-    }
-
-    @Override
-    protected boolean showSheetImageView(ImageView imageView, Uri imageUri, int size) {
-        Glide.with(ActPersonPage.this)
-                .load(imageUri)
-                .centerCrop()
-                .crossFade()
-                .into(imageView);
-        return true;
-    }
-
-    @Override
-    protected void callBackSelectedImageUriByBottomSheet(Uri selectedImageUri) {
-        ALog.d("callBackSelectedImageUriByBottomSheet: " + selectedImageUri);
-        sendSafeHandle(WHAT_COMPRESS_IMG_START, selectedImageUri);
-        userAvatarProgressDialog.setMessage("上传中");
-        userAvatarProgressDialog.show();
-    }
-
-    @Override
-    public void safeHandleCallBack(WeakReference<PicBottomSheetActivity> wrAct, int what, Object obj) {
-        switch (what) {
-            case WHAT_COMPRESS_IMG_START:
-                final Uri selectedImageUri = (Uri) obj;
-                final File file = UriUtils.absoluteImageFile(wrAct.get(), selectedImageUri);
-                if (file != null) {
-                    compressImageByLuBan(selectedImageUri, file);
-                } else {
-                    //TODO 压缩图片错误 关闭 loading UI
-                    hideAvatarProgressDialogByMessage("图片选择错误,取消上传");
-                }
-                break;
-            case WHAT_COMPRESS_IMG_ERROR:
-                //TODO 压缩图片错误 关闭 loading UI
-                hideAvatarProgressDialogByMessage("压缩图片错误 取消上传");
-                break;
-            case WHAT_COMPRESS_IMG_SUCCESS:
-                File compressImageFile = (File) obj;
-                if (compressImageFile != null) {
-                    sendSafeHandle(WHAT_SEND_IMG_START, compressImageFile);
-                } else {
-                    sendSafeHandle(WHAT_COMPRESS_IMG_ERROR, "压缩图片输出错误,取消上传");
-                }
-                break;
-            case WHAT_SEND_IMG_START:
-                File compressImageSuccess = (File) obj;
-                UploadHttpURLConnectionUtils uploadHttpURLConnectionUtils = new UploadHttpURLConnectionUtils();
-                String token = findOutNewUserToken(uploadHttpURLConnectionUtils);
-                uploadHttpURLConnectionUtils.setSecurityValue(token);
-                uploadHttpURLConnectionUtils.setErrorMsgOutOfTime(getString(R.string.network_conf_timeout));
-                uploadHttpURLConnectionUtils.setUploadFileCallBack(new ApiUploadFileCallBack() {
-                    @Override
-                    public void uploadProgress(int progress) {
-                        sendSafeHandle(WHAT_SEND_IMG_IN_PROGRESS, progress);
-                    }
-
-                    @Override
-                    public void onApiSuccess(ApiResponseOuterClass.ApiResponse response) {
-                        ALog.d(response.toString());
-                        PictureAssetOuterClass.PictureAsset pictureAsset = response.getAsset();
-                        if (pictureAsset != null) {
-                            String pictureAssetUrl = pictureAsset.getUrl();
-                            if (TextUtils.isEmpty(pictureAssetUrl)) {
-                                sendSafeHandle(WHAT_SEND_IMG_ERROR, "上传图片显示URL失败");
-                            } else {
-                                sendSafeHandle(WHAT_SEND_IMG_SUCCESS, pictureAssetUrl);
-                            }
-                        } else {
-                            sendSafeHandle(WHAT_SEND_IMG_ERROR, "上传图片显示失败");
-                        }
-                    }
-
-                    @Override
-                    public void onApiUnauthorized(ApiResponseOuterClass.ApiResponse response) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, response.getMsg());
-                    }
-
-                    @Override
-                    public void onApiError(int errorCode, ApiResponseOuterClass.ApiResponse response) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, response.getMsg());
-                    }
-
-                    @Override
-                    public void onParseError(int errorCode, Exception e) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, e.getMessage());
-                    }
-                });
-                uploadHttpURLConnectionUtils.uploadFileByThread(compressImageSuccess, UrlBll.UploadPic.AVATAR);
-                break;
-            case WHAT_SEND_IMG_ERROR:
-                //TODO send Error 上传错误 关闭 loading UI
-                String imageError = (String) obj;
-                String imageErrorMsg = "上传失败: " + imageError;
-                ALog.d(imageErrorMsg);
-                hideAvatarProgressDialogByMessage(imageErrorMsg);
-                break;
-            case WHAT_SEND_IMG_IN_PROGRESS:
-                int progress = (int) obj;
-                String imageProgressMsg = "上传中: " + progress + "%";
-                ALog.d(imageProgressMsg);
-                userAvatarProgressDialog.setMessage(imageProgressMsg);
-                break;
-            case WHAT_SEND_IMG_SUCCESS:
-                String pictureAssetUrl = String.valueOf(obj);
-                showUserAvatar(pictureAssetUrl);
-                String imgSuccessMsg = "上传成功!";
-                hideAvatarProgressDialogByMessage(imgSuccessMsg);
-                break;
-        }
-    }
-
-    private void compressImageByLuBan(final Uri selectedImageUri, File file) {
-        Luban.get(this)
-                .load(file)                     //传人要压缩的图片
-                .putGear(Luban.THIRD_GEAR)      //设定压缩档次，默认三挡
-                .setCompressListener(new OnCompressListener() {
-                    @Override
-                    public void onStart() {
-                        // TODO 压缩开始前调用，可以在方法内启动 loading UI
-                    }
-
-                    @Override
-                    public void onSuccess(File file) {
-                        sendSafeHandle(WHAT_COMPRESS_IMG_SUCCESS, file);
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        sendSafeHandle(WHAT_COMPRESS_IMG_ERROR, selectedImageUri);
-                    }
-                }).launch();
-    }
-
-    protected String findOutNewUserToken(UploadHttpURLConnectionUtils uploadHttpURLConnectionUtils) {
-        SessionBean outHeadSession = KFZSDDContentSession.getInstance().findOutHeadSession(app);
-        if (outHeadSession != null) {
-            String token = outHeadSession.getToken();
-            if (!TextUtils.isEmpty(token)) {
-                return token;
-            } else {
-                return "";
-            }
-        } else {
-            return "";
-        }
-    }
-
-
-    protected void hideAvatarProgressDialogByMessage(String msg) {
-        showToast(msg);
-        userAvatarProgressDialog.hide();
-    }
-
-    private void showUserAvatar(String avatar) {
-        if (!TextUtils.isEmpty(avatar)) {
-            ALog.d(avatar);
-            Glide.with(this)
-                    .load(avatar)
-                    .error(R.drawable.ic_user_head_default)
-                    .into(mImgHead);
-
-            User user = DDProviderHelper.getInstance().getLastUser(this);
-            user.setMAvatar(avatar);
-            DDProviderHelper.getInstance().addOrUpdateUser(this, user);
-
-            Current current = DDProviderHelper.getInstance().getLastUser(this);
-            current.setMAvatar(avatar);
-            DDProviderHelper.getInstance().setLastUser(this, current);
-        }
-    }
-}

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

@@ -1,671 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.ContentValues;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
-import android.text.InputFilter;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.text.method.DigitsKeyListener;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLCheckBox;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.YogConfig;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.event.ReStartEvent;
-import com.kfzs.duanduan.fragment.AuthLoginFragment;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.AuthRequestBytes;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-import static com.kfzs.duanduan.ActLogin.KEY_LOGIN_TYPE;
-import static com.kfzs.duanduan.ActLogin.LOGIN_TYPE_IS_APP_LOGIN;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActRegist</p>
- * @ <p>Description:移植过来的，代码恶心不背锅</p>
- * @ date:  2018/1/24 17:33
- * @ QQ:    315096953
- */
-
-public class ActRegist extends BaseCompatActivity implements View.OnClickListener {
-
-    private TextInputLayout etUserName;
-    private TextInputEditText etCaptchaPhone;
-    private TextInputEditText etPassword;
-    private TextInputEditText etPasswordOnceMore;
-    private TextInputEditText etInviteCode;
-    private TextView btnCaptchaPhone;
-    private Button btnRegister;
-    private MDLCheckBox ckClause;
-    private TextView tvShowClause;
-    private TextView tvSkip2RegisterByUserName;
-    private LinearLayout mLayoutValicode;
-
-    private boolean isRegistering = false;
-    private boolean canGetCaptchaPhone = true;
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private String agreementKuaifaAssentClause;
-    private String Token;
-    private int loginFrom = ActLogin.LOGIN_TYPE_IS_APP_LOGIN;
-    private boolean mIsRegistNick = false;//是否为用户名注册
-    private LinearLayout mLayoutFirstStep;
-    private LinearLayout mLayoutSecondStep;
-    private Bundle extras;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);//去掉标题栏
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
-        extras = getIntent().getExtras();
-        if (extras == null) {
-            extras = new Bundle();
-        }
-
-
-        setContentView(R.layout.act_regist);
-        if (getIntent().hasExtra(KEY_LOGIN_TYPE)) {
-            loginFrom = getIntent().getIntExtra(KEY_LOGIN_TYPE, LOGIN_TYPE_IS_APP_LOGIN);
-        }
-
-
-        agreementKuaifaAssentClause = getString(R.string.toast_user_login_act_please_agreement_kuaifa_assent_clause) + getString(R.string.str_public_html_clause) + "!";
-        initViewByID();
-        setListeners();
-        if (Build.VERSION.SDK_INT > 20) {
-            findViewByIdT(R.id.img_act_regist_back)
-                    .setPadding(0, G.getRealPix(25), 0, 0);
-        }
-    }
-
-    private void initViewByID() {
-        this.mLayoutFirstStep = findViewById(R.id.layout_act_regist_first);
-        this.mLayoutSecondStep = findViewById(R.id.layout_act_regist_second);
-        this.mLayoutValicode = findViewById(R.id.layout_act_regist_valicode);
-        this.etUserName = findViewById(R.id.et_fgt_register_phone_username);
-        this.etCaptchaPhone = findViewById(R.id.et_fgt_register_phone_captcha_phone);
-        this.etPassword = findViewById(R.id.et_fgt_register_phone_password);
-        this.etPasswordOnceMore = findViewById(R.id.et_fgt_register_phone_password_once_more);
-        this.btnCaptchaPhone = findViewById(R.id.btn_fgt_register_phone_get_captcha_phone);
-        this.btnRegister = findViewById(R.id.btn_fgt_register_phone_action);
-        this.ckClause = findViewById(R.id.ck_fgt_register_phone_clause);
-        this.tvShowClause = findViewById(R.id.tv_fgt_register_phone_clause);
-        this.tvSkip2RegisterByUserName = findViewById(R.id.tv_fgt_register_phone_skip_register_fgt_ordinary);
-        this.etInviteCode = findViewById(R.id.et_flage_invite_code);
-    }
-
-    private void setListeners() {
-        findViewByIdT(R.id.img_act_regist_back).setOnClickListener(this);
-        btnCaptchaPhone.setOnClickListener(this);
-        btnRegister.setOnClickListener(this);
-        tvSkip2RegisterByUserName.setOnClickListener(this);
-        tvShowClause.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.getvalicode));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.getvalicode));
-            }
-        };
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_register_phone_get_captcha_phone:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_register_phone_action:
-                registerByStatus();
-                break;
-            case R.id.tv_fgt_register_phone_skip_register_fgt_ordinary:
-                mIsRegistNick = !mIsRegistNick;
-                this.etUserName.getEditText().setText("");
-                if (mIsRegistNick) {
-                    tvSkip2RegisterByUserName.setText(R.string.tv_user_login_act_user_register_phone);
-                    mLayoutValicode.setVisibility(View.INVISIBLE);
-                    this.etUserName.setHint(getString(R.string.hint_user_et_login_act_username));
-                    this.etUserName.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_FILTER);
-                    this.etUserName.getEditText().setKeyListener(DigitsKeyListener
-                            .getInstance(getString(R.string.digits_username)));
-
-                    InputFilter[] filters = {new InputFilter
-                            .LengthFilter(getResources().getInteger(R.integer.size_max_user_name))};
-                    this.etUserName.getEditText().setFilters(filters);
-                } else {
-                    tvSkip2RegisterByUserName.setText(R.string.tv_user_login_act_user_register_ordinary);
-                    mLayoutValicode.setVisibility(View.VISIBLE);
-                    this.etUserName.setHint(getString(R.string.hint_user_et_login_act_phone_hint));
-                    this.etUserName.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
-
-                    InputFilter[] filters = {new InputFilter
-                            .LengthFilter(getResources().getInteger(R.integer.size_phone_number))};
-                    this.etUserName.getEditText().setFilters(filters);
-                }
-                break;
-            case R.id.tv_fgt_register_phone_clause:
-                Uri uri = Uri.parse(getString(R.string.str_public_html_clause_url));
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-                break;
-            case R.id.img_act_regist_back:
-                if (mLayoutSecondStep.getVisibility() == View.VISIBLE) {
-                    mLayoutSecondStep.setVisibility(View.GONE);
-                    mLayoutFirstStep.setVisibility(View.VISIBLE);
-                    btnRegister.setText("下一步");
-                } else {
-                    finish();
-                }
-                break;
-            default:
-                break;
-
-        }
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(ActRegist.this);
-                            registerByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etPasswordOnceMore.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkUserWithPhone()) {
-            byte[] captchaPhoneBytes;
-            String phoneNum = etUserName.getEditText().getText().toString().trim();
-            String inviationCode = etInviteCode.getText().toString().trim();
-
-            captchaPhoneBytes = AuthRequestBytes.getInstance()
-                    .buildRegisterBytes(null, phoneNum, inviationCode, "",
-                            null, Session.RegisterStepCodes.CaptchaPhone_VALUE, null);
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.REGISTER, null, captchaPhoneBytes,
-                    new OnCaptchaPhone(), errorListener);
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkUserWithPhone() {
-        if (UITextUtils.isEditTextEmpty(etUserName.getEditText())) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        String phoneNumber = etUserName.getEditText().getText().toString().trim();
-        if (phoneNumber.length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (!phoneNumber.matches("^\\d{11}$")) {
-            showToast(R.string.toast_warning_phone_number_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-        return true;
-    }
-
-    private void registerByStatus() {
-        if (mLayoutFirstStep.getVisibility() == View.VISIBLE) {
-            if (mIsRegistNick && etUserName.getEditText().length() < 4) {
-                showToast("用户名至少输入4位哦");
-                return;
-            }
-            if (!mIsRegistNick && etUserName.getEditText().length() < 11) {
-                showToast("请输入11位手机号");
-                return;
-            }
-            if (!mIsRegistNick && etCaptchaPhone.length()
-                    != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast("请先正确输入验证码哦");
-                return;
-            }
-            mLayoutFirstStep.setVisibility(View.GONE);
-            mLayoutSecondStep.setVisibility(View.VISIBLE);
-            btnRegister.setText(R.string.btn_user_register_action);
-            return;
-        }
-        if (!isRegistering) {
-            postRegister();
-        } else {
-            showToast(R.string.toast_user_login_act_is_register, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postRegister() {
-        if (checkRegisterParams()) {
-            String pwd = etPassword.getText().toString().trim();
-            String pwdOnceMore = etPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context,
-                        new KFZSRestfulErrorCallBack() {
-                            @Override
-                            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                                isRegistering = false;
-                            }
-                        });
-                byte[] registerBytes;
-                String userName = etUserName.getEditText().getText().toString().trim();
-                String captchaPhone = null;
-                if (!mIsRegistNick) {
-                    captchaPhone = etCaptchaPhone.getText().toString().trim();
-                }
-                String inviationCode = etInviteCode.getText().toString().trim();
-
-                registerBytes = AuthRequestBytes.getInstance().buildRegisterBytes(pwdOnceMore,
-                        userName, inviationCode, "", null,
-                        Session.RegisterStepCodes.RegisterByCaptchaPhone_VALUE, captchaPhone);
-
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.REGISTER,
-                        null, registerBytes,
-                        new OnRegisterByPhone(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isRegistering = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-
-    private boolean checkRegisterParams() {
-        if (!ckClause.isChecked()) {
-            showToast(agreementKuaifaAssentClause, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (UITextUtils.isEditTextEmpty(etUserName.getEditText())) {
-            showToast(R.string.tv_user_login_act_please_input_username, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (mIsRegistNick) {
-            String phoneNumber = etUserName.getEditText().getText().toString().trim();
-            if (phoneNumber.length() < getResources().getInteger(R.integer.size_less_user_name)) {
-                showToast(R.string.toast_warning_user_name_less);
-                return false;
-            }
-            if (!phoneNumber.matches("^[a-zA-Z].*")) {
-                showToast(R.string.toast_warning_user_name_start, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            }
-        } else {
-            String phoneNumber = etUserName.getEditText().getText().toString().trim();
-            if (phoneNumber.length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            }
-            if (!phoneNumber.matches("^\\d{11}$")) {
-                showToast(R.string.toast_warning_phone_number_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-            if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptchaPhone.getText().toString().trim().length()
-                        != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-
-        if (UITextUtils.isEditTextEmpty(etPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            String pwd = etPassword.getText().toString().trim();
-            if (pwd.length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPassword.getText().toString().trim().length()
-                    < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    private class OnRegisterByPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            isRegistering = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    //                    skip2JobFgt(ActAuth.JOB_CODE_LOGIN);
-//                    setLoginCannel();
-                    autoLogin();
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    //注册成功，自动登录；
-    private void autoLogin() {
-        AuthEvent.setRegisterback("");
-        postLoginByNetwork(etUserName.getEditText().getText().toString().trim(),
-                etPasswordOnceMore.getText().toString().trim(), "");
-    }
-
-
-    private void postLoginByNetwork(String account, String psd, String captcha) {
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(account);
-        sessionBuild.setCaptcha(captcha);
-        sessionBuild.setCaptchaKey("");
-        sessionBuild.setPwd(psd);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN,
-                null, apiRequest1.toByteArray(), new ResponseAuthLogin(account), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-    }
-
-    private class ResponseAuthLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-
-        private final String account;
-
-        public ResponseAuthLogin(String account) {
-            this.account = account;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int code = apiResponse.getCodeValue();
-            switch (code) {
-
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Session.SessionOut sessionOut = apiResponse.getSessionOut();
-                    String openId = sessionOut.getOpenId();
-                    KFZSDDContentSession.getInstance().insertOrUpdateSession(ActRegist.this, account,
-                            openId, sessionOut.getUid(), sessionOut.getToken());
-                    Token = sessionOut.getToken();
-                    popHeadSessionUserGraphInfo(sessionOut.getToken());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-
-    private void popHeadSessionUserGraphInfo(String uid) {
-        SessionBean saveHeadSessionInMem = KFZSDDContentSession.getInstance().getSaveHeadSessionInMem();
-        String token = saveHeadSessionInMem.getToken();
-        ALog.d("Auth popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error);
-            KFZSDDContentSession.getInstance().removeHeadSession(this);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(this, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_error_repeat);
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params,
-                new OnHeadSessionUserGraph(uid), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-
-    private class OnCaptchaPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        String token;
-
-        public OnHeadSessionUserGraph(String uid) {
-            this.token = uid;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        filterByDifferentLoginType(user, token);
-                    } else {
-                        showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    ALog.d("Auth popHeadToken: Unauthorized_VALUE");
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    private void filterByDifferentLoginType(UserOuterClass.User user, String token) {
-        InputMethodUtils.closeInputPan(ActRegist.this);
-        EventBus eventBus = EventBus.getDefault();
-
-        loginFrom = 1;
-        switch (loginFrom) {
-            case AuthLoginFragment.LOGIN_TYPE_IS_CERTIFICATION://游戏认证登录；
-                upDateUserInfo(user, token, false);
-                setPlayer(user, token);
-                extras.putInt(ActGameCertification.SKIP_CODE_USER_BEHAVIOR, ActGameCertification.JOB_CHANGE_ACCOUNT_TOKEN_SUCCESS);
-                extras.putBoolean(getString(R.string.kfzs_duanduan_datashare_certificationed), true);
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_userid), String.valueOf(user.getId()));
-                extras.putString(getString(R.string.kfzs_duanduan_datashare_certification_token), token);
-                skip2Activity(ActGameCertification.class, extras);
-                this.finish();
-                break;
-            default:
-                eventBus.post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                ReStartEvent event = new ReStartEvent();
-                event.setReStart(true);
-                EventBus.getDefault().post(event);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                if (null != countDownGetCaptchaPhone) {
-                    countDownGetCaptchaPhone.reset();
-                }
-                ActRegist.this.finish();
-
-                break;
-        }
-    }
-
-    //游戏授权 保存数据；
-    public void setPlayer(UserOuterClass.User user, String token) {
-        ContentValues values = new ContentValues();
-        values.put(YogConfig.Player.TOKEN, token);
-        values.put(YogConfig.Player.DD_USERID, String.valueOf(user.getId()));
-        values.put(YogConfig.Player.OPENID, user.getOpenId());
-        values.put(YogConfig.Player.USERNAME, user.getName());
-        values.put(YogConfig.Player.CHANNEL, DataSave.getInstance().getChannelName());
-        String gameCode = KFZSApp.getInstance().GameCode;
-
-        try {
-            DDProviderHelper.getInstance().insertOrUpdatePalyer(this, values, gameCode);
-            DDProviderHelper.getInstance().setGameLastPalyer(this, String.valueOf(user.getOpenId()), gameCode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    //补全用户信息到数据库；
-    public void upDateUserInfo(UserOuterClass.User user, String token, boolean isApp) {
-        int id = user.getId();
-        if (isApp) {
-            Current lastUser = DDProviderHelper.getInstance().getLastUser(this);
-            if (lastUser == null)
-                lastUser = new Current();
-            lastUser.setMUserId(String.valueOf(id));
-            lastUser.setMUserName(user.getName());
-            lastUser.setMVipType(user.getVipType());
-            lastUser.setMNickName(user.getNickname());
-            lastUser.setMMobile(user.getPhone());
-            lastUser.setMOpenId(user.getOpenId());
-            lastUser.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-            lastUser.setMAvatar(user.getAvatar());
-            lastUser.setMToken(token);
-
-            DDProviderHelper.getInstance().setLastUser(this, lastUser);
-        }
-
-
-        User player = DDProviderHelper.getInstance().getUser(this, String.valueOf(id));
-        if (player == null)
-            player = new User();
-        player.setMUserId(String.valueOf(id));
-        player.setMUserName(user.getName());
-        player.setMVipType(user.getVipType());
-        player.setMNickName(user.getNickname());
-        player.setMMobile(user.getPhone());
-        player.setMOpenId(user.getOpenId());
-        player.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-        player.setMAvatar(user.getAvatar());
-        player.setMToken(token);
-
-        DDProviderHelper.getInstance().addOrUpdateUser(this, player);
-        if (!TextUtils.isEmpty(KFZSApp.getInstance().GameCode)) {
-            DDProviderHelper.getInstance().addOrUpdatePlayer(this, player, KFZSApp.getInstance().GameCode);
-        }
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getAction() == KeyEvent.ACTION_DOWN
-                && mIsRegistNick) {
-            findViewById(R.id.img_act_regist_back).performClick();
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-}

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

@@ -42,20 +42,15 @@ import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.kfzs.duanduan.proto.GameBookOuterClass;
 import com.kfzs.duanduan.proto.HotWordsOuterClass;
 import com.kfzs.duanduan.proto.MistinessNamesOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import com.kfzs.duanduan.adp.AdpSearchGame;
-import com.kfzs.duanduan.adp.AdpSearchGift;
-import com.kfzs.duanduan.adp.AdpSearchNewGame;
 import com.kfzs.duanduan.adp.AdpSearchRecord;
-import com.kfzs.duanduan.adp.AdpSearchTest;
 import com.kfzs.duanduan.adp.AdpSearchViewPager;
-import com.kfzs.duanduan.fragment.KFDialogFragment;
+import com.orhanobut.logger.Logger;
 import com.sheep.jiuyan.samllsheep.R;
 
 import org.greenrobot.eventbus.EventBus;
@@ -69,8 +64,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 {
@@ -108,9 +101,6 @@ public class ActSearch extends BaseCompatActivity {
     private AdpSearchViewPager mAdpSearchViewPager;
 
     private AdpSearchGame mAdpSearchGame;
-    private AdpSearchGift mAdpSearchGift;
-    //private AdpSearchNewGame mAdpSearchNewGame;
-    //private AdpSearchTest mAdpSearchTest;
     private ArrayAdapter<String> mAdpKeyWords;
 
     private boolean mIsAutoShowTxt = true;//是否自动提示输入，不然在点搜索历史的时候，也会自动提示
@@ -140,7 +130,6 @@ public class ActSearch extends BaseCompatActivity {
         setSearchInputStatus();
         setInputEvents();
         initTabGame();
-        initTabGift();
         //initTabNewGame();
         //initTabTest();
 
@@ -220,7 +209,7 @@ public class ActSearch extends BaseCompatActivity {
 
             @Override
             public void onFail(int code, String msg) {
-                ALog.d("onFail", msg);
+                Logger.d("onFail", msg);
             }
 
         }, HelperUtils.makeErr(getString(R.string.toast_init_tag_fail)));
@@ -239,40 +228,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() {
@@ -287,19 +242,6 @@ public class ActSearch extends BaseCompatActivity {
     }
 
     /**
-     * 初始化游戏Gift
-     */
-    private void initTabGift() {
-        View view = View.inflate(this, R.layout.list_search, null);
-        ListView listView = (ListView) view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
-        mAdpSearchGift = new AdpSearchGift(this);
-        listView.setAdapter(mAdpSearchGift);
-
-        mAdpSearchViewPager.addView(view, R.string.tab_search_gift);
-    }
-
-    /**
      * 初始化游戏NewGame
      */
     private void initTabNewGame() {
@@ -373,16 +315,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("所有用户数据清除成功！");
-                }
             }
         });
 
@@ -483,16 +415,13 @@ public class ActSearch extends BaseCompatActivity {
                     @Override
                     public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
                         mAdpSearchGame.clear();
-                        mAdpSearchGift.clear();
                         //mAdpSearchNewGame.clear();
                         //mAdpSearchTest.clear();
                         mAdpSearchGame.addAll(apiResponse.getGamesList());
-                        mAdpSearchGift.addAll(apiResponse.getShelvesGiftsList());
                         //mAdpSearchNewGame.addAll(apiResponse.getOpenServersList());
                         //mAdpSearchTest.addAll(apiResponse.getOpenTestsList());
 
                         mAdpSearchGame.notifyDataSetChanged();
-                        mAdpSearchGift.notifyDataSetChanged();
                         //mAdpSearchNewGame.notifyDataSetChanged();
                         //mAdpSearchTest.notifyDataSetChanged();
                         showRecord(false);
@@ -500,54 +429,12 @@ public class ActSearch extends BaseCompatActivity {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ALog.d(TAG, "搜索结果获取失败" + msg);
+                        Logger.d(TAG, "搜索结果获取失败" + msg);
                     }
                 }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
         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);
-    }
-
-
     /**
      * 格式化搜索结果显示
      *
@@ -578,20 +465,6 @@ public class ActSearch extends BaseCompatActivity {
                 .handlDownloadResult(info);
     }
 
-    /**
-     * ????这里没分析意义
-     *
-     * @param event
-     */
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case USER_LOGIN_SUCC:
-                doQueryTask(mEdtKeyWord.getText().toString());
-                break;
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -1,112 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.widget.FrameLayout;
-
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.fragment.FgtBindPhone;
-import com.kfzs.duanduan.fragment.FgtBookedGame;
-import com.kfzs.duanduan.fragment.FgtChangeNick;
-import com.kfzs.duanduan.fragment.FgtChangePass;
-import com.kfzs.duanduan.fragment.FgtCouponHistory;
-import com.kfzs.duanduan.fragment.FgtForgetPass;
-import com.kfzs.duanduan.fragment.FgtVipCoupon;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.sheep.jiuyan.samllsheep.R;
-
-import static com.kfzs.duanduan.ActSimple.ACTION.BIND_PHONE;
-import static com.kfzs.duanduan.ActSimple.ACTION.BOOKED_GAME;
-import static com.kfzs.duanduan.ActSimple.ACTION.CHANGE_NICK_NAME;
-import static com.kfzs.duanduan.ActSimple.ACTION.CHANGE_PASS;
-import static com.kfzs.duanduan.ActSimple.ACTION.COUPON_HISTORY;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActSimple</p>
- * @ <p>Description:一些常用功能的页面，放此页面用Fragment实现</p>
- * @ date:  2017/8/8 10:03
- * @ QQ:    315096953
- */
-
-public class ActSimple extends BaseCompatActivity {
-
-    public final static String INTENT_ACTION = "INTENT_ACTION";
-    private FrameLayout mFrameLayout;
-    private FragmentManager mFragmentManager;
-
-    public enum ACTION {
-        CHANGE_NICK_NAME,//修改昵称页面
-        CHANGE_PASS,//修改密码页面
-        BIND_PHONE,//绑定手机页面
-        COUPON_HISTORY,//优惠券历史列表
-        COUPON_VIP,//已领取优惠券列表
-        BOOKED_GAME,//已经预约的游戏界面
-        FORGET_PASS//忘记密码
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.simple_activity);
-
-        TitleBarUtils.getInstance().setTitleFinish(this);
-
-        mFrameLayout = (FrameLayout) findViewById(R.id.fragment_simple_activity);
-
-        mFragmentManager = getSupportFragmentManager();
-        if (!getIntent().hasExtra(INTENT_ACTION)) {
-            G.showToast("操作请求失败！");
-            finish();
-            return;
-        }
-        doAction((ACTION) getIntent().getSerializableExtra(INTENT_ACTION));
-    }
-
-
-    /**
-     * 主要执行方法
-     */
-    private void doAction(ACTION action) {
-        switch (action) {
-            case CHANGE_NICK_NAME:
-                TitleBarUtils.getInstance().setTitle(this, "修改昵称");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtChangeNick(),
-                        true, CHANGE_NICK_NAME.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case CHANGE_PASS:
-                TitleBarUtils.getInstance().setTitle(this, "修改密码");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtChangePass(),
-                        true, CHANGE_PASS.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case BIND_PHONE:
-                TitleBarUtils.getInstance().setTitle(this, "绑定手机");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtBindPhone(),
-                        false, BIND_PHONE.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case COUPON_HISTORY:
-                TitleBarUtils.getInstance().setTitle(this, "xxxxx");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtCouponHistory(),
-                        false, COUPON_HISTORY.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case COUPON_VIP:
-                TitleBarUtils.getInstance().setTitle(this,
-                        VipStyle.getInstance().getViptypename() + "用户福利-兑换记录");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtVipCoupon(),
-                        false, COUPON_HISTORY.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case BOOKED_GAME:
-                TitleBarUtils.getInstance().setTitle(this, "已经预约");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtBookedGame(),
-                        false, BOOKED_GAME.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case FORGET_PASS:
-                TitleBarUtils.getInstance().setTitle(this, "忘记密码");
-                replaceSupportFragment(R.id.fragment_simple_activity, new FgtForgetPass(),
-                        false, BOOKED_GAME.toString(), R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-
-        }
-    }
-
-}

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

@@ -1,331 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.ImageView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.target.Target;
-import com.kf.utils.KFLog;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.AppBaseBll;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.SplashOuterClass;
-import com.kfzs.duanduan.proto.UpdateContentOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.dlg.UpdateUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.view.DialogUpdateFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by HooRang on 2017/3/3.
- */
-public class ActSplash extends BaseCompatActivity {
-
-    private final static int SECOND_DURATION = 3000;//首页闪屏延时毫秒。
-    private long mLngLaunchTime = 0L;
-
-    private String strUpdateDesc;
-
-    @BindView(R.id.activity_splash_image)
-    ImageView mImageView;
-
-    private String mStrSplashImgUrl;
-    private UpdateContentOuterClass.UpdateContent mUpdateContent;
-    private boolean mIsClickSplashImg = false;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);//隐藏标题栏
-        new AppBaseBll().loadVipStyleAll(this);
-        StatusBarUtils.setTransparent(this);
-        super.onCreate(savedInstanceState);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);//隐藏状态栏
-        setContentView(R.layout.activity_splash);
-
-        ButterKnife.bind(this);
-        setSplashImage();
-        mLngLaunchTime = System.currentTimeMillis();
-        checkUpdate();
-    }
-
-
-    /**
-     * 检查更新
-     */
-    private void checkUpdate() {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("cp_id", DataSave.getInstance().getChannelName());
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.VersionControlApi.APP_VERSION_INFO, params, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                if (apiResponse.getUpdateContentsList().isEmpty()) {
-                    delayStartActivity();//如果更新版本列表为空，直接延时启动主页
-                    return;
-                }
-                handleVersionCallBack(apiResponse.getUpdateContentsList().get(0));
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                startMainActivity();
-            }
-        }, null);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
-    /**
-     * 检测到有版本列表后的回调
-     *
-     * @param updateContent
-     */
-    private void handleVersionCallBack(UpdateContentOuterClass.UpdateContent updateContent) {
-        strUpdateDesc = updateContent.getContent();
-        this.mUpdateContent = updateContent;
-        Boolean force = updateContent.getForce() == 1;
-
-        UpdateUtils.getInstance(this).setmUpdateSetting(updateSetting)
-                .setmIsForceUpdate(force)
-//                .setmIntFileLength(Integer.valueOf(updateContent.getSize()))
-                .update(updateContent.getPackageName()
-                        , updateContent.getApkUrl(), updateContent.getVersionNum());
-
-//        CheckUpdate checkUpdate = new CheckUpdate(force, updateContent.getVersionNum(),
-//                updateContent.getPackageName(), updateContent.getApkUrl());
-//        Updater.getInstance().init(this.getApplication(), new UpdateCheckSetting(checkUpdate));
-//        Updater.getInstance().update(false);
-    }
-
-    private UpdateUtils.UpdateSetting updateSetting = new UpdateUtils.UpdateSetting() {
-
-        @Override
-        public void updateForce() {
-            showForciblyUpdateUI(strUpdateDesc, true);
-        }
-
-        @Override
-        public void updateSilent() {
-
-        }
-
-        @Override
-        public void updateNormal() {
-            showForciblyUpdateUI(strUpdateDesc, false);
-        }
-
-        @Override
-        public void updateNo() {
-            delayStartActivity();
-        }
-
-        @Override
-        public void udateProcess(int process) {
-
-        }
-
-        @Override
-        public void updateComplete() {
-
-        }
-    };
-
-
-    /**
-     * 延时启动主页
-     */
-    private void delayStartActivity() {
-        final long duration = (System.currentTimeMillis() - mLngLaunchTime);
-        if (duration >= SECOND_DURATION) {
-            startMainActivity();
-            return;
-        }
-
-        Handler handler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-                if (!isFinishing()) {
-                    startMainActivity();
-                }
-            }
-        };
-        handler.sendEmptyMessageDelayed(0, SECOND_DURATION - duration);
-    }
-
-    private void showForciblyUpdateUI(String strUpdateDesc, boolean isForceUpdate) {
-        String update_time_date = DateFormatUtils.doSecondDate(mUpdateContent.getCreatedTime());
-        new DialogUpdateFragment().init(isForceUpdate,
-                strUpdateDesc,
-                mUpdateContent.getVersionName(),
-                update_time_date,
-                mUpdateContent.getSize(),
-                new DialogUpdateFragment.CancelCallback() {
-                    @Override
-                    public void onCancel() {
-                        startMainActivity();
-                    }
-                })
-                .show(getSupportFragmentManager(), "update");
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-
-    /**
-     * 直接跳主页
-     */
-    private void startMainActivity() {
-        this.finish();
-        if (!mIsClickSplashImg) {
-            startActivity(new Intent(this, ActMain.class));
-        }
-    }
-
-
-    /**
-     * 加载闪屏图片，网络端或者本地端
-     */
-    private void setSplashImage() {
-        final String imagePath = Environment.getExternalStorageDirectory().getAbsolutePath()
-                + UrlBll.AdvertisementApi.SPLASH_ADVERTISEMENT_FILE_NAME
-                + UrlBll.AdvertisementApi.SPLASH_ADVERTISEMENT_IMAGE_NAME;
-        KFLog.d(TAG, "setSplashImage: " + imagePath);
-
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AdvertisementApi.SPLASH_ADVERTISEMENT, null, new ResponseNetworkTask() {
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                mStrSplashImgUrl = apiResponse.getSplash().getImageUrl();
-                KFLog.d(TAG, "onSuccess: " + mStrSplashImgUrl);
-                if (TextUtils.isEmpty(mStrSplashImgUrl)) {
-                    Glide.with(ActSplash.this).load(imagePath).diskCacheStrategy(DiskCacheStrategy.RESULT).skipMemoryCache(true).error(R.drawable.app_splash).into(mImageView);
-                } else {
-                    Glide.with(ActSplash.this).load(mStrSplashImgUrl).diskCacheStrategy(DiskCacheStrategy.RESULT).skipMemoryCache(true).error(R.drawable.app_splash).into(mImageView);
-                    initSplashImgListener(apiResponse.getSplash());
-                    new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            downloadSplashImage(mStrSplashImgUrl);
-                        }
-                    }).start();
-                }
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                KFLog.d(TAG, "闪屏图片加载失败：code: " + code + "\nmsg: " + msg);
-                Glide.with(ActSplash.this).load(imagePath).diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(true).error(R.drawable.app_splash).into(mImageView);
-                delayStartActivity();
-            }
-        }, new Response.ErrorListener() {
-            @Override
-            public void onErrorResponse(VolleyError volleyError) {
-                startMainActivity();
-            }
-        });
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-
-    /**
-     * 加载闪屏图片点击的监听
-     *
-     * @param splash
-     */
-    private void initSplashImgListener(final SplashOuterClass.Splash splash) {
-        mImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent;
-                switch (splash.getType()) {//游戏详情
-                    case 1:
-                        intent = new Intent(ActSplash.this, ActGameDetails.class);
-                        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, splash.getParam() + "");
-                        break;
-                    case 2://H5页面
-                        intent = new Intent(ActSplash.this, ActWeb.class);
-                        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, splash.getHtmlUrl());
-                        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, "闪屏推荐");
-                        break;
-                    default:
-                        return;
-                }
-                mIsClickSplashImg = true;
-                startActivity(intent);
-            }
-        });
-    }
-
-
-    /**
-     * 下载闪屏图片并保存
-     *
-     * @param splashImageUri 图片网址
-     */
-    private void downloadSplashImage(String splashImageUri) {
-        if (null != splashImageUri) {
-            try {
-                Bitmap bitmap = Glide.with(this).load(splashImageUri).asBitmap().
-                        into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get();
-                if (null != bitmap) {
-                    File appDir = new File(Environment.getExternalStorageDirectory().getAbsolutePath(), UrlBll.AdvertisementApi.SPLASH_ADVERTISEMENT_FILE_NAME);
-                    if (!appDir.exists()) {
-                        appDir.mkdir();
-                    }
-                    File file = new File(appDir, UrlBll.AdvertisementApi.SPLASH_ADVERTISEMENT_IMAGE_NAME);
-                    file.delete();//直接删除，没必要判断是否存在等。
-                    FileOutputStream fos = new FileOutputStream(file.getAbsolutePath());
-                    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-                    fos.flush();
-                    fos.close();
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            } catch (ExecutionException e) {
-                e.printStackTrace();
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else {
-            KFLog.d(TAG, "闪屏图片为空：SplashImageURI is null");
-        }
-    }
-}

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

@@ -1,67 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.view.ArrowDownloadButton;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ActTest</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/15 17:28
- * @ QQ:    315096953
- */
-public class ActTest extends BaseCompatActivity {
-
-
-    private int count;
-    private ArrowDownloadButton mBtnDown;
-    private float progress;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.act_test);
-        mBtnDown = findViewById(R.id.btn_act_test);
-        mBtnDown.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                progress = 0;
-                mBtnDown.reset();
-                if ((count % 2) == 0) {
-                    mBtnDown.startAnimating();
-                    final Timer timer = new Timer();
-                    timer.schedule(new TimerTask() {
-                        @Override
-                        public void run() {
-                            mBtnDown.post(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    progress = progress + 1;
-                                    mBtnDown.setProgress(progress);
-                                    if (progress == 100)
-                                        timer.cancel();
-                                }
-                            });
-                        }
-                    }, 800, 20);
-                } else {
-                    progress = 0;
-                    mBtnDown.reset();
-                }
-                count++;
-            }
-        });
-    }
-
-}

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

@@ -1,428 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.app.ProgressDialog;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.update.UriUtils;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.event.UserEvent;
-import com.kfzs.duanduan.fragment.UserSelfInfoShowFragment;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.PictureAssetOuterClass;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.ApiUploadFileCallBack;
-import com.kfzs.duanduan.utils.net.UploadHttpURLConnectionUtils;
-import com.sheep.jiuyan.samllsheep.R;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import mdl.sinlov.android.log.ALog;
-import top.zibin.luban.Luban;
-import top.zibin.luban.OnCompressListener;
-
-public class ActUser extends PicBottomSheetActivity {
-
-    public static final int WHAT_COMPRESS_IMG_START = -100;
-    public static final int WHAT_COMPRESS_IMG_SUCCESS = -101;
-    public static final int WHAT_COMPRESS_IMG_ERROR = -102;
-    public static final int WHAT_SEND_IMG_START = -103;
-    public static final int WHAT_SEND_IMG_IN_PROGRESS = -104;
-    public static final int WHAT_SEND_IMG_SUCCESS = -105;
-    public static final int WHAT_SEND_IMG_ERROR = -106;
-    public static final int JOB_CHANGE_TITLE = 1;
-    public static final int JOB_CODE_LOGIN = 2 << 1;
-    //    public static final int JOB_CODE_SELF_CENTER = 3 << 1;
-    public static final int JOB_CODE_SELF_INFO_SHOW = 4 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_PASSWORD = 5 << 1;
-    public static final int JOB_CODE_SELF_CHANGE_NICKNAME = 6 << 1;
-    public static final int JOB_CODE_SELF_BIND_PHONE = 7 << 1;
-    public static final String KEY_SKIP_JOB_CODE = ActUser.class.getCanonicalName() + ".job";
-
-    @BindView(R.id.fl_act_user_replace_fgt)
-    FrameLayout flActLoginReplaceFgt;
-    private AppBarLayout appBarLayout;
-    private ActionBar supportActionBar;
-    private CollapsingToolbarLayout collapsingToolbarLayout;
-    private Toolbar toolbar;
-    private NestedScrollView nestedScrollView;
-    private ImageView imgUserIcon;
-    private TextView tvButtonUserAvatarEdit;
-    private String titleString = "";
-    private Bundle extras;
-
-    private ProgressDialog userAvatarProgressDialog;
-    private CollapsingToolbarLayoutState collapsingToolbarLayoutState;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
-        setContentView(R.layout.activity_user);
-
-        ButterKnife.bind(this);
-        toolbar = (Toolbar) findViewById(R.id.toolbar_user);
-        setSupportActionBar(toolbar);
-        supportActionBar = getSupportActionBar();
-        if (null != supportActionBar) {
-            supportActionBar.setDisplayHomeAsUpEnabled(true);
-        }
-        initViewByID();
-        initUploadImg();
-        initListeners();
-        extras = getIntent().getExtras();
-        if (extras != null) {
-            int skipCode = extras.getInt(KEY_SKIP_JOB_CODE, 0);
-            UserEvent event = new UserEvent();
-            event.setSkipCode(skipCode);
-            filterUIByJobCode(event);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    private void initUploadImg() {
-        initPicBottomSheetHandler();
-    }
-
-    private void filterUIByJobCode(UserEvent userEvent) {
-        int skipCode = userEvent.getSkipCode();
-        filterAppBarByJobChangeTitle(userEvent, skipCode);
-        switch (skipCode) {
-            case JOB_CHANGE_TITLE:
-                setActionBarTitle(userEvent.getTitleID());
-                letAppBarExpandedAndNested(userEvent);
-                break;
-            case JOB_CODE_LOGIN:
-                Bundle bundle = new Bundle();
-                bundle.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_LOGIN);
-                skip2Activity(ActAuth.class, bundle);
-                break;
-//            case JOB_CODE_SELF_CENTER:    这个垃圾类为什么这么大？这就是原因，全是Goto无注释的写法，艹。Sign.Diao
-//                setActionBarTitle(R.string.title_user_activity_self_center);
-//                replaceSupportFragment(R.id.fl_act_user_replace_fgt, new UserSelfCenterFragment(), true,
-//                        UserEvent.SELF_CENTER, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-//                break;
-            case JOB_CODE_SELF_INFO_SHOW:
-                replaceSupportFragment(R.id.fl_act_user_replace_fgt, new UserSelfInfoShowFragment(), true,
-                        UserEvent.SELF_INFO_SHOW, R.anim.fgt_fade_in, R.anim.fgt_fade_out);
-                break;
-            case JOB_CODE_SELF_CHANGE_PASSWORD:
-                Bundle changePsd = new Bundle();
-                changePsd.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_SELF_CHANGE_PASSWORD);
-                skip2Activity(ActAuth.class, changePsd);
-                break;
-            case JOB_CODE_SELF_CHANGE_NICKNAME:
-                Bundle changeNickName = new Bundle();
-                changeNickName.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_SELF_CHANGE_NICKNAME);
-                skip2Activity(ActAuth.class, changeNickName);
-                break;
-            case JOB_CODE_SELF_BIND_PHONE:
-                Bundle bindPhone = new Bundle();
-                bindPhone.putInt(ActAuth.KEY_SKIP_JOB_CODE, ActAuth.JOB_CODE_SELF_BIND_PHONE);
-                skip2Activity(ActAuth.class, bindPhone);
-                break;
-            default:
-                ALog.w("develop use error JOB skipCode: " + skipCode);
-                break;
-        }
-    }
-
-    private void filterAppBarByJobChangeTitle(UserEvent event, int userEvent) {
-        Integer titleID = event.getTitleID();
-        if (userEvent == JOB_CHANGE_TITLE) {
-            switch (titleID) {
-                case R.string.title_user_activity_self_info:
-                    tvButtonUserAvatarEdit.setVisibility(View.VISIBLE);
-                    break;
-                default:
-                    tvButtonUserAvatarEdit.setVisibility(View.GONE);
-                    break;
-            }
-        }
-        // other JOB not filter show tvButtonUserAvatarEdit
-    }
-
-    private void initViewByID() {
-        appBarLayout = (AppBarLayout) findViewById(R.id.appbar_user);
-        collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar_user);
-        nestedScrollView = (NestedScrollView) findViewById(R.id.nsv_content_user);
-        this.imgUserIcon = (ImageView) findViewById(R.id.img_act_user_icon_large);
-        this.tvButtonUserAvatarEdit = (TextView) findViewById(R.id.tv_act_user_avatar_edit);
-        initBottomSheetLayoutByID(R.id.bottom_sheet_layout_act_user, R.string.title_bottom_select_image_view);
-        userAvatarProgressDialog = new ProgressDialog(this);
-        userAvatarProgressDialog.setCancelable(false);
-        userAvatarProgressDialog.setCanceledOnTouchOutside(false);
-    }
-
-    private void initListeners() {
-        appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                if (verticalOffset == 0) {
-                    if (collapsingToolbarLayoutState != CollapsingToolbarLayoutState.EXPANDED) {
-                        collapsingToolbarLayout.setTitle("");
-                        collapsingToolbarLayoutState = CollapsingToolbarLayoutState.EXPANDED;
-                    } else {
-                        collapsingToolbarLayout.setTitle("");
-                    }
-                } else if (Math.abs(verticalOffset) >= appBarLayout.getTotalScrollRange()) {
-                    if (collapsingToolbarLayoutState != CollapsingToolbarLayoutState.COLLAPSED) {
-                        collapsingToolbarLayout.setTitle(titleString);
-                        collapsingToolbarLayoutState = CollapsingToolbarLayoutState.COLLAPSED;
-                    }
-                } else {
-                    if (collapsingToolbarLayoutState != CollapsingToolbarLayoutState.INTERMEDIATE) {
-                        if (collapsingToolbarLayoutState == CollapsingToolbarLayoutState.COLLAPSED) {
-                            // do mid
-                            collapsingToolbarLayout.setTitle("");
-                        }
-                        collapsingToolbarLayout.setTitle("");
-                        collapsingToolbarLayoutState = CollapsingToolbarLayoutState.INTERMEDIATE;
-                    }
-                }
-            }
-        });
-        imgUserIcon.setOnClickListener(new OnUserIconClick());
-        tvButtonUserAvatarEdit.setOnClickListener(new OnChangeUserAvatarClick());
-        UserBean headUser = DDProviderHelper.getInstance().getLastUserBean(app);
-        if (headUser != null) {
-            String avatar = headUser.getAvatar();
-            showUserAvatar(avatar);
-        }
-    }
-
-    private enum CollapsingToolbarLayoutState {
-        EXPANDED,
-        COLLAPSED,
-        INTERMEDIATE
-    }
-
-    private void showUserAvatar(String avatar) {
-        if (!TextUtils.isEmpty(avatar)) {
-            ALog.d(avatar);
-            Glide.with(this)
-                    .load(avatar)
-                    .error(R.drawable.ic_user_head_default)
-                    .into(imgUserIcon);
-        }
-    }
-
-    @Subscribe
-    public void onEventMainThread(UserEvent userEvent) {
-        filterUIByJobCode(userEvent);
-    }
-
-    @Override
-    protected void callBackSelectedImageUriByBottomSheet(Uri selectedImageUri) {
-        ALog.d("callBackSelectedImageUriByBottomSheet: " + selectedImageUri);
-        sendSafeHandle(WHAT_COMPRESS_IMG_START, selectedImageUri);
-        userAvatarProgressDialog.setMessage("上传中");
-        userAvatarProgressDialog.show();
-    }
-
-    @Override
-    public void safeHandleCallBack(WeakReference<PicBottomSheetActivity> wrAct, int what, Object obj) {
-        switch (what) {
-            case WHAT_COMPRESS_IMG_START:
-                final Uri selectedImageUri = (Uri) obj;
-                final File file = UriUtils.absoluteImageFile(wrAct.get(), selectedImageUri);
-                if (file != null) {
-                    compressImageByLuBan(selectedImageUri, file);
-                } else {
-                    //TODO 压缩图片错误 关闭 loading UI
-                    hideAvatarProgressDialogByMessage("图片选择错误,取消上传");
-                }
-                break;
-            case WHAT_COMPRESS_IMG_ERROR:
-                //TODO 压缩图片错误 关闭 loading UI
-                hideAvatarProgressDialogByMessage("压缩图片错误 取消上传");
-                break;
-            case WHAT_COMPRESS_IMG_SUCCESS:
-                File compressImageFile = (File) obj;
-                if (compressImageFile != null) {
-                    sendSafeHandle(WHAT_SEND_IMG_START, compressImageFile);
-                } else {
-                    sendSafeHandle(WHAT_COMPRESS_IMG_ERROR, "压缩图片输出错误,取消上传");
-                }
-                break;
-            case WHAT_SEND_IMG_START:
-                File compressImageSuccess = (File) obj;
-                UploadHttpURLConnectionUtils uploadHttpURLConnectionUtils = new UploadHttpURLConnectionUtils();
-                String token = findOutNewUserToken(uploadHttpURLConnectionUtils);
-                uploadHttpURLConnectionUtils.setSecurityValue(token);
-                uploadHttpURLConnectionUtils.setErrorMsgOutOfTime(getString(R.string.network_conf_timeout));
-                uploadHttpURLConnectionUtils.setUploadFileCallBack(new ApiUploadFileCallBack() {
-                    @Override
-                    public void uploadProgress(int progress) {
-                        sendSafeHandle(WHAT_SEND_IMG_IN_PROGRESS, progress);
-                    }
-
-                    @Override
-                    public void onApiSuccess(ApiResponseOuterClass.ApiResponse response) {
-                        ALog.d(response.toString());
-                        PictureAssetOuterClass.PictureAsset pictureAsset = response.getAsset();
-                        if (pictureAsset != null) {
-                            String pictureAssetUrl = pictureAsset.getUrl();
-                            if (TextUtils.isEmpty(pictureAssetUrl)) {
-                                sendSafeHandle(WHAT_SEND_IMG_ERROR, "上传图片显示URL失败");
-                            } else {
-                                sendSafeHandle(WHAT_SEND_IMG_SUCCESS, pictureAssetUrl);
-                            }
-                        } else {
-                            sendSafeHandle(WHAT_SEND_IMG_ERROR, "上传图片显示失败");
-                        }
-                    }
-
-                    @Override
-                    public void onApiUnauthorized(ApiResponseOuterClass.ApiResponse response) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, response.getMsg());
-                    }
-
-                    @Override
-                    public void onApiError(int errorCode, ApiResponseOuterClass.ApiResponse response) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, response.getMsg());
-                    }
-
-                    @Override
-                    public void onParseError(int errorCode, Exception e) {
-                        sendSafeHandle(WHAT_SEND_IMG_ERROR, e.getMessage());
-                    }
-                });
-                uploadHttpURLConnectionUtils.uploadFileByThread(compressImageSuccess, UrlBll.UploadPic.AVATAR);
-                break;
-            case WHAT_SEND_IMG_ERROR:
-                //TODO send Error 上传错误 关闭 loading UI
-                String imageError = (String) obj;
-                String imageErrorMsg = "上传失败: " + imageError;
-                ALog.d(imageErrorMsg);
-                hideAvatarProgressDialogByMessage(imageErrorMsg);
-                break;
-            case WHAT_SEND_IMG_IN_PROGRESS:
-                int progress = (int) obj;
-                String imageProgressMsg = "上传中: " + progress + "%";
-                ALog.d(imageProgressMsg);
-                userAvatarProgressDialog.setMessage(imageProgressMsg);
-                break;
-            case WHAT_SEND_IMG_SUCCESS:
-                String pictureAssetUrl = String.valueOf(obj);
-                showUserAvatar(pictureAssetUrl);
-                String imgSuccessMsg = "上传成功!";
-                hideAvatarProgressDialogByMessage(imgSuccessMsg);
-                break;
-        }
-    }
-
-    protected String findOutNewUserToken(UploadHttpURLConnectionUtils uploadHttpURLConnectionUtils) {
-        SessionBean outHeadSession = KFZSDDContentSession.getInstance().findOutHeadSession(app);
-        if (outHeadSession != null) {
-            String token = outHeadSession.getToken();
-            if (!TextUtils.isEmpty(token)) {
-                return token;
-            } else {
-                return "";
-            }
-        } else {
-            return "";
-        }
-    }
-
-    protected void hideAvatarProgressDialogByMessage(String msg) {
-        showToast(msg);
-        userAvatarProgressDialog.hide();
-    }
-
-
-    private void compressImageByLuBan(final Uri selectedImageUri, File file) {
-        Luban.get(this)
-                .load(file)                     //传人要压缩的图片
-                .putGear(Luban.THIRD_GEAR)      //设定压缩档次，默认三挡
-                .setCompressListener(new OnCompressListener() {
-
-                    @Override
-                    public void onStart() {
-                        // TODO 压缩开始前调用，可以在方法内启动 loading UI
-                    }
-
-                    @Override
-                    public void onSuccess(File file) {
-                        sendSafeHandle(WHAT_COMPRESS_IMG_SUCCESS, file);
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        sendSafeHandle(WHAT_COMPRESS_IMG_ERROR, selectedImageUri);
-                    }
-                }).launch();
-    }
-
-    @Override
-    protected boolean showSheetImageView(ImageView imageView, Uri imageUri, int size) {
-        Glide.with(ActUser.this)
-                .load(imageUri)
-                .centerCrop()
-                .crossFade()
-                .into(imageView);
-        return true;
-    }
-
-    protected void letAppBarExpandedAndNested(UserEvent userEvent) {
-        appBarLayout.setExpanded(userEvent.getIsExpandedAppBar(), userEvent.getIsExpandedAnimAppBar());
-        nestedScrollView.setNestedScrollingEnabled(userEvent.getIsNestedScrollingAppBar());
-    }
-
-    protected void setActionBarTitle(@StringRes int resId) {
-        if (null != collapsingToolbarLayout) {
-            titleString = getString(resId);
-            collapsingToolbarLayout.setTitle(titleString);
-        }
-    }
-
-    private class OnUserIconClick implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            if (KFZSDDContentSession.getInstance().isHasHeadSession(app)) {
-                if (!titleString.equals(getString(R.string.title_user_activity_self_info))) {
-//                    UserEvent userEvent = new UserEvent();
-//                    userEvent.setSkipCode(JOB_CODE_SELF_INFO_SHOW);
-//                    EventBus.getDefault().post(userEvent);
-                    SkipUtils.getInstance().goUserCenter(ActUser.this);
-
-                }
-            }
-        }
-    }
-
-    private class OnChangeUserAvatarClick implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            callSheetImageViewPop();
-        }
-    }
-}

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

@@ -24,6 +24,7 @@ import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.ThemeUtils;
 import com.kfzs.duanduan.utils.net.OnURLParseByJS;
 import com.kfzs.duanduan.utils.ShareUtils;
+import com.orhanobut.logger.Logger;
 import com.sheep.jiuyan.samllsheep.R;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.UMShareAPI;
@@ -35,7 +36,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;
 
@@ -124,7 +124,7 @@ public class ActWeb extends BaseCompatActivity {
 
     private void loadUrl() {
         tvLabel.setText(extraTitle);
-        ALog.d("loadUrl: " + extraUrl);
+        Logger.d("loadUrl: " + extraUrl);
         //        extraUrl = "http://app.haowan.yunduanzs.cn/static/index.html?type=android&dd_channel=family&gamebookid=21&gameid=132#/";
         mWebView.setWebChromeClient(new WebChromeClient());
         mWebView.setWebViewClient(new WebViewClient() {
@@ -194,7 +194,7 @@ public class ActWeb extends BaseCompatActivity {
 
 
     private void filterURLByBehavior() {
-        ALog.d("extraGameID: " + extraGameID + " |extraGameBookID: " + extraGameBookID);
+        Logger.d("extraGameID: " + extraGameID + " |extraGameBookID: " + extraGameBookID);
         String channelName = DataSave.getInstance().getChannelName();
         if (TextUtils.equals(behavior, BEHAVIOR_GAME_BOOK)) {
             shareUrl = extraUrl + "?type=share&dd_channel=" + channelName;
@@ -271,7 +271,7 @@ public class ActWeb extends BaseCompatActivity {
     }
 
     private void popShare() {
-        ALog.d("now share url: " + shareUrl);
+        Logger.d("now share url: " + shareUrl);
         if (!TextUtils.isEmpty(shareUrl) && shareUrl.toLowerCase().startsWith("http")) {
             new ShareUtils().showShareView(this, shareUrl, extraTitle, extraShareImgUrl, extraTitle);
         } else {
@@ -289,7 +289,7 @@ public class ActWeb extends BaseCompatActivity {
 
         @Override
         public void whoWhereDo(String who, String where, String doJob) {
-            ALog.d("who:" + who + " |where:" + where + " |doJob:" + doJob);
+            Logger.d("who:" + who + " |where:" + where + " |doJob:" + doJob);
             switch (who) {
                 case WHO_WEB:
                     switch (where) {
@@ -334,7 +334,7 @@ public class ActWeb extends BaseCompatActivity {
     }
 
     private void showInfoAndCloseSelf(String msg) {
-        ALog.d(msg);
+        Logger.d(msg);
         if (!TextUtils.isEmpty(msg)) {
             showToast(msg);
         }

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

@@ -14,6 +14,7 @@ import com.kfzs.android.view.CompatActivity;
 import com.kfzs.duanduan.bean.VipStyle;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.ThemeUtils;
+import com.sheep.gamegroup.util.ActivityManager;
 import com.umeng.analytics.MobclickAgent;
 
 import java.util.List;
@@ -63,6 +64,7 @@ public abstract class BaseCompatActivity extends CompatActivity {
         TAG = this.getClass().getCanonicalName();
         app = KFZSApp.getInstance();
         app.appCompatActivityList.add(this);
+        ActivityManager.getInstance().pushActivity(this);
     }
 
     /**

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/java/com/kfzs/duanduan/adp/AdpCoupon.java

@@ -1,96 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.kfzs.duanduan.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.CouponBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.VoucherOuterClass;
-import com.kfzs.duanduan.utils.CouponUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpCoupon</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/18 20:04
- * @ QQ:    315096953
- */
-
-public class AdpCoupon extends RecyclerView.Adapter {
-
-    private Context mContext;
-    private final static int TAG_ID_COUPON_ID = R.id.view_tag_1;
-    private final static int TAG_ID_POSITION = R.id.view_tag_2;
-    private List<VoucherOuterClass.Voucher> mVoucherList;
-
-
-    public AdpCoupon(Context context, List<VoucherOuterClass.Voucher> vouchers) {
-        mContext = context;
-        mVoucherList = new ArrayList<>(vouchers);
-    }
-
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View itemView = LayoutInflater.from(mContext)
-                .inflate(R.layout.item_fgt_main_coupon, parent, false);
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View v) {
-                new CouponBll().postCoupon(mContext, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-                    @Override
-                    public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        if (apiResponse.getCodeValue() == ApiResponseOuterClass.Codes.Success_VALUE) {
-                            G.showToast("领取成功！");
-                            VoucherOuterClass.Voucher voucher = mVoucherList.get((int) v.getTag(TAG_ID_POSITION))
-                                    .toBuilder().setReceiveStatus(true).build();
-                            mVoucherList.set((int) v.getTag(TAG_ID_POSITION), voucher);
-                            AdpCoupon.this.notifyDataSetChanged();
-                            return;
-                        } else {
-                            G.showToast(apiResponse.getMsg());
-                        }
-                    }
-                }, (int) v.getTag(TAG_ID_COUPON_ID));
-            }
-        });
-
-        RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(itemView) {
-        };
-        return viewHolder;
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        holder.itemView.setTag(TAG_ID_COUPON_ID, mVoucherList.get(position).getId());
-        holder.itemView.setTag(TAG_ID_POSITION, position);
-
-        holder.itemView.findViewById(R.id.img_item_fgt_main_coupon)
-                .setSelected(mVoucherList.get(position).getReceiveStatus());
-
-        ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_price))
-                .setText("¥ " + mVoucherList.get(position).getAmount());
-        ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_desc))
-                .setText(new CouponUtils().getVoucherContent(mVoucherList.get(position)));
-        ((TextView) holder.itemView.findViewById(R.id.txt_item_fgt_main_name))
-                .setText(new CouponUtils().getVoucherName(mVoucherList.get(position)));
-    }
-
-    @Override
-    public int getItemCount() {
-        return mVoucherList.size();
-    }
-
-
-
-}

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

@@ -25,9 +25,7 @@ import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.ActNewGameBook;
 import com.kfzs.duanduan.G;
-import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CateGameBean;
 import com.kfzs.duanduan.bean.Game;
@@ -38,8 +36,6 @@ import com.kfzs.duanduan.bean.RecyleObj;
 import com.kfzs.duanduan.bean.RecyleType;
 import com.kfzs.duanduan.bean.SpecialRecommend;
 import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.proto.IndexBannerOuterClass;
@@ -105,12 +101,6 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
             case OWN_ZONE:
                 resId = R.layout.fgt_main_own_zone;
                 break;
-            case COUPON:
-                resId = R.layout.fgt_main_coupon;
-                break;
-            case NEW_GAME_BOOK:
-                resId = R.layout.fgt_main_new_game_book;
-                break;
             case GUESS_YOU_LIKE:
                 resId = R.layout.fgt_main_guess_you_like;
                 break;
@@ -173,12 +163,6 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
             case OWN_ZONE:
                 bindOwnZone(holder);
                 break;
-            case COUPON:
-                bindCoupon(holder, recyleObj);
-                break;
-            case NEW_GAME_BOOK:
-                bindNewGameBook(holder, (List<Game>) recyleObj.getDataObj());
-                break;
             case NEW_GAME_RECOMMEND:
                 bindNewGameRecommend(holder, (List<NewGameRecommend>) recyleObj.getDataObj());
                 break;
@@ -541,8 +525,9 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
             holder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Intent intent = new Intent(mContext, ActNewGameBook.class);
-                    mContext.startActivity(intent);
+//                    Intent intent = new Intent(mContext, ActNewGameBook.class);
+//                    mContext.startActivity(intent);
+                    G.showToast("该功能正在开发中");
                 }
             });
             textViewList.setSingleLine();
@@ -556,33 +541,6 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
         textViewList.startAutoScroll();
     }
 
-
-    /**
-     * 绑定福利优惠券
-     *
-     * @param holder
-     */
-    private void bindCoupon(ViewHolder holder, RecyleObj recyleObj) {
-        RecyclerView recyclerView = holder.getView(R.id.recy_fgt_main_coupon);
-        final List<VoucherOuterClass.Voucher> vouchers = (List<VoucherOuterClass.Voucher>) recyleObj.getDataObj();
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-                StaggeredGridLayoutManager.HORIZONTAL));
-        final TextView textView = holder.getView(R.id.txt_fgt_main_coupon, TextView.class);
-        textView.setText(Html.fromHtml(String.format(HTML_FORMAT, VipStyle.getInstance().getViptypename())));
-
-        Glide.with(mContext).load(VipStyle.getInstance().getRhombus())
-                .into(new SimpleTarget<GlideDrawable>() {
-                    @Override
-                    public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) {
-                        resource.setBounds(0, 0, resource.getMinimumWidth(), resource.getMinimumHeight());
-                        textView.setCompoundDrawables(resource, null, resource, null);
-                    }
-                });
-        recyclerView.setAdapter(new AdpCoupon(mContext, vouchers));
-    }
-
-
     /**
      * 绑定专区
      *
@@ -614,7 +572,7 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
         holder.getView(R.id.img_fgt_main_three_play_mid).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.WEB_GO_BBS));
+                G.showToast("该功能正在建设中");
             }
         });
         holder.getView(R.id.img_fgt_main_three_play_right).setOnClickListener(new View.OnClickListener() {

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

@@ -1,169 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.text.Html;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.ActGift;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GiftCodeOuterClass;
-import com.kfzs.duanduan.proto.ShelvesGiftOuterClass;
-import com.kfzs.duanduan.utils.DateFormatUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import static com.kfzs.duanduan.G.showToast;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AdpSearchGift</p>
- * @ <p>Description: 商品详情页中礼包列表的适配器</p>
- * @ date:  2017/6/22 16:15
- * @ QQ:    315096953
- */
-
-public class AdpSearchGift extends BaseAdapter {
-
-    private List<ShelvesGiftOuterClass.ShelvesGift> mList = new ArrayList<>();
-    private Context mContext;
-    private final String HTML_TXT = "<font color='#F66600'>%s</font><font color='black'>-%s</font>";
-    private final String TAG = "AdpSearchGift";
-    private final int TAG_GIFT_POS = R.id.view_tag_gift_btn;
-
-    public AdpSearchGift(Context context) {
-        this.mContext = context;
-    }
-
-    public void addAll(List<ShelvesGiftOuterClass.ShelvesGift> list) {
-        mList.addAll(list);
-    }
-
-    public void clear() {
-        mList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public ShelvesGiftOuterClass.ShelvesGift getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.item_app_detail_gift, null);
-//            convertView.setOnClickListener(cls_GoGiftDetail);
-            ViewFindUtils.hold(convertView, R.id.btn_item_app_detail_get)
-                    .setOnClickListener(cls_GetCode);
-        }
-
-        ViewFindUtils.hold(convertView, R.id.txt_item_app_detail_gift_game_name, TextView.class)
-                .setText(Html.fromHtml(String.format(HTML_TXT, getItem(position).getGame().getGameName(),
-                        getItem(position).getGiftName())));
-
-        ViewFindUtils.hold(convertView, R.id.txt_act_game_gift_content, TextView.class)
-                .setText("礼包内容：\n" + getItem(position).getGiftContent());
-
-        //int percent = HelperUtils.getPercent(getItem(position).getTotalNum(), getItem(position).getReceiveNum());
-        int percent = (int) Math.ceil(getItem(position).getPercentum() * 100);
-        ViewFindUtils.hold(convertView, R.id.txt_act_game_gift_progress, TextView.class)
-                .setText(percent + "%");
-        ViewFindUtils.hold(convertView, R.id.pro_act_game_gift, ProgressBar.class)
-                .setProgress(percent);
-        ViewFindUtils.hold(convertView, R.id.txt_act_game_gift_time, TextView.class)
-                .setText("剩余礼包（有效日期：" + DateFormatUtils
-                        .doSecondDate(getItem(position).getEndTime()) + "）：");
-
-        ViewFindUtils.hold(convertView, R.id.btn_item_app_detail_get)
-                .setVisibility(getItem(position).getStatus() == 1 ? View.GONE : View.VISIBLE);
-        ViewFindUtils.hold(convertView, R.id.btn_item_app_detail_get)
-                .setTag(TAG_GIFT_POS, position);
-        return convertView;
-    }
-
-
-    /**
-     * 跳转到礼包详情页
-     */
-    private View.OnClickListener cls_GoGiftDetail = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            SkipUtils.getInstance().goGiftDetails(mContext, getItem((int) v.getTag(TAG_GIFT_POS)));
-        }
-    };
-
-    /**
-     * 领取礼包码
-     */
-    private View.OnClickListener cls_GetCode = new View.OnClickListener() {
-        @Override
-        public void onClick(final View v) {
-            final int position = (int) v.getTag(TAG_GIFT_POS);
-            GiftCodeOuterClass.GiftCode.Builder builder = GiftCodeOuterClass.GiftCode.newBuilder();
-            builder.setGiftId(getItem(position).getId());
-
-            HashMap<String, String> headParams = new HashMap<>();
-            SessionBean outHeadSession = KFZSDDContentSession.getInstance()
-                    .findOutHeadSession(mContext);
-            if (outHeadSession == null) {
-                SkipUtils.getInstance().goLogin(mContext);
-                showToast(R.string.toast_user_login_pre);
-                return;
-            }
-            headParams.put(UrlBll.HeadParams.AUTHORIZATION, outHeadSession.getToken());
-
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setGiftCode(builder);
-
-            APIRequest bannerRequest = APIRequestInstance.putReq(TAG, UrlBll.Gift.GIFT_EXCHANGE,
-                    reqBuild.build().toByteArray(), headParams, new ResponseNetworkTask() {
-                        @Override
-                        public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                            showToast("领取成功！");
-//                            if (v instanceof Button) {
-//                                v.setEnabled(false);
-//                                ((Button) v).setText("已领取");
-//                            }
-                            v.setVisibility(View.GONE);
-                        }
-
-                        @Override
-                        public void onFail(int code, String msg) {
-                            showToast(msg);
-                        }
-                    }, HelperUtils.makeErr(mContext.getString(R.string.toast_gift_get_fail)));
-            KFZSNetwork.addRequest(bannerRequest);
-        }
-    };
-
-
-}

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

@@ -1,77 +0,0 @@
-package com.kfzs.duanduan.adp;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.duanduan.ActAccountManage;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.event.AccountManagementEventUtils;
-
-import java.util.List;
-
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/3/2.
- */
-public class ManagementAccountAdapter extends RecyclerViewAdapter<User> {
-
-    public ManagementAccountAdapter(Context context, List<User> data) {
-        super(context, R.layout.listview_item_change_account, data);
-    }
-
-    public void clear(){
-        mDatas.clear();
-    }
-
-    public void addAllUser(List<User> users){
-        mDatas.addAll(users);
-    }
-
-    @Override
-    public void convert(ViewHolder holder, final User data, int position) {
-        if (data != null) {
-//            String userName = data.getUserName();
-//            ALog.d("show user name: " + userName);
-            String nickname = data.getMNickName();
-            String avatar = data.getMAvatar();
-            holder.setText(R.id.tv_item_change_account_nike_name, nickname);
-            View view = holder.getView(R.id.img_item_change_account_icon);
-            if (view instanceof ImageView) {
-                Glide.with(mContext)
-                        .load(avatar)
-                        .bitmapTransform(new RoundedCornersTransformation(mContext, 30, 0, RoundedCornersTransformation.CornerType.ALL))
-                        .crossFade(1000)
-                        .error(R.drawable.ic_user_head_default)
-                        .into((ImageView) view);
-            }
-            holder.setOnClickListener(R.id.img_item_change_account_remove, new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    AccountManagementEventUtils.getInstance().newAccountByEvent(Integer.parseInt(data.getMUserId()), data.getMNickName(), ActAccountManage.JOB_REMOVE_ACCOUNT);
-                }
-            });
-        }
-    }
-
-
-}

app/src/main/java/com/kfzs/duanduan/bean/RecyleType.java

@@ -15,8 +15,6 @@ public enum RecyleType {
     BANNER,//首页BANNER
     THREE_PLAY,//BANNER下的三个玩
     OWN_ZONE,//专区BANNER
-    COUPON,//优惠圈专栏
-    NEW_GAME_BOOK,//新游预约
     NEW_GAME_RECOMMEND,//新游推荐
     GUESS_YOU_LIKE,//猜你喜欢
     SPECIAL_GAME_RECOMMEND,//特别推荐

app/src/main/java/com/kfzs/duanduan/bll/CouponBll.java

@@ -1,110 +0,0 @@
-package com.kfzs.duanduan.bll;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.G;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.VoucherOuterClass;
-import com.kfzs.duanduan.utils.dlg.CheckUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-
-import java.util.HashMap;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  CouponBll</p>
- * @ <p>Description:各种券的请求全放这里面，我来规范吧</p>
- * @ date:  2017/12/13 11:44
- * @ QQ:    315096953
- */
-
-public class CouponBll {
-
-
-    /**
-     * 首页获取优惠券
-     *
-     * @param context
-     * @param listener
-     */
-    public void getCouponListMainPage(Context context, Response.Listener<ApiResponseOuterClass.ApiResponse> listener) {
-        APIRequest apiRequest = APIRequestInstance.getReq("getCouponListMainPage", UrlBll.AppStoreApi.COUPON,
-                null, listener, HelperUtils
-                        .makeErr(KFZSApp.context.getString(R.string.network_conf_network)));
-        KFZSNetwork.addRequest(apiRequest);
-    }
-
-
-    /**
-     * 领取优惠券
-     *
-     * @param context
-     * @param listener
-     * @param couponId
-     */
-    public void postCoupon(Context context, Response.Listener<ApiResponseOuterClass.ApiResponse> listener, int couponId) {
-        if (!CheckUtils.getInstance().isLogin()) {
-            G.showToast(R.string.toast_user_login_pre);
-            SkipUtils.getInstance().goLogin(context);
-            return;
-        }
-
-        ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-        VoucherOuterClass.Voucher.Builder builder = VoucherOuterClass.Voucher.newBuilder();
-        builder.setId(couponId);
-        reqBuild.setVoucher(builder);
-
-        APIRequest apiRequest = APIRequestInstance.postReq("get_Voucher",
-                UrlBll.AppStoreApi.COUPON,
-                null,
-                reqBuild.build().toByteArray(),
-                listener,
-                HelperUtils.makeErr(KFZSApp.context.getString(R.string.network_conf_network)));
-        KFZSNetwork.addRequest(apiRequest);
-    }
-
-
-    /**
-     * 获取已领取的福利券
-     *
-     * @param context
-     * @param page     页面从1开始
-     * @param per_page
-     * @param listener
-     */
-    public void getReceiveCoupon(Context context, int page,
-                                 int per_page,
-                                 Response.Listener<ApiResponseOuterClass.ApiResponse> listener,
-                                 @Nullable Response.ErrorListener err) {
-        if (!CheckUtils.getInstance().isLogin()) {
-            G.showToast(R.string.toast_user_login_pre);
-            SkipUtils.getInstance().goLogin(context);
-            return;
-        }
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("page", page + "");
-        map.put("per_page", per_page + "");
-
-        APIRequest apiRequest = APIRequestInstance.getReqUrl("get_receive_voucher",
-                UrlBll.AppStoreApi.COUPON_RECEIVE,
-                map,
-                listener,
-                err);
-        KFZSNetwork.addRequest(apiRequest);
-    }
-
-
-}

app/src/main/java/com/kfzs/duanduan/event/AccountManagementEvent.java

@@ -1,88 +0,0 @@
-package com.kfzs.duanduan.event;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/27.
- */
-public class AccountManagementEvent {
-    public static final String LOGIN_TAG = "fgt:management:login";
-    public static final String SELF_CHANGE_PASSWORD = "fgt:management:management:SELF:change:password";
-    public static final String CHANGE_ACCOUNT = "fgt:management:change:account";
-    private Integer titleID;
-    private int skipCode;
-    private int newUid;
-    private String msg;
-    private String nickName;
-    private String token;
-    private String openId;
-
-    public String getOpenId() {
-        return openId;
-    }
-
-    public void setOpenId(String openId) {
-        this.openId = openId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public Integer getTitleID() {
-        return titleID;
-    }
-
-    public void setTitleID(Integer titleID) {
-        this.titleID = titleID;
-    }
-
-
-    public int getSkipCode() {
-        return skipCode;
-    }
-
-    public void setSkipCode(int skipCode) {
-        this.skipCode = skipCode;
-    }
-
-    public int getNewUid() {
-        return newUid;
-    }
-
-    public void setNewUid(int newUid) {
-        this.newUid = newUid;
-    }
-}

app/src/main/java/com/kfzs/duanduan/event/AccountManagementEventUtils.java

@@ -1,77 +0,0 @@
-package com.kfzs.duanduan.event;
-
-import android.support.annotation.StringRes;
-
-import com.kfzs.duanduan.ActAccountManage;
-
-import org.greenrobot.eventbus.EventBus;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/3/1.
- */
-public class AccountManagementEventUtils {
-    private static AccountManagementEventUtils instance;
-
-    public synchronized static AccountManagementEventUtils getInstance() {
-        if (instance == null) {
-            instance = new AccountManagementEventUtils();
-        }
-        return instance;
-    }
-
-    public void changeUserTitleByEvent(@StringRes int titleStrID) {
-        AccountManagementEvent event = new AccountManagementEvent();
-        event.setSkipCode(ActAccountManage.JOB_CHANGE_TITLE);
-        event.setTitleID(titleStrID);
-        EventBus.getDefault().post(event);
-    }
-
-    public void newAccountByEvent(int newUid, String nickName, int jobReplaceHeadAccount) {
-        AccountManagementEvent event = new AccountManagementEvent();
-        event.setSkipCode(jobReplaceHeadAccount);
-        event.setNewUid(newUid);
-        event.setNickName(nickName);
-        EventBus.getDefault().post(event);
-    }
-
-    public void newAccountByEvent(String token, int newUid, String nickName, String openId, int jobReplaceHeadAccount) {
-        AccountManagementEvent event = new AccountManagementEvent();
-        event.setSkipCode(jobReplaceHeadAccount);
-        event.setToken(token);
-        event.setNewUid(newUid);
-        event.setNickName(nickName);
-        event.setOpenId(openId);
-        EventBus.getDefault().post(event);
-    }
-
-    public void finishSelfByError(String msg) {
-        AccountManagementEvent event = new AccountManagementEvent();
-        event.setSkipCode(ActAccountManage.JOB_FINISH_SELF_BY_ERROR);
-        event.setMsg(msg);
-        EventBus.getDefault().post(event);
-    }
-
-    public void finishSelfBySuccess(String msg) {
-        AccountManagementEvent event = new AccountManagementEvent();
-        event.setSkipCode(ActAccountManage.JOB_FINISH_SELF_BY_SUCCESS);
-        event.setMsg(msg);
-        EventBus.getDefault().post(event);
-    }
-
-    private AccountManagementEventUtils() {
-    }
-}

app/src/main/java/com/kfzs/duanduan/event/AuthEvent.java

@@ -1,120 +0,0 @@
-package com.kfzs.duanduan.event;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/27.
- */
-public class AuthEvent {
-    public static final String LOGIN_TAG = "fgt:auth:login";
-    public static final String REGISTER_PHONE_TAG = "fgt:auth:register:phone";
-    public static final String REGISTER_ORDINARY_TAG = "fgt:auth:register:ordinary";
-    public static final String FORGET_PASSWORD_TAG = "fgt:auth:forget:password";
-    public static final String CHANGE_PASSWORD = "fgt:auth:change:password";
-    public static final String CHANGE_NICKNAME = "fgt:auth:change:nickname";
-    private Integer titleID;
-    private int skipCode;
-    private boolean isAuth;
-    private int newUid;
-
-    private String extrasKey;
-    private String extrasValue;
-    private static String userName;
-    private static String userPassword;
-    private static String registerback;
-    private static String token;
-
-
-    public boolean isAuth() {
-        return isAuth;
-    }
-
-    public static String getToken() {
-        return token;
-    }
-
-    public static void setToken(String token) {
-        AuthEvent.token = token;
-    }
-
-    public void setAuth(boolean auth) {
-        isAuth = auth;
-    }
-
-    public String getExtrasValue() {
-        return extrasValue;
-    }
-
-    public void setExtrasValue(String extrasValue) {
-        this.extrasValue = extrasValue;
-    }
-
-    public String getExtrasKey() {
-        return extrasKey;
-    }
-
-    public void setExtrasKey(String extrasKey) {
-        this.extrasKey = extrasKey;
-    }
-
-    public Integer getTitleID() {
-        return titleID;
-    }
-
-    public void setTitleID(Integer titleID) {
-        this.titleID = titleID;
-    }
-
-
-    public int getSkipCode() {
-        return skipCode;
-    }
-
-    public void setSkipCode(int skipCode) {
-        this.skipCode = skipCode;
-    }
-
-    public int getNewUid() {
-        return newUid;
-    }
-
-    public void setNewUid(int newUid) {
-        this.newUid = newUid;
-    }
-
-    public static String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public static String getUserPassword() {
-        return userPassword;
-    }
-
-    public void setUserPassword(String userPassword) {
-        this.userPassword = userPassword;
-    }
-
-    public static String getRegisterback() {
-        return registerback;
-    }
-
-    public static void setRegisterback(String registerback) {
-        AuthEvent.registerback = registerback;
-    }
-}

app/src/main/java/com/kfzs/duanduan/event/AuthEventUtils.java

@@ -1,47 +0,0 @@
-package com.kfzs.duanduan.event;
-
-import android.support.annotation.StringRes;
-
-import com.kfzs.duanduan.ActAuth;
-
-import org.greenrobot.eventbus.EventBus;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/3/1.
- *
- * 真无语，就这功能还写个单例。。。 Sign.Diao
- */
-public class AuthEventUtils {
-    private static AuthEventUtils instance;
-
-    public synchronized static AuthEventUtils getInstance() {
-        if (instance == null) {
-            instance = new AuthEventUtils();
-        }
-        return instance;
-    }
-
-    public void changeUserTitleByEvent(@StringRes int titleStrID) {
-        AuthEvent event = new AuthEvent();
-        event.setSkipCode(ActAuth.JOB_CHANGE_TITLE);
-        event.setTitleID(titleStrID);
-        EventBus.getDefault().post(event);
-    }
-
-    private AuthEventUtils() {
-    }
-}

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -10,20 +10,11 @@ package com.kfzs.duanduan.event;
 
 public enum EventTypes {
 
-    WEB_BACK,//网页返回
-    WEB_TRY_LOGIN_BY_TOKEN,//尝试通过TOKEN登录
-    WEB_UPDATE_RN,//更新RN，以前是广播形式，而且有重复广播。。。
-    WEB_GO_BBS,//跳到论坛页面
-
-    USER_LOGIN_FAIL,//用户登录失败
-    USER_LOGIN_SUCC,//用户登录成功
-
     TIPS_DOWN_ICON,//下载图标的小红点
     TIPS_USER_ICON,//用户图标的小红点
     TIPS_BOOK_ICON,//用户预约的小红点
 
     STORAGE_LOW,//储存空间不足,此时Data是游戏名
-    RN_FINISH,//RN关闭Activity的通知
 
     SKIP_PAGE_COUNT,//首页的第一个Tab栏的viewpager跳转到第几个pager,others为第几页\
     GO_FiRST , //任务功能  登录后 点击返回键 只能返回第一个界面

app/src/main/java/com/kfzs/duanduan/event/UserEventUtils.java

@@ -1,64 +0,0 @@
-package com.kfzs.duanduan.event;
-
-import android.support.annotation.StringRes;
-
-import com.kfzs.duanduan.ActUser;
-
-import org.greenrobot.eventbus.EventBus;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/3/1.
- */
-public class UserEventUtils {
-    private static UserEventUtils instance;
-
-    public synchronized static UserEventUtils getInstance() {
-        if (instance == null) {
-            instance = new UserEventUtils();
-        }
-        return instance;
-    }
-
-    public void changeUserTitleByEvent(@StringRes int titleStrID) {
-        changeUserTitleByEvent(titleStrID, null, null, null);
-    }
-
-    public void changeUserTitleByEvent(@StringRes int titleStrID, Boolean isExpandedAppBar, Boolean isExpandedAnimAppBar, Boolean isNestedScrollingAppBar) {
-        UserEvent event = new UserEvent();
-        event.setSkipCode(ActUser.JOB_CHANGE_TITLE);
-        event.setTitleID(titleStrID);
-        if (null != isExpandedAppBar) {
-            event.setIsExpandedAppBar(isExpandedAppBar);
-        } else {
-            event.setIsExpandedAppBar(false);
-        }
-        if (null != isExpandedAnimAppBar) {
-            event.setIsExpandedAnimAppBar(isExpandedAnimAppBar);
-        } else {
-            event.setIsExpandedAnimAppBar(false);
-        }
-        if (isNestedScrollingAppBar != null) {
-            event.setIsNestedScrollingAppBar(isNestedScrollingAppBar);
-        } else {
-            event.setIsNestedScrollingAppBar(false);
-        }
-        EventBus.getDefault().post(event);
-    }
-
-    private UserEventUtils() {
-    }
-}

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

@@ -1,396 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class AuthBindPhoneFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    public static final int BIND_TYPE_DEFAULT = 0;
-    public static final int BIND_TYPE_IS_CERTIFICATION = 2 << 1;
-    public static final String KEY_BIND_TYPE = "fragment:auth:login:type";
-
-    private MDLEditText etPhone;
-    private MDLEditText etCaptchaPhone;
-    private MDLEditText etCaptcha;
-    private Button btnAction;
-    private Button btnCaptchaPhone;
-    private ImageView imgCaptcha;
-    private LinearLayout llImageCaptcha;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isBindPhone = false;
-    private boolean canGetCaptchaPhone = true;
-
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private String captchaKey = "";
-    private HashMap<String, String> headParams;
-    private Bundle arguments;
-    private int bindType = BIND_TYPE_DEFAULT;
-
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        arguments = getArguments();
-        if (arguments != null) {
-            bindType = arguments.getInt(KEY_BIND_TYPE, BIND_TYPE_DEFAULT);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        isNeedCaptcha = false;
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_bind_phone);
-    }
-
-    @Override
-    public void onDetach() {
-        if (countDownGetCaptchaPhone != null) {
-            countDownGetCaptchaPhone.cancel();
-        }
-        KFZSNetwork.stopByTag(TAG);
-        super.onDetach();
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_bind_phone);
-        initViewById(mContentView);
-        initUserToken();
-        setListeners();
-    }
-
-    private void initUserToken() {
-        headParams = new HashMap<String, String>();
-        SessionBean outHeadSession = KFZSDDContentSession.getInstance().findOutHeadSession(mContext);
-        headParams.put(UrlBll.HeadParams.AUTHORIZATION, outHeadSession.getToken());
-    }
-
-    private void initViewById(View v) {
-        this.etPhone = (MDLEditText) v.findViewById(R.id.edt_fgt_bind_phone_phone);
-        this.etCaptchaPhone = (MDLEditText) v.findViewById(R.id.edt_fgt_bind_phone_valicode);
-        this.btnCaptchaPhone = (Button) v.findViewById(R.id.btn_fgt_bind_phone_valicode);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_bind_phone_captcha);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_bind_phone_captcha);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_bind_phone_captcha);
-        this.btnAction = (Button) v.findViewById(R.id.btn_fgt_bind_phone);
-    }
-
-    private void setListeners() {
-        btnCaptchaPhone.setOnClickListener(this);
-        btnAction.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-        };
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            bindPhoneByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etCaptchaPhone.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_bind_phone_valicode:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_bind_phone:
-                bindPhoneByStatus();
-                break;
-            case R.id.img_fgt_bind_phone_captcha:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    private void bindPhoneByStatus() {
-        if (!isBindPhone) {
-            postBindPhone();
-        } else {
-            showToast(R.string.toast_user_login_act_is_bind_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postBindPhone() {
-        if (checkBindPhoneParams()) {
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    isBindPhone = false;
-                }
-            });
-            UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-            userOperate.setMobile(etPhone.getText().toString().trim());
-            userOperate.setSeccode(etCaptchaPhone.getText().toString().trim());
-            userOperate.setStep(UrlBll.UserApi.BIND_PHONE_STEP_TWO);
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setUserOperate(userOperate);
-            APIRequest apiRequest = APIRequestInstance.putReq(TAG, UrlBll.UserApi.BIND_PHONE, reqBuild.build().toByteArray(), headParams, new OnBindPhoneStepTwo(), errorListener);
-            KFZSNetwork.addRequest(apiRequest);
-            isBindPhone = true;
-        }
-    }
-
-    private boolean checkBindPhoneParams() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPhone.getText().toString().trim().length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etCaptchaPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast(R.string.toast_warning_phone_captcha_image_code_size);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkPhoneInput()) {
-            UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-            userOperate.setMobile(etPhone.getText().toString().trim());
-            userOperate.setStep(UrlBll.UserApi.BIND_PHONE_STEP_ONE);
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setUserOperate(userOperate);
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.putReq(TAG, UrlBll.UserApi.BIND_PHONE, reqBuild.build().toByteArray(), headParams,
-                    new OnBindPhoneStepOne(), errorListener
-            );
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkPhoneInput() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (etPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                captchaKey = captchaCode;
-                Glide.with(AuthBindPhoneFragment.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnBindPhoneStepOne implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-    private class OnBindPhoneStepTwo implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            isBindPhone = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_bind_phone_success);
-                    filterBindType();
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(R.string.toast_user_login_act_bind_phone_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_bind_phone_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-            }
-        }
-    }
-
-    private void filterBindType() {
-        AuthEvent event = new AuthEvent();
-        switch (bindType) {
-            case BIND_TYPE_IS_CERTIFICATION:
-                event.setSkipCode(ActAuth.JOB_CODE_SELF_UPDATE_USER_INFO_HEAD_CERTIFICATION_NO_NEED_LOGIN);
-                break;
-            case BIND_TYPE_DEFAULT:
-                event.setSkipCode(ActAuth.JOB_CODE_SELF_UPDATE_USER_INFO_HEAD);
-                break;
-            default:
-                ALog.w("filterBindType error develop must check!");
-                break;
-        }
-        EventBus.getDefault().post(event);
-    }
-}

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

@@ -1,386 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class AuthForgetPasswordFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    private MDLEditText etPhone;
-    private MDLEditText etCaptchaPhone;
-    private MDLEditText etCaptcha;
-    private MDLEditText etPassword;
-    private MDLEditText etPasswordOnceMore;
-    private Button btnActionForgetPassword;
-    private TextView btnCaptchaPhone;
-    private ImageView imgCaptcha;
-    private LinearLayout llImageCaptcha;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isFindPwd = false;
-    private boolean canGetCaptchaPhone = true;
-
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private String captchaKey = "";
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        isNeedCaptcha = false;
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_forget_password);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        if (countDownGetCaptchaPhone != null) {
-            countDownGetCaptchaPhone.cancel();
-        }
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_forget_password);
-        initViewById(mContentView);
-        setListeners();
-    }
-
-    private void initViewById(View v) {
-        this.etPhone = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_phone);
-        this.etCaptchaPhone = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_captcha_phone);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_forget_password_captcha);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_forget_password_captcha);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_captcha);
-        this.etPassword = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_password);
-        this.etPasswordOnceMore = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_password_once_more);
-        this.btnActionForgetPassword = (Button) v.findViewById(R.id.btn_fgt_forget_password_action);
-        this.btnCaptchaPhone = (TextView) v.findViewById(R.id.btn_fgt_forget_password_get_captcha_phone);
-    }
-
-    private void setListeners() {
-        btnCaptchaPhone.setOnClickListener(this);
-        btnActionForgetPassword.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-        };
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            findPwdByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etPasswordOnceMore.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_forget_password_get_captcha_phone:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_forget_password_action:
-                findPwdByStatus();
-                break;
-            case R.id.img_fgt_forget_password_captcha:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    private void findPwdByStatus() {
-        if (!isFindPwd) {
-            postFindPwd();
-        } else {
-            showToast(R.string.toast_user_login_act_is_find_pwd, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postFindPwd() {
-        if (checkFindPwdParams()) {
-            String pwd = etPassword.getText().toString().trim();
-            String pwdOnceMore = etPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isFindPwd = false;
-                    }
-                });
-                Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-                sessionBuild.setStep(Session.FindPasswordStepCodes.CheckCaptchaAndReset_VALUE);
-                sessionBuild.setAccount(etPhone.getText().toString().trim());
-                if (isNeedCaptcha) {
-                    sessionBuild.setCaptcha(etCaptcha.getText().toString().trim());
-                    sessionBuild.setCaptchaKey(captchaKey);
-                }
-                sessionBuild.setSmsSeccode(etCaptchaPhone.getText().toString().trim());
-                sessionBuild.setNewPass(etPasswordOnceMore.getText().toString().trim());
-                Session.SessionIn sessionOut = sessionBuild.build();
-                ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-                reqBuild.setSessionIn(sessionOut);
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.FIND_PWD, null, reqBuild.build().toByteArray(), new OnRegisterByPhone(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isFindPwd = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-    private boolean checkFindPwdParams() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPhone.getText().toString().trim().length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etCaptchaPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast(R.string.toast_warning_phone_captcha_image_code_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPasswordOnceMore.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkPhoneInput()) {
-            Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-            sessionBuild.setStep(Session.FindPasswordStepCodes.CheckPhone_VALUE);
-            sessionBuild.setAccount(etPhone.getText().toString().trim());
-            if (isNeedCaptcha) {
-                sessionBuild.setCaptcha(etCaptcha.getText().toString().trim());
-                sessionBuild.setCaptchaKey(captchaKey);
-            }
-            Session.SessionIn sessionOut = sessionBuild.build();
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setSessionIn(sessionOut);
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.FIND_PWD, null, reqBuild.build().toByteArray(),
-                    new OnCaptchaPhone(), errorListener
-            );
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkPhoneInput() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (etPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                captchaKey = captchaCode;
-                Glide.with(AuthForgetPasswordFragment.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnCaptchaPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-    private class OnRegisterByPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            isFindPwd = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_find_pwd_success);
-                    AuthEvent event = new AuthEvent();
-                    event.setSkipCode(ActAuth.JOB_CODE_LOGIN);
-                    EventBus.getDefault().post(event);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(R.string.toast_user_login_act_find_pwd_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_find_pwd_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-            }
-        }
-    }
-}

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

@@ -1,686 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.ContentValues;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.AppBaseBll;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.YogConfig;
-import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.react.ReactUtil;
-import com.kfzs.duanduan.utils.dlg.CheckUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.view.TimeButton;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * Dlg
- * 2017.12.07   改
- */
-public class AuthLoginFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    public static final int LOGIN_TYPE_IS_APP_LOGIN = 1;
-    public static final int LOGIN_TYPE_IS_CERTIFICATION = 2 << 1;
-    public static final int LOGIN_TYPE_CODE_IS_NEW_ACCOUNT = 3 << 1;
-    public static final int LOGIN_TYPE_CODE_IS_NEW_ACCOUNT_CERTIFICATION = 4 << 1;
-
-    public static final String KEY_LOGIN_TYPE = "fragment:auth:login:type";
-    private MDLEditText mEdtUserName, mEdtPass, mEdtPhone, mEdtSms;
-    private LinearLayout mLayoutLoginPass, mLayoutLoginSms;
-    private TimeButton mBtnTime;
-    private boolean mIsLogin = false;
-    private boolean mIsLoginErr = false;
-    private TextView mTxtLoginType;
-    private int loginType = LOGIN_TYPE_IS_APP_LOGIN;//登录的方式，顶上的四个登录方式
-
-
-    private static final int LOGIN_ENTER_USERNAME_PASSWORD = 0;
-    private static final int LOGIN_ENTER_PHONE_SMS = 1;
-    /**
-     * 登录模式是密码登录还是短信登录
-     */
-    private int mIntCurrentLoginStyle = LOGIN_ENTER_USERNAME_PASSWORD;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            loginType = getArguments().getInt(KEY_LOGIN_TYPE, LOGIN_TYPE_IS_APP_LOGIN);
-        }
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_login);
-        if (!TextUtils.isEmpty(AuthEvent.getRegisterback())) {
-            mEdtUserName.setText(AuthEvent.getUserName());
-            mEdtPass.setText(AuthEvent.getUserPassword());
-        }
-        if(mEdtUserName != null && mEdtPass !=null){
-            mEdtUserName.setFocusable(true);
-        }
-
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mIsLogin = false;
-        mIsLoginErr = false;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        KFZSNetwork.stopByTag(TAG);
-        mIsLogin = false;
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_login_action:
-                mIsLoginErr = false;
-                AuthEvent.setRegisterback("");
-                loginByStatus();
-                break;
-            case R.id.tv_fgt_login_forget_password:
-                skip2FgtByCode(ActAuth.JOB_CODE_FORGET_PASSWORD);
-                break;
-            case R.id.tv_user_login_act_phone_type:
-                if (mIntCurrentLoginStyle == LOGIN_ENTER_PHONE_SMS) {
-                    toggleLoginEnter(LOGIN_ENTER_USERNAME_PASSWORD);
-                    mTxtLoginType.setText(getString(R.string.login_type_sms));
-                } else {
-                    mTxtLoginType.setText(getString(R.string.login_type_pass));
-                    toggleLoginEnter(LOGIN_ENTER_PHONE_SMS);
-                }
-                break;
-            case R.id.btn_fgt_login_get_captcha_phone:
-                postGetCaptchaPhone();
-                break;
-            case R.id.layout_fgt_login_in_wechat:
-                loginByWechat();
-                break;
-            case R.id.layout_fgt_login_in_qq:
-                loginByQQ();
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * 微信登录
-     */
-    private void loginByWechat() {
-        UMShareAPI.get(getContext()).doOauthVerify(getActivity(), SHARE_MEDIA.WEIXIN, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA share_media) {
-
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
-
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
-
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA share_media, int i) {
-
-            }
-        });
-    }
-
-    /**
-     * 通过QQ登录
-     */
-    private void loginByQQ() {
-        UMShareAPI.get(getContext()).doOauthVerify(getActivity(), SHARE_MEDIA.QQ, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA share_media) {
-
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
-
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
-
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA share_media, int i) {
-
-            }
-        });
-    }
-
-    private void skip2FgtByCode(int code) {
-        AuthEvent authEvent = new AuthEvent();
-        authEvent.setSkipCode(code);
-        EventBus.getDefault().post(authEvent);
-    }
-
-    /**
-     * 短信登录方式
-     *
-     * @param phone
-     * @param valicode
-     */
-    private void submit_SMS(String phone, String valicode) {
-        if (!CheckUtils.getInstance().isPhoneSucc(phone)) {
-            return;
-        }
-        if (TextUtils.isEmpty(valicode)) {
-            G.showToast(R.string.tv_user_login_act_please_input_captcha_phone);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-                if (KFZSApp.DEBUG) {
-                    showToast("网络服务错误", ToastBuilder.MIDDLE_TOAST_SINGLE);
-                } else {
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                }
-                mIsLogin = false;
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(phone);
-        sessionBuild.setSmsSeccode(valicode);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN_SMS,
-                null, apiRequest1.toByteArray(), 20 * 1000, new ResponseAuthLogin(phone), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-        mIsLogin = true;
-    }
-
-    /**
-     * 密码方式登录
-     *
-     * @param account
-     * @param psd
-     */
-    private void submit_Pass(String account, String psd) {
-        if (!CheckUtils.getInstance().isLoginParamsSuccs(account, psd)) {
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-                mIsLogin = false;
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(account);
-        sessionBuild.setPwd(psd);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        byte[] bytes = apiRequest1.toByteArray();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN, null, bytes, new ResponseAuthLogin(account), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-        mIsLogin = true;
-    }
-
-    /**
-     * 验证登录返回的token是否有效
-     *
-     * @param token
-     */
-    private void popHeadSessionUserGraphInfo(String token) {
-        ALog.d("Auth popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(mContext, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_error_repeat + "==错误码：" + code);
-                mIsLogin = false;
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params, new OnHeadSessionUserGraph(token), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-        mIsLogin = true;
-    }
-
-    private void loginByStatus() {
-        if (mIsLoginErr) {
-            G.showToast(R.string.toast_user_login_act_login_error_repeat);
-            return;
-        }
-        if (!mIsLogin) {
-            if (mIntCurrentLoginStyle == LOGIN_ENTER_PHONE_SMS) {
-                submit_SMS(mEdtPhone.getText().toString().trim(), mEdtSms.getText().toString().trim());
-            } else {
-                submit_Pass(mEdtUserName.getText().toString().trim(),
-                        mEdtPass.getText().toString().trim());
-            }
-        } else {
-            G.showToast(R.string.toast_user_login_act_is_login);
-        }
-    }
-
-
-    /**
-     * 密码框输入时的监听处理
-     */
-    private void setEtOnEditorAction() {
-        mEdtPass.setOnEditorActionListener(new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            mIsLoginErr = false;
-                            loginByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_login_in);
-
-        this.mLayoutLoginSms = ViewFindUtils.find(mContentView, R.id.ll_fgt_login_phone_sms);
-        this.mLayoutLoginPass = ViewFindUtils.find(mContentView, R.id.ll_fgt_login_username_password);
-        this.mTxtLoginType = ViewFindUtils.find(mContentView, R.id.tv_user_login_act_phone_type);
-        this.mEdtPhone = ViewFindUtils.find(mContentView, R.id.et_fgt_login_phone_number);
-        this.mEdtSms = ViewFindUtils.find(mContentView, R.id.et_fgt_login_sms);
-        this.mBtnTime = ViewFindUtils.find(mContentView, R.id.btn_fgt_login_get_captcha_phone);
-        this.mEdtUserName = ViewFindUtils.find(mContentView, R.id.et_fgt_login_username);
-        this.mEdtPass = ViewFindUtils.find(mContentView, R.id.et_fgt_login_password);
-        ViewFindUtils.find(mContentView, R.id.tv_fgt_login_forget_password).setOnClickListener(this);
-        ViewFindUtils.find(mContentView, R.id.btn_fgt_login_action).setOnClickListener(this);
-        ViewFindUtils.find(mContentView, R.id.layout_fgt_login_in_wechat).setOnClickListener(this);
-        ViewFindUtils.find(mContentView, R.id.layout_fgt_login_in_qq).setOnClickListener(this);
-        mBtnTime.setOnClickListener(this);
-        setEtOnEditorAction();
-        mTxtLoginType.setOnClickListener(this);
-        try {
-            //方便测试时快速登录账号
-            debugQuickLogin();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void debugQuickLogin() {
-        List<String> arr = ReactUtil.initArr();
-        if (arr.size() > 0) {//文件名字：duanduan.zh 格式：{账号}tab{密码}{\n}{账号}tab{密码}{...}
-            ArrayAdapter arrayAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1,arr);
-            mEdtUserName.setAdapter(arrayAdapter);
-            mEdtUserName.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
-                @Override
-
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    Object obj = parent.getItemAtPosition(position);
-                    String pwd = ReactUtil.MAP_PWD.get(obj.toString());
-                    if(TextUtils.isEmpty(pwd)){
-                        pwd = "123456";
-                    }
-                    mEdtPass.setText(pwd);
-                    ViewFindUtils.find(mContentView, R.id.btn_fgt_login_action).performClick();
-                }
-
-            });
-            mEdtUserName.setDropDownVerticalOffset(-90);
-            mEdtUserName.setThreshold(1);
-            mEdtUserName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                @Override
-                public void onFocusChange(View view, boolean hasFocus) {
-                    if(hasFocus && view instanceof AppCompatAutoCompleteTextView){
-                        ((AppCompatAutoCompleteTextView) view).showDropDown();
-                    }
-                }
-            });
-        } else if (KFZSApp.DEBUG) {
-            mEdtUserName.setText("tianran6");
-            mEdtPass.setText("qwer1234");
-        }
-    }
-
-    /**
-     * 两种登录模式的回调处理
-     */
-    private class ResponseAuthLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        private final String account;
-
-        public ResponseAuthLogin(String account) {
-            this.account = account;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int code = apiResponse.getCodeValue();
-            switch (code) {
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    mIsLoginErr = true;
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Session.SessionOut sessionOut = apiResponse.getSessionOut();
-                    popHeadSessionUserGraphInfo(sessionOut.getToken());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat + ",错误码：" + code, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            mIsLogin = false;
-        }
-    }
-
-    private void filterByDifferentLoginType(UserOuterClass.User user, String token) {
-        mIsLogin = true;
-        InputMethodUtils.closeInputPan(getActivity());
-        EventBus eventBus = EventBus.getDefault();
-        ALog.e("-loginType: " + loginType);
-        switch (loginType) {
-            case LOGIN_TYPE_IS_APP_LOGIN:
-                upDateUserInfo(user, token, true);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                new AppBaseBll().reloadVipStyle(getActivity());
-//                new Handler(new Handler.Callback() {
-//                    @Override
-//                    public boolean handleMessage(Message msg) {
-//                        if (getActivity() == null) {
-//                            return false;
-//                        }
-//                        getActivity().finish();
-//                        EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-//                        return false;
-//                    }
-//                }).sendEmptyMessageDelayed(0, 200);
-
-                break;
-            case LOGIN_TYPE_IS_CERTIFICATION://游戏认证登录；
-                upDateUserInfo(user, token, false);
-                setPlayer(user, token);
-                AuthEvent authEvent = new AuthEvent();
-                authEvent.setSkipCode(ActAuth.JOB_CODE_LOGIN_CERTIFICATION_SUCCESS);
-                authEvent.setAuth(true);
-                authEvent.setNewUid(user.getId());
-                eventBus.post(authEvent);
-                getActivity().finish();
-                break;
-            case LOGIN_TYPE_CODE_IS_NEW_ACCOUNT:
-                upDateUserInfo(user, token, true);
-                AuthEvent authNewAccountEvent = new AuthEvent();
-                authNewAccountEvent.setSkipCode(ActAuth.JOB_CODE_NEW_ACCOUNT_SUCCESS);
-                eventBus.post(authNewAccountEvent);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                new AppBaseBll().reloadVipStyle(getActivity());
-                break;
-            case LOGIN_TYPE_CODE_IS_NEW_ACCOUNT_CERTIFICATION://游戏认证登录；
-                AuthEvent authNewAccountMCEvent = new AuthEvent();
-                authNewAccountMCEvent.setSkipCode(ActAuth.JOB_CODE_NEW_ACCOUNT_CERTIFICATION_SUCCESS);
-                authNewAccountMCEvent.setNewUid(user.getId());
-                eventBus.post(authNewAccountMCEvent);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                break;
-            default:
-                ALog.d("filterByDifferentLoginType default develop use!");
-                break;
-        }
-    }
-
-    //游戏授权 保存数据；
-    private void setPlayer(UserOuterClass.User user, String token) {
-        ContentValues values = new ContentValues();
-        values.put(YogConfig.Player.TOKEN, token);
-        values.put(YogConfig.Player.DD_USERID, String.valueOf(user.getId()));
-        values.put(YogConfig.Player.OPENID, user.getOpenId());
-        values.put(YogConfig.Player.USERNAME, user.getName());
-        values.put(YogConfig.Player.CHANNEL, DataSave.getInstance().getChannelName());
-        String gameCode = KFZSApp.getInstance().GameCode;
-
-        try {
-            DDProviderHelper.getInstance().insertOrUpdatePalyer(mContext, values, gameCode);
-            DDProviderHelper.getInstance().setGameLastPalyer(mContext, String.valueOf(user.getOpenId()), gameCode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 切换登录方式用短信还是密码
-     *
-     * @param loginEnter
-     */
-    private void toggleLoginEnter(int loginEnter) {
-        mIntCurrentLoginStyle = loginEnter;
-        if (loginEnter == LOGIN_ENTER_USERNAME_PASSWORD) {
-            mLayoutLoginPass.setVisibility(View.VISIBLE);
-            mLayoutLoginSms.setVisibility(View.GONE);
-            mBtnTime.reset();
-            mEdtPhone.setText("");
-        } else {
-            mLayoutLoginPass.setVisibility(View.GONE);
-            mLayoutLoginSms.setVisibility(View.VISIBLE);
-            mEdtUserName.setText("");
-            mEdtPass.setText("");
-        }
-    }
-
-
-    /**
-     * 获取手机验证码的操作
-     */
-    private void postGetCaptchaPhone() {
-        mBtnTime.reset();
-        if (CheckUtils.getInstance().isPhoneSucc(mEdtPhone.getText().toString())) {
-            Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-            sessionBuild.setAccount(mEdtPhone.getText().toString().trim());
-
-            Session.SessionIn sessionOut = sessionBuild.build();
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setSessionIn(sessionOut);
-
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_error);
-                    mBtnTime.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.SMS_LOGIN, null, reqBuild.build().toByteArray(), 20 * 1000,
-                    new OnSmsLogin(), errorListener
-            );
-
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            mBtnTime.star();
-        }
-    }
-
-
-    /**
-     * 获取手机验证码的回调接口
-     */
-    private class OnSmsLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    mBtnTime.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    mBtnTime.reset();
-                    break;
-            }
-        }
-    }
-
-    /**
-     * 登录得到token后，去验证这个token后的回调实现
-     */
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        String token;
-
-        public OnHeadSessionUserGraph(String token) {
-            this.token = token;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    mIsLoginErr = false;
-                    mIsLogin = false;
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        filterByDifferentLoginType(user, token);
-                    } else {
-                        G.showToast(R.string.toast_user_login_act_login_error_repeat);
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    mIsLoginErr = true;
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                default:
-                    showToast("出现未知错误：code：" + codeValue, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            mIsLogin = false;
-        }
-
-    }
-
-    /**
-     * 补全用户信息到数据库
-     *
-     * @param user
-     * @param token
-     * @param isApp
-     */
-    private void upDateUserInfo(UserOuterClass.User user, String token, boolean isApp) {
-        int id = user.getId();
-        if (isApp) {
-            Current lastUser = DDProviderHelper.getInstance().getLastUser(mContext);
-            if (lastUser == null)
-                lastUser = new Current();
-            lastUser.setMUserId(String.valueOf(id));
-            lastUser.setMUserName(user.getName());
-            lastUser.setMVipType(user.getVipType());
-            lastUser.setMNickName(user.getNickname());
-            lastUser.setMMobile(user.getPhone());
-            lastUser.setMOpenId(user.getOpenId());
-            lastUser.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-            lastUser.setMAvatar(user.getAvatar());
-            lastUser.setMToken(token);
-            DDProviderHelper.getInstance().setLastUser(mContext, lastUser);
-        }
-
-        User player = DDProviderHelper.getInstance().getUser(mContext, String.valueOf(id));
-        if (player == null)
-            player = new User();
-        player.setMUserId(String.valueOf(id));
-        player.setMUserName(user.getName());
-        player.setMVipType(user.getVipType());
-        player.setMNickName(user.getNickname());
-        player.setMMobile(user.getPhone());
-        player.setMOpenId(user.getOpenId());
-        player.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-        player.setMAvatar(user.getAvatar());
-        player.setMToken(token);
-
-        DDProviderHelper.getInstance().addOrUpdateUser(mContext, player);
-        if (!TextUtils.isEmpty(KFZSApp.getInstance().GameCode)) {
-            DDProviderHelper.getInstance().addOrUpdatePlayer(mContext, player, KFZSApp.getInstance().GameCode);
-        }
-    }
-
-}

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

@@ -1,693 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLCheckBox;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.CertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDCertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.event.ReStartEvent;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.AuthRequestBytes;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class AuthRegisterByPhoneFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    private MDLEditText etUserName;
-    private MDLEditText etCaptchaPhone;
-    private MDLEditText etPassword;
-    private MDLEditText etPasswordOnceMore;
-    private MDLEditText etCaptcha;
-    private MDLEditText etInviteCode;
-    private TextView btnCaptchaPhone;
-    private ImageView show_password;
-    private ImageView show_confirm_password;
-    private Button btnRegister;
-    private ImageView imgCaptcha;
-    private MDLCheckBox ckClause;
-    private TextView tvShowClause;
-    private TextView tvSkip2RegisterByUserName;
-    private LinearLayout llPhoneCaptcha;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isRegistering = false;
-    private boolean canGetCaptchaPhone = true;
-    private boolean isShowPassword = false;
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private String captchaKey = "";
-    private String agreementKuaifaAssentClause;
-    private boolean isShowConfirmPassword = false;
-    private String UserName;
-    private String UserPassword;
-    private String Token;
-    public static final String REGISTER_PHONE_TAG = "fgt:auth:register:phone";
-    private int loginType = AuthLoginFragment.LOGIN_TYPE_IS_APP_LOGIN;
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_register);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        if (countDownGetCaptchaPhone != null) {
-            countDownGetCaptchaPhone.cancel();
-        }
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_register_phone);
-        initViewByID(mContentView);
-        agreementKuaifaAssentClause = getString(R.string.toast_user_login_act_please_agreement_kuaifa_assent_clause) + getString(R.string.str_public_html_clause) + "!";
-
-        Bundle arguments = getArguments();
-        if (arguments != null) {
-            loginType = arguments.getInt(AuthLoginFragment.KEY_LOGIN_TYPE, AuthLoginFragment.LOGIN_TYPE_IS_APP_LOGIN);
-        }
-        setListeners();
-    }
-
-    private void initViewByID(View v) {
-        this.etUserName = (MDLEditText) v.findViewById(R.id.et_fgt_register_phone_username);
-        this.etCaptchaPhone = (MDLEditText) v.findViewById(R.id.et_fgt_register_phone_captcha_phone);
-        this.etPassword = (MDLEditText) v.findViewById(R.id.et_fgt_register_phone_password);
-        this.etPasswordOnceMore = (MDLEditText) v.findViewById(R.id.et_fgt_register_phone_password_once_more);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_register_phone_captcha);
-        this.btnCaptchaPhone = (TextView) v.findViewById(R.id.btn_fgt_register_phone_get_captcha_phone);
-        this.btnRegister = (Button) v.findViewById(R.id.btn_fgt_register_phone_action);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_register_phone_captcha);
-        this.ckClause = (MDLCheckBox) v.findViewById(R.id.ck_fgt_register_phone_clause);
-        this.tvShowClause = (TextView) v.findViewById(R.id.tv_fgt_register_phone_clause);
-        this.tvSkip2RegisterByUserName = (TextView) v.findViewById(R.id.tv_fgt_register_phone_skip_register_fgt_ordinary);
-        this.llPhoneCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_register_phone_captcha);
-        this.show_password = (ImageView) v.findViewById(R.id.show_password);
-        this.show_confirm_password = (ImageView) v.findViewById(R.id.show_confirm_password);
-        this.etInviteCode=(MDLEditText)v.findViewById(R.id.et_flage_invite_code);
-    }
-
-    private void setListeners() {
-        btnCaptchaPhone.setOnClickListener(this);
-        btnRegister.setOnClickListener(this);
-        tvSkip2RegisterByUserName.setOnClickListener(this);
-        tvShowClause.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        show_password.setOnClickListener(this);
-        show_confirm_password.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-        };
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_register_phone_get_captcha_phone:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_register_phone_action:
-                registerByStatus();
-                break;
-            case R.id.img_fgt_register_phone_captcha:
-                refreshCaptcha();
-                break;
-            case R.id.tv_fgt_register_phone_skip_register_fgt_ordinary:
-                skip2JobFgt(ActAuth.JOB_CODE_REGISTER_ORDINARY);
-                break;
-            case R.id.tv_fgt_register_phone_clause:
-                Uri uri = Uri.parse(getString(R.string.str_public_html_clause_url));
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-                break;
-            case R.id.show_password:
-                if (!isShowPassword) {
-                    isShowPassword = true;
-                    show_password.setImageResource(R.drawable.show_password_eyes);
-                    etPassword.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                    etPassword.setSelection(etPassword.getText().length());
-                } else {
-                    isShowPassword = false;
-                    show_password.setImageResource(R.drawable.close_password_eyes);
-                    etPassword.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                    etPassword.setSelection(etPassword.getText().length());
-                }
-                break;
-            case R.id.show_confirm_password:
-                if (!isShowConfirmPassword) {
-                    isShowConfirmPassword = true;
-                    show_confirm_password.setImageResource(R.drawable.show_password_eyes);
-                    etPasswordOnceMore.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                    etPasswordOnceMore.setSelection(etPasswordOnceMore.getText().length());
-                } else {
-                    isShowConfirmPassword = false;
-                    show_confirm_password.setImageResource(R.drawable.close_password_eyes);
-                    etPasswordOnceMore.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                    etPasswordOnceMore.setSelection(etPasswordOnceMore.getText().length());
-                }
-                break;
-            default:
-                break;
-
-        }
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            registerByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etPasswordOnceMore.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkUserWithPhone()) {
-            byte[] captchaPhoneBytes;
-            String captcha = etCaptcha.getText().toString().trim();
-            String phoneNum = etUserName.getText().toString().trim();
-            String  inviationCode=etInviteCode.getText().toString().trim();
-            if (isNeedCaptcha) {
-                captchaPhoneBytes = AuthRequestBytes.getInstance().buildRegisterBytes(null, phoneNum, inviationCode, captchaKey, captcha, Session.RegisterStepCodes.CaptchaPhone_VALUE, null);
-            } else {
-                captchaPhoneBytes = AuthRequestBytes.getInstance().buildRegisterBytes(null, phoneNum, inviationCode, captchaKey, null, Session.RegisterStepCodes.CaptchaPhone_VALUE, null);
-            }
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.REGISTER, null, captchaPhoneBytes, new OnCaptchaPhone(), errorListener);
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkUserWithPhone() {
-        if (UITextUtils.isEditTextEmpty(etUserName)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        String phoneNumber = etUserName.getText().toString().trim();
-        if (phoneNumber.length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (!phoneNumber.matches("^\\d{11}$")) {
-            showToast(R.string.toast_warning_phone_number_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-        return true;
-    }
-
-    private void skip2JobFgt(int code) {
-        AuthEvent event = new AuthEvent();
-        event.setSkipCode(code);
-        event.setUserName(UserName);
-        event.setUserPassword(UserPassword);
-        event.setToken(Token);
-        event.setRegisterback(REGISTER_PHONE_TAG);
-        EventBus.getDefault().post(event);
-    }
-
-    private void registerByStatus() {
-        if (!isRegistering) {
-            postRegister();
-        } else {
-            showToast(R.string.toast_user_login_act_is_register, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postRegister() {
-        if (checkRegisterParams()) {
-            String pwd = etPassword.getText().toString().trim();
-            String pwdOnceMore = etPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isRegistering = false;
-                    }
-                });
-                String captcha = etCaptcha.getText().toString().trim();
-                byte[] registerBytes;
-                String userName = etUserName.getText().toString().trim();
-                String captchaPhone = etCaptchaPhone.getText().toString().trim();
-                String  inviationCode=etInviteCode.getText().toString().trim();
-                if (isNeedCaptcha) {
-                    registerBytes = AuthRequestBytes.getInstance().buildRegisterBytes(pwdOnceMore,
-                            userName,inviationCode, captchaKey, captcha,
-                            Session.RegisterStepCodes.RegisterByCaptchaPhone_VALUE, captchaPhone);
-                } else {
-                    registerBytes = AuthRequestBytes.getInstance().buildRegisterBytes(pwdOnceMore,
-                            userName,inviationCode, captchaKey, null,
-                            Session.RegisterStepCodes.RegisterByCaptchaPhone_VALUE, captchaPhone);
-
-                }
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.REGISTER,
-                        null, registerBytes, new OnRegisterByPhone(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isRegistering = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-
-    private boolean checkRegisterParams() {
-        if (!ckClause.isChecked()) {
-            showToast(agreementKuaifaAssentClause, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (UITextUtils.isEditTextEmpty(etUserName)) {
-            showToast(R.string.tv_user_login_act_please_input_username, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            String phoneNumber = etUserName.getText().toString().trim();
-            if (phoneNumber.length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            }
-            if (!phoneNumber.matches("^\\d{11}$")) {
-                showToast(R.string.toast_warning_phone_number_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-            UserName = phoneNumber;
-        }
-        if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etCaptchaPhone.getText().toString().trim().length() != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast(R.string.toast_warning_captcha_image_code_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            String pwd = etPassword.getText().toString().trim();
-            if (pwd.length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-            UserPassword = pwd;
-        }
-        if (UITextUtils.isEditTextEmpty(etPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llPhoneCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String key, String url) {
-                captchaKey = key;
-                Glide.with(AuthRegisterByPhoneFragment.this).load(url).error(android.R.drawable.stat_notify_error).into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnRegisterByPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            isRegistering = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    //                    skip2JobFgt(ActAuth.JOB_CODE_LOGIN);
-//                    setLoginCannel();
-                    autoLogin();
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    //注册成功，自动登录；
-    private void autoLogin() {
-        AuthEvent.setRegisterback("");
-        postLoginByNetwork(etUserName.getText().toString().trim(), etPasswordOnceMore.getText().toString().trim(), captchaKey);
-    }
-
-
-    private void postLoginByNetwork(String account, String psd, String captcha) {
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(account);
-        sessionBuild.setCaptcha(captcha);
-        sessionBuild.setCaptchaKey(captchaKey);
-        sessionBuild.setPwd(psd);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN,
-                null, apiRequest1.toByteArray(), new ResponseAuthLogin(account), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-    }
-
-    private class ResponseAuthLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-
-        private final String account;
-
-        public ResponseAuthLogin(String account) {
-            this.account = account;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int code = apiResponse.getCodeValue();
-            switch (code) {
-
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Session.SessionOut sessionOut = apiResponse.getSessionOut();
-                    String openId = sessionOut.getOpenId();
-                    KFZSDDContentSession.getInstance().insertOrUpdateSession(mContext, account,
-                            openId, sessionOut.getUid(), sessionOut.getToken());
-                    Token = sessionOut.getToken();
-                    popHeadSessionUserGraphInfo(sessionOut.getToken());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    skip2JobFgt(ActAuth.JOB_CODE_LOGIN);
-                    break;
-            }
-        }
-    }
-
-
-    private void popHeadSessionUserGraphInfo(String uid) {
-        SessionBean saveHeadSessionInMem = KFZSDDContentSession.getInstance().getSaveHeadSessionInMem();
-        String token = saveHeadSessionInMem.getToken();
-        ALog.d("Auth popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error);
-            KFZSDDContentSession.getInstance().removeHeadSession(mContext);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(mContext, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_error_repeat);
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params, new OnHeadSessionUserGraph(uid), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-
-    private class OnCaptchaPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        String token;
-
-        public OnHeadSessionUserGraph(String uid) {
-            this.token = uid;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        filterByDifferentLoginType(user, token);
-//                        UserBean userGraph = UserGraphUtils.saveNewUserGraph(user);
-//                        if (userGraph != null) {
-//                            filterByDifferentLoginType();
-//                        } else {
-//                            showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-//                        }
-                    } else {
-                        showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    ALog.d("Auth popHeadToken: Unauthorized_VALUE");
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    private void filterByDifferentLoginType(UserOuterClass.User user, String token) {
-        InputMethodUtils.closeInputPan(getActivity());
-        EventBus eventBus = EventBus.getDefault();
-
-//TODO APP登录后也会调用这里，逻辑不太清，以后慢慢理
-        loginType = 1;
-        switch (loginType) {
-            case AuthLoginFragment.LOGIN_TYPE_IS_CERTIFICATION://游戏认证登录；
-//                ((ActAuth) getActivity()).upDateUserInfo(user, token, false);
-//                ((ActAuth) getActivity()).setPlayer(user, token);
-                AuthEvent authEvent = new AuthEvent();
-                authEvent.setSkipCode(ActAuth.JOB_CODE_LOGIN_CERTIFICATION_SUCCESS);
-                authEvent.setAuth(true);
-                authEvent.setNewUid(user.getId());
-                eventBus.post(authEvent);
-                getActivity().finish();
-                break;
-            default:
-                eventBus.post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-
-                ReStartEvent event = new ReStartEvent();
-                event.setReStart(true);
-                EventBus.getDefault().post(event);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                if (null != countDownGetCaptchaPhone) {
-                    countDownGetCaptchaPhone.reset();
-                }
-                getActivity().finish();
-
-                break;
-        }
-    }
-
-    /**
-     * 登录验证-注册时使用
-     */
-    private void setLoginCannel() {
-        try {
-            final String tags = this.getClass().getCanonicalName() + "";
-            final KFZSDDCertificationDog certificationDog = KFZSDDCertificationDog.getInstance();
-            certificationDog.init(getActivity(), new CertificationDog() {
-                @Override
-                public void onCertificationCodeCallBack(User user, String gamePackageName, String gameCode, String extrasString) {
-                    try {
-                        if (certificationDog != null) {
-                            certificationDog.doCertificationCancel();
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                public void onCertificationSuccess() {
-                    KFZSApp.getInstance().quit();
-                }
-
-                @Override
-                public void onCertificationCancel() {
-                    KFZSApp.getInstance().quit();
-                }
-
-                @Override
-                public void onLoginJob() {
-
-                }
-
-                @Override
-                public void onError(int errorCode, String msg) {
-
-                }
-            });
-            certificationDog.doCertificationCancel();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-}

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

@@ -1,565 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLCheckBox;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.CertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDCertificationDog;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.event.ReStartEvent;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.AuthRequestBytes;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class AuthRegisterOrdinaryFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    private MDLEditText etUserName;
-    private MDLEditText etPassword;
-    private MDLEditText etPasswordOnceMore;
-    private MDLEditText etCaptcha;
-    private MDLEditText etInviteCode;
-    private Button btnRegister;
-    private ImageView imgCaptcha;
-    private MDLCheckBox ckClause;
-    private TextView tvShowClause;
-    private TextView tvSkip2RegisterByPhone;
-    private LinearLayout llPhoneCaptcha;
-    private ImageView show_password;
-    private ImageView show_confirm_password;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isRegistering = false;
-    private String captchaKey = "";
-    private String agreementKuaifaAssentClause;
-    private String UserName;
-    private String UserPassword;
-    private String Token;
-    private boolean isShowPassword = false;
-    private boolean isShowConfirmPassword = false;
-    public static final String REGISTER_ORDINARY_TAG = "fgt:auth:register:ordinary";
-
-    private int loginType = AuthLoginFragment.LOGIN_TYPE_IS_APP_LOGIN;
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_register);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_register_ordinary);
-        initViewById(mContentView);
-        agreementKuaifaAssentClause = getString(R.string.toast_user_login_act_please_agreement_kuaifa_assent_clause) + getString(R.string.str_public_html_clause) + "!";
-
-        Bundle arguments = getArguments();
-        if (arguments != null) {
-            loginType = arguments.getInt(AuthLoginFragment.KEY_LOGIN_TYPE, AuthLoginFragment.LOGIN_TYPE_IS_APP_LOGIN);
-        }
-        setListeners();
-    }
-
-    private void initViewById(View v) {
-        this.etUserName = (MDLEditText) v.findViewById(R.id.et_fgt_register_ordinary_username);
-        this.etPassword = (MDLEditText) v.findViewById(R.id.et_fgt_register_ordinary_password);
-        this.etPasswordOnceMore = (MDLEditText) v.findViewById(R.id.et_fgt_register_ordinary_password_once_more);
-        this.llPhoneCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_register_ordinary_captcha);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_register_ordinary_captcha);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_register_ordinary_captcha);
-        this.btnRegister = (Button) v.findViewById(R.id.btn_fgt_register_ordinary_action);
-        this.ckClause = (MDLCheckBox) v.findViewById(R.id.ck_fgt_register_ordinary_clause);
-        this.tvShowClause = (TextView) v.findViewById(R.id.tv_fgt_register_ordinary_clause);
-        this.tvSkip2RegisterByPhone = (TextView) v.findViewById(R.id.tv_user_login_act_user_register_phone);
-        this.show_password = (ImageView) v.findViewById(R.id.show_password);
-        this.show_confirm_password = (ImageView) v.findViewById(R.id.show_confirm_password);
-        this.etInviteCode=(MDLEditText)v.findViewById(R.id.et_flage_invite_code);
-    }
-
-    protected void setListeners() {
-        btnRegister.setOnClickListener(this);
-        tvSkip2RegisterByPhone.setOnClickListener(this);
-        tvShowClause.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        show_password.setOnClickListener(this);
-        show_confirm_password.setOnClickListener(this);
-        setEtOnEditorAction();
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_register_ordinary_action:
-                registerByStatus();
-                break;
-            case R.id.tv_user_login_act_user_register_phone:
-                skip2JobFgt(ActAuth.JOB_CODE_REGISTER_PHONE);
-                break;
-            case R.id.img_fgt_register_ordinary_captcha:
-                refreshCaptcha();
-                break;
-            case R.id.tv_fgt_register_ordinary_clause:
-                Uri uri = Uri.parse(getString(R.string.str_public_html_clause_url));
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-                break;
-            case R.id.show_password:
-                if (!isShowPassword) {
-                    isShowPassword = true;
-                    show_password.setImageResource(R.drawable.show_password_eyes);
-                    etPassword.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                    etPassword.setSelection(etPassword.getText().length());
-                } else {
-                    isShowPassword = false;
-                    show_password.setImageResource(R.drawable.close_password_eyes);
-                    etPassword.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                    etPassword.setSelection(etPassword.getText().length());
-                }
-                break;
-            case R.id.show_confirm_password:
-                if (!isShowConfirmPassword) {
-                    isShowConfirmPassword = true;
-                    show_confirm_password.setImageResource(R.drawable.show_password_eyes);
-                    etPasswordOnceMore.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                    etPasswordOnceMore.setSelection(etPasswordOnceMore.getText().length());
-                } else {
-                    isShowConfirmPassword = false;
-                    show_confirm_password.setImageResource(R.drawable.close_password_eyes);
-                    etPasswordOnceMore.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                    etPasswordOnceMore.setSelection(etPasswordOnceMore.getText().length());
-                }
-            default:
-                break;
-        }
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            registerByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etPasswordOnceMore.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llPhoneCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                captchaKey = captchaCode;
-                Glide.with(AuthRegisterOrdinaryFragment.this).load(url).error(android.R.drawable.stat_notify_error).into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-
-    private void skip2JobFgt(int code) {
-        AuthEvent event = new AuthEvent();
-        event.setSkipCode(code);
-        event.setUserName(UserName);
-        event.setUserPassword(UserPassword);
-        event.setToken(Token);
-        event.setRegisterback(REGISTER_ORDINARY_TAG);
-        EventBus.getDefault().post(event);
-    }
-
-    private void registerByStatus() {
-        if (!isRegistering) {
-            postRegister();
-        } else {
-            showToast(R.string.toast_user_login_act_is_register, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postRegister() {
-        if (checkRegisterParams()) {
-            String pwd = etPassword.getText().toString().trim();
-            String pwdOnceMore = etPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isRegistering = false;
-                    }
-                });
-                String captcha = etCaptcha.getText().toString().trim();
-                byte[] registerBytes;
-                String userName = etUserName.getText().toString().trim();
-                String  inviationCode=etInviteCode.getText().toString().trim();
-                if (TextUtils.isEmpty(captcha)) {
-                    registerBytes = AuthRequestBytes.getInstance().buildRegisterBytes(pwdOnceMore,
-                            userName,inviationCode, captchaKey, null,
-                            Session.RegisterStepCodes.RegisterByCaptchaPhone_VALUE, null);
-                } else {
-                    registerBytes = AuthRequestBytes.getInstance().buildRegisterBytes(pwdOnceMore,
-                            userName,inviationCode, captchaKey, null,
-                            Session.RegisterStepCodes.RegisterByCaptchaPhone_VALUE, captcha);
-                }
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.REGISTER,
-                        null, registerBytes, new OnRegisterOrdinary(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isRegistering = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-    private boolean checkRegisterParams() {
-        if (!ckClause.isChecked()) {
-            showToast(agreementKuaifaAssentClause, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (UITextUtils.isEditTextEmpty(etUserName)) {
-            showToast(R.string.tv_user_login_act_please_input_username, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            String userName = etUserName.getText().toString().trim();
-            if (userName.length() < getResources().getInteger(R.integer.size_less_user_name)) {
-                showToast(R.string.toast_warning_user_name_less);
-                return false;
-            }
-            if (!userName.matches("^[a-zA-Z].*")) {
-                showToast(R.string.toast_warning_user_name_start, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            }
-            UserName = userName;
-        }
-        if (UITextUtils.isEditTextEmpty(etPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            String pwd = etPassword.getText().toString().trim();
-            if (pwd.length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-            UserPassword = pwd;
-        }
-        if (UITextUtils.isEditTextEmpty(etPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPasswordOnceMore.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private class OnRegisterOrdinary implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            isRegistering = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    //                    showToast(R.string.toast_user_login_act_register_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    //                    skip2JobFgt(ActAuth.JOB_CODE_LOGIN);
-//                    setLoginCannel();
-                    autoLogin();
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    //注册成功，自动登录；
-    private void autoLogin() {
-        AuthEvent.setRegisterback("");
-        postLoginByNetwork(etUserName.getText().toString().trim(), etPasswordOnceMore.getText().toString().trim(), captchaKey);
-    }
-
-
-    private void postLoginByNetwork(String account, String psd, String captcha) {
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                ALog.d("code: " + code + " | errorMsg: " + error.getMessage());
-            }
-        });
-        ApiRequestOuterClass.ApiRequest.Builder builder = ApiRequestOuterClass.ApiRequest.newBuilder();
-        Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-        sessionBuild.setAccount(account);
-        sessionBuild.setCaptcha(captcha);
-        sessionBuild.setCaptchaKey(captchaKey);
-        sessionBuild.setPwd(psd);
-        Session.SessionIn session = sessionBuild.build();
-        builder.setSessionIn(session);
-        ApiRequestOuterClass.ApiRequest apiRequest1 = builder.build();
-        byte[] bytes = apiRequest1.toByteArray();
-        APIRequest loginReq = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.LOGIN, null, bytes, new ResponseAuthLogin(account), errorListener);
-        KFZSNetwork.addRequest(loginReq);
-    }
-
-    private class ResponseAuthLogin implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-
-        private final String account;
-
-        public ResponseAuthLogin(String account) {
-            this.account = account;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int code = apiResponse.getCodeValue();
-            switch (code) {
-
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    Session.SessionOut sessionOut = apiResponse.getSessionOut();
-                    String openId = sessionOut.getOpenId();
-                    KFZSDDContentSession.getInstance().insertOrUpdateSession(mContext, account, openId, sessionOut.getUid(), sessionOut.getToken());
-                    Token = sessionOut.getToken();
-                    popHeadSessionUserGraphInfo(sessionOut.getToken()/*sessionOut.getUid()*/);
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat);
-                    skip2JobFgt(ActAuth.JOB_CODE_LOGIN);
-                    break;
-            }
-        }
-    }
-
-
-    private void popHeadSessionUserGraphInfo(String tokens) {
-        SessionBean saveHeadSessionInMem = KFZSDDContentSession.getInstance().getSaveHeadSessionInMem();
-        String token = saveHeadSessionInMem.getToken();
-        ALog.d("Auth popHeadToken: " + token);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            KFZSDDContentSession.getInstance().removeHeadSession(mContext);
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(mContext, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_error_repeat);
-            }
-        });
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params, new OnHeadSessionUserGraph(tokens), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        String token;
-
-        public OnHeadSessionUserGraph(String token) {
-            this.token = token;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        filterByDifferentLoginType(user, token);
-//                        if (userGraph != null) {
-//                            filterByDifferentLoginType(user, uid);
-//                        } else {
-//                            showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-//                        }
-                    } else {
-                        showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    ALog.d("Auth popHeadToken: Unauthorized_VALUE");
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_login_error_repeat, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-        }
-    }
-
-    private void filterByDifferentLoginType(UserOuterClass.User user, String token) {
-        InputMethodUtils.closeInputPan(getActivity());
-        EventBus eventBus = EventBus.getDefault();
-//TODO APP登录后也会调用这里，逻辑不太清，以后慢慢理
-        loginType = 1;
-        switch (loginType) {
-            case AuthLoginFragment.LOGIN_TYPE_IS_CERTIFICATION://游戏认证登录；
-//                ((ActAuth) getActivity()).upDateUserInfo(user, token, false);
-//                ((ActAuth) getActivity()).setPlayer(user, token);
-                AuthEvent authEvent = new AuthEvent();
-                authEvent.setSkipCode(ActAuth.JOB_CODE_LOGIN_CERTIFICATION_SUCCESS);
-                authEvent.setAuth(true);
-                authEvent.setNewUid(user.getId());
-                eventBus.post(authEvent);
-                getActivity().finish();
-                break;
-            default:
-                eventBus.post(BigEvent.get().setEventTypes(EventTypes.USER_LOGIN_SUCC));
-                ReStartEvent event = new ReStartEvent();
-                event.setReStart(true);
-                EventBus.getDefault().post(event);
-                showToast(R.string.toast_user_login_act_login_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                getActivity().finish();
-
-                break;
-        }
-    }
-
-    /**
-     * 登录验证-注册时使用
-     * 反射调用
-     */
-    private void setLoginCannel() {
-        try {
-            final String tags = this.getClass().getCanonicalName() + "";
-            final KFZSDDCertificationDog certificationDog = KFZSDDCertificationDog.getInstance();
-            certificationDog.init(getActivity(), new CertificationDog() {
-                @Override
-                public void onCertificationCodeCallBack(User user, String gamePackageName, String gameCode, String extrasString) {
-                    try {
-                        if (certificationDog != null) {
-                            certificationDog.doCertificationCancel();
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                public void onCertificationSuccess() {
-                    KFZSApp.getInstance().quit();
-                }
-
-                @Override
-                public void onCertificationCancel() {
-                    KFZSApp.getInstance().quit();
-                }
-
-                @Override
-                public void onLoginJob() {
-
-                }
-
-                @Override
-                public void onError(int errorCode, String msg) {
-
-                }
-            });
-            certificationDog.doCertificationCancel();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -1,59 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.ActMain;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.react.api.IRnViewContainer;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-/**
- * Created by "曾杰斌" on 2017/9/15.
- */
-public class BorrowPlayFragment extends BaseCompatFragment implements IRnViewContainer {
-
-
-    private ActMain getMainActivity() {
-        return (ActMain) getActivity();
-    }
-
-    private TextView textView;
-    private ViewGroup container;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void removeRnView() {
-        container.removeAllViews();
-        container.addView(textView);
-    }
-
-    @Override
-    public void addRnView(View view) {
-        container.removeAllViews();
-        container.addView(view);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fragment_react_container);
-//        if (textView == null) {
-//            textView = new TextView(getContext());
-//            textView.setText("数据加载中...");
-//        }
-//        container = (ViewGroup) mContentView.findViewById(R.id.react_container);
-//        View mReactRootView = getMainActivity().getReactRootView();
-//        if (mReactRootView == null) {
-//            container.addView(textView);
-//        } else {
-//            container.addView(mReactRootView);
-//        }
-    }
-}

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

@@ -1,251 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Base64;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.EditTextActionUtils;
-import com.kfzs.android.view.widget.IEditTextActionJob;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class ChangeSelfNickNameFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    public static final int CHANGE_TYPE_DEFAULT = 0;
-    public static final int CHANGE_TYPE_IS_CERTIFICATION = 2 << 1;
-    public static final String KEY_CHANGE_TYPE = "fragment:auth:change:self:nick:name:type";
-
-    private TextView tvOldName;
-    private LinearLayout llImageCaptcha;
-    private MDLEditText etCaptcha;
-    private ImageView imgCaptcha;
-    private MDLEditText etNewNickName;
-    private Button btnAction;
-
-    private boolean isNeedCaptcha = false;
-    private boolean ChangeNickName = false;
-    private String captchaKey = "";
-    private Bundle arguments;
-    private int changeType;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        arguments = getArguments();
-        if (arguments != null) {
-            changeType = arguments.getInt(KEY_CHANGE_TYPE, CHANGE_TYPE_DEFAULT);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_self_change_nickname);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_change_nick);
-        initViewById(mContentView);
-        initSelfInfo();
-        setListeners();
-    }
-
-    private void initSelfInfo() {
-        UserBean outHeadUser = DDProviderHelper.getInstance().getLastUserBean(mContext);
-        if (outHeadUser != null) {
-            String nickname = outHeadUser.getNickname();
-            if (!TextUtils.isEmpty(nickname)) {
-                tvOldName.setText(nickname);
-            } else {
-
-            }
-        } else {
-
-        }
-    }
-
-    private void initViewById(View v) {
-        this.tvOldName = (TextView) v.findViewById(R.id.txt_fgt_change_nick_old);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.lay_fgt_change_nick_valicode);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.edt_fgt_change_nick_valicode);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_change_nick_valicode);
-        this.etNewNickName = (MDLEditText) v.findViewById(R.id.edt_fgt_change_nick_new);
-        this.btnAction = (Button) v.findViewById(R.id.btn_fgt_change_nick);
-    }
-
-    protected void setListeners() {
-        btnAction.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        new EditTextActionUtils.Build()
-                .setEditText(etNewNickName)
-                .setEditTextActionJob(new IEditTextActionJob() {
-                    @Override
-                    public boolean onIMEAction(int keyCode, KeyEvent event) {
-                        changeNickNameByStatus();
-                        return true;
-                    }
-                })
-                .create()
-                .watchEnterAction();
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_change_nick:
-                changeNickNameByStatus();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void changeNickNameByStatus() {
-        if (!ChangeNickName) {
-            popChangeNickName();
-        } else {
-            showToast(R.string.toast_fgt_self_change_password);
-        }
-    }
-
-    private void popChangeNickName() {
-        if (checkChangeNickBNameParams()) {
-            String nickname = etNewNickName.getText().toString().trim();
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    ChangeNickName = false;
-                    showToast(R.string.toast_user_login_act_change_nickname_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                }
-            });
-
-//            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            HashMap<String, String> params = new HashMap<>();
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken();
-            params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-            params.put("nickname", Base64.encodeToString(nickname.getBytes(), Base64.DEFAULT));
-            APIRequest apiRequest = APIRequestInstance.putReq(TAG, UrlBll.UserApi.CHANGE_NICKNAME, null, params, new OnChangeNickName(), errorListener);
-            KFZSNetwork.addRequest(apiRequest);
-            ChangeNickName = true;
-        }
-    }
-
-    private boolean checkChangeNickBNameParams() {
-        if (UITextUtils.isEditTextEmpty(etNewNickName)) {
-            showToast(R.string.tv_user_login_act_please_input_nick_name_new, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewNickName.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_nickname)) {
-                showToast(R.string.toast_warning_user_nickname_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private class OnChangeNickName implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_change_nickname_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    filterDiffChangeType();
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            ChangeNickName = false;
-        }
-    }
-
-    private void filterDiffChangeType() {
-        AuthEvent event = new AuthEvent();
-        switch (changeType) {
-            case CHANGE_TYPE_DEFAULT:
-                event.setSkipCode(ActAuth.JOB_CODE_SELF_UPDATE_USER_INFO_HEAD);
-                break;
-            case CHANGE_TYPE_IS_CERTIFICATION:
-                event.setSkipCode(ActAuth.JOB_CODE_SELF_UPDATE_USER_INFO_HEAD_CERTIFICATION_NO_NEED_LOGIN);
-                break;
-            default:
-                ALog.w("for develop use error code filter diff change type now type: " + changeType);
-                break;
-        }
-        EventBus.getDefault().post(event);
-    }
-}

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

@@ -1,297 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class ChangeSelfPasswordFragment extends BaseCompatFragment implements View.OnClickListener {
-
-    private TextView nowNickName;
-    private MDLEditText etOldPassword;
-    private MDLEditText etNewPassword;
-    private MDLEditText etNewPasswordOnceMore;
-    private LinearLayout llImageCaptcha;
-    private MDLEditText etCaptcha;
-    private ImageView imgCaptcha;
-    private Button btnActionChangePassword;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isFindPwd = false;
-    private String captchaKey = "";
-    private Bundle arguments;
-    private SessionBean headSession;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        arguments = getArguments();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AuthEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_self_change_password);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_self_change_password);
-        initViewById(mContentView);
-        bindViewData();
-        setListeners();
-    }
-
-    private void bindViewData() {
-        headSession = KFZSDDContentSession.getInstance().findOutHeadSession(mContext);
-        UserBean headUser = DDProviderHelper.getInstance().getLastUserBean(mContext);
-        this.nowNickName.setText(String.valueOf(headUser.getNickname()));
-    }
-
-    private void initViewById(View v) {
-        this.nowNickName = (TextView) v.findViewById(R.id.txt_fgt_change_pass_nick);
-        this.etOldPassword = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_oldpass);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.lay_fgt_change_pass_valicode);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_valicode);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_change_pass_valicode);
-        this.etNewPassword = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_newpass);
-        this.etNewPasswordOnceMore = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_newpass_confirm);
-        this.btnActionChangePassword = (Button) v.findViewById(R.id.btn_fgt_change_pass);
-    }
-
-    private void setListeners() {
-        imgCaptcha.setOnClickListener(this);
-        btnActionChangePassword.setOnClickListener(this);
-        etNewPasswordOnceMore.setOnEditorActionListener(new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            changePwdByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_change_pass:
-                changePwdByStatus();
-                break;
-            case R.id.img_fgt_change_pass_valicode:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void changePwdByStatus() {
-        if (!isFindPwd) {
-            popChangePassword();
-        } else {
-            showToast(R.string.toast_fgt_self_change_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void popChangePassword() {
-        if (checkChangePwdParams()) {
-            String pwd = etNewPassword.getText().toString().trim();
-            String pwdOnceMore = etNewPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isFindPwd = false;
-                        showToast(R.string.toast_user_login_act_change_password_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    }
-                });
-//                if (isNeedCaptcha) {
-//                    sessionBuild.setCaptcha(etCaptcha.getText().toString().trim());
-//                    sessionBuild.setCaptchaKey(captchaKey);
-//                }
-
-                ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-                UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-                userOperate.setOldpass(etOldPassword.getText().toString().trim());
-                userOperate.setNewpass(pwdOnceMore);
-                reqBuild.setUserOperate(userOperate);
-                HashMap<String, String> params = new HashMap<>();
-                String token = headSession.getToken();
-                params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.UserApi.CHANGE_PASS, params, reqBuild.build().toByteArray(), new OnChangePassword(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isFindPwd = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-    private boolean checkChangePwdParams() {
-        if (UITextUtils.isEditTextEmpty(etOldPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password_old, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etOldPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-
-        if (UITextUtils.isEditTextEmpty(etNewPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password_new, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etNewPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewPasswordOnceMore.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                captchaKey = captchaCode;
-                Glide.with(ChangeSelfPasswordFragment.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnChangePassword implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_change_password_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    AuthEvent event = new AuthEvent();
-                    if (arguments != null) {
-                        event.setSkipCode(ActAuth.JOB_CODE_SELF_LOGIN_BY_CHANGE_PASSWORD_CERTIFICATION);
-                    } else {
-                        event.setSkipCode(ActAuth.JOB_CODE_LOGIN);
-                    }
-                    EventBus.getDefault().post(event);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            isFindPwd = false;
-        }
-    }
-}

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

@@ -1,349 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtBindPhone</p>
- * @ <p>Description:绑定手机页面，逻辑基本没改，一如既往的没注释</p>
- * @ date:  2017/8/8 11:20
- * @ QQ:    315096953
- */
-
-public class FgtBindPhone extends BaseCompatFragment implements View.OnClickListener {
-
-    private MDLEditText etPhone;
-    private MDLEditText etCaptchaPhone;
-    private MDLEditText etCaptcha;
-    private Button btnAction;
-    private Button btnCaptchaPhone;
-    private ImageView imgCaptcha;
-    private LinearLayout llImageCaptcha;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isBindPhone = false;
-    private boolean canGetCaptchaPhone = true;
-
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private HashMap<String, String> headParams;
-    public final static int INTENT_RESULT=123;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_bind_phone);
-        initViewById(mContentView);
-        initUserToken();
-        setListeners();
-    }
-
-    private void initUserToken() {
-        headParams = new HashMap<>();
-        SessionBean outHeadSession = KFZSDDContentSession.getInstance().findOutHeadSession(mContext);
-        headParams.put(UrlBll.HeadParams.AUTHORIZATION, outHeadSession.getToken());
-    }
-
-    private void initViewById(View v) {
-        this.etPhone = (MDLEditText) v.findViewById(R.id.edt_fgt_bind_phone_phone);
-        this.etCaptchaPhone = (MDLEditText) v.findViewById(R.id.edt_fgt_bind_phone_valicode);
-        this.btnCaptchaPhone = (Button) v.findViewById(R.id.btn_fgt_bind_phone_valicode);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_bind_phone_captcha);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_bind_phone_captcha);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_bind_phone_captcha);
-        this.btnAction = (Button) v.findViewById(R.id.btn_fgt_bind_phone);
-    }
-
-    private void setListeners() {
-        btnCaptchaPhone.setOnClickListener(this);
-        btnAction.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.getvalicode));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-        };
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            bindPhoneByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etCaptchaPhone.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_bind_phone_valicode:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_bind_phone:
-                bindPhoneByStatus();
-                break;
-            case R.id.img_fgt_bind_phone_captcha:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    private void bindPhoneByStatus() {
-        if (!isBindPhone) {
-            postBindPhone();
-        } else {
-            showToast(R.string.toast_user_login_act_is_bind_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postBindPhone() {
-        if (checkBindPhoneParams()) {
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    isBindPhone = false;
-                }
-            });
-            UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-            userOperate.setMobile(etPhone.getText().toString().trim());
-            userOperate.setSeccode(etCaptchaPhone.getText().toString().trim());
-            userOperate.setStep(UrlBll.UserApi.BIND_PHONE_STEP_TWO);
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setUserOperate(userOperate);
-            APIRequest apiRequest = APIRequestInstance.putReq(TAG, UrlBll.UserApi.BIND_PHONE, reqBuild.build().toByteArray(), headParams, new OnBindPhoneStepTwo(), errorListener);
-            KFZSNetwork.addRequest(apiRequest);
-            isBindPhone = true;
-        }
-    }
-
-    private boolean checkBindPhoneParams() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPhone.getText().toString().trim().length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etCaptchaPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast(R.string.toast_warning_phone_captcha_image_code_size);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkPhoneInput()) {
-            UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-            userOperate.setMobile(etPhone.getText().toString().trim());
-            userOperate.setStep(UrlBll.UserApi.BIND_PHONE_STEP_ONE);
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setUserOperate(userOperate);
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.putReq(TAG, UrlBll.UserApi.BIND_PHONE, reqBuild.build().toByteArray(), headParams,
-                    new OnBindPhoneStepOne(), errorListener
-            );
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkPhoneInput() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (etPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                Glide.with(FgtBindPhone.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnBindPhoneStepOne implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-    private class OnBindPhoneStepTwo implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            isBindPhone = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    User user = DDProviderHelper.getInstance().getLastUser(mContext);
-                    user.setMMobile(etPhone.getText().toString());
-                    DDProviderHelper.getInstance().addOrUpdateUser(mContext,user);
-
-                    Current current = DDProviderHelper.getInstance().getLastUser(mContext);
-                    current.setMMobile(etPhone.getText().toString());
-                    DDProviderHelper.getInstance().updateLastUser(mContext,current);
-                    showToast(R.string.toast_user_login_act_bind_phone_success);
-                    getActivity().finish();
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(R.string.toast_user_login_act_bind_phone_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg());
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        getActivity().setResult(Activity.RESULT_OK);
-        super.onDetach();
-    }
-}
-

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

@@ -1,193 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Base64;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.EditTextActionUtils;
-import com.kfzs.android.view.widget.IEditTextActionJob;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtChangeNick</p>
- * @ <p>Description:修改昵称的页面，逻辑基本没改，一如既往的没注释</p>
- * @ date:  2017/8/8 10:31
- * @ QQ:    315096953
- */
-
-public class FgtChangeNick extends BaseCompatFragment implements View.OnClickListener {
-
-    private TextView tvOldName;
-    private MDLEditText etCaptcha;
-    private ImageView imgCaptcha;
-    private MDLEditText etNewNickName;
-    private Button btnAction;
-
-    private boolean isNeedCaptcha = false;
-    private boolean ChangeNickName = false;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_change_nick);
-        initViewById(mContentView);
-        initSelfInfo();
-        setListeners();
-    }
-
-    private void initSelfInfo() {
-        UserBean outHeadUser = DDProviderHelper.getInstance().getLastUserBean(mContext);
-        if (outHeadUser != null) {
-            String nickname = outHeadUser.getNickname();
-            if (!TextUtils.isEmpty(nickname)) {
-                tvOldName.setText(nickname);
-            }
-        }
-    }
-
-    private void initViewById(View v) {
-        this.tvOldName = (TextView) v.findViewById(R.id.txt_fgt_change_nick_old);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.edt_fgt_change_nick_valicode);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_change_nick_valicode);
-        this.etNewNickName = (MDLEditText) v.findViewById(R.id.edt_fgt_change_nick_new);
-        this.btnAction = (Button) v.findViewById(R.id.btn_fgt_change_nick);
-    }
-
-    protected void setListeners() {
-        btnAction.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        new EditTextActionUtils.Build()
-                .setEditText(etNewNickName)
-                .setEditTextActionJob(new IEditTextActionJob() {
-                    @Override
-                    public boolean onIMEAction(int keyCode, KeyEvent event) {
-                        changeNickNameByStatus();
-                        return true;
-                    }
-                })
-                .create()
-                .watchEnterAction();
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_change_nick:
-                changeNickNameByStatus();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void changeNickNameByStatus() {
-        if (!ChangeNickName) {
-            popChangeNickName();
-        } else {
-            showToast(R.string.toast_fgt_self_change_password);
-        }
-    }
-
-    private void popChangeNickName() {
-        if (checkChangeNickBNameParams()) {
-            String nickname = etNewNickName.getText().toString().trim();
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    ChangeNickName = false;
-                    showToast(R.string.toast_user_login_act_change_nickname_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                }
-            });
-
-            HashMap<String, String> params = new HashMap<>();
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken();
-            params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-            params.put("nickname", Base64.encodeToString(nickname.getBytes(), Base64.DEFAULT));
-            APIRequest apiRequest = APIRequestInstance.putReq(TAG, UrlBll.UserApi.CHANGE_NICKNAME, null, params, new OnChangeNickName(), errorListener);
-            KFZSNetwork.addRequest(apiRequest);
-            ChangeNickName = true;
-        }
-    }
-
-    private boolean checkChangeNickBNameParams() {
-        if (UITextUtils.isEditTextEmpty(etNewNickName)) {
-            showToast(R.string.tv_user_login_act_please_input_nick_name_new, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewNickName.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_nickname)) {
-                showToast(R.string.toast_warning_user_nickname_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private class OnChangeNickName implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_change_nickname_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    User user = DDProviderHelper.getInstance().getLastUser(mContext);
-                    user.setMNickName(etNewNickName.getText().toString());
-                    DDProviderHelper.getInstance().addOrUpdateUser(mContext,user);
-
-                    Current current = DDProviderHelper.getInstance().getLastUser(mContext);
-                    current.setMNickName(etNewNickName.getText().toString());
-                    DDProviderHelper.getInstance().updateLastUser(mContext,current);
-                    getActivity().finish();
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            ChangeNickName = false;
-        }
-    }
-}
-

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

@@ -1,246 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.provider.session.SessionBean;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import java.util.HashMap;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtChangePass</p>
- * @ <p>Description:修改密码的页面，逻辑基本没改，一如既往的没注释</p>
- * @ date:  2017/8/8 10:51
- * @ QQ:    315096953
- */
-
-public class FgtChangePass extends BaseCompatFragment implements View.OnClickListener {
-
-    private TextView nowNickName;
-    private MDLEditText etOldPassword;
-    private MDLEditText etNewPassword;
-    private MDLEditText etNewPasswordOnceMore;
-    private LinearLayout llImageCaptcha;
-    private MDLEditText etCaptcha;
-    private ImageView imgCaptcha;
-    private Button btnActionChangePassword;
-
-    private boolean isNeedCaptcha = false;
-    private boolean isFindPwd = false;
-    private SessionBean headSession;
-
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_change_pass);
-        initViewById(mContentView);
-        bindViewData();
-        setListeners();
-    }
-
-    private void bindViewData() {
-        headSession = KFZSDDContentSession.getInstance().findOutHeadSession(mContext);
-        UserBean headUser = DDProviderHelper.getInstance().getLastUserBean(mContext);
-        this.nowNickName.setText(String.valueOf(headUser.getNickname()));
-    }
-
-    private void initViewById(View v) {
-        this.nowNickName = (TextView) v.findViewById(R.id.txt_fgt_change_pass_nick);
-        this.etOldPassword = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_oldpass);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.lay_fgt_change_pass_valicode);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_valicode);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_change_pass_valicode);
-        this.etNewPassword = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_newpass);
-        this.etNewPasswordOnceMore = (MDLEditText) v.findViewById(R.id.edt_fgt_change_pass_newpass_confirm);
-        this.btnActionChangePassword = (Button) v.findViewById(R.id.btn_fgt_change_pass);
-    }
-
-    private void setListeners() {
-        imgCaptcha.setOnClickListener(this);
-        btnActionChangePassword.setOnClickListener(this);
-        etNewPasswordOnceMore.setOnEditorActionListener(new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            changePwdByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_change_pass:
-                changePwdByStatus();
-                break;
-            case R.id.img_fgt_change_pass_valicode:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void changePwdByStatus() {
-        if (!isFindPwd) {
-            popChangePassword();
-        } else {
-            showToast(R.string.toast_fgt_self_change_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void popChangePassword() {
-        if (checkChangePwdParams()) {
-            String pwd = etNewPassword.getText().toString().trim();
-            String pwdOnceMore = etNewPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isFindPwd = false;
-                        showToast(R.string.toast_user_login_act_change_password_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    }
-                });
-                ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-                UserOuterClass.UserOperate.Builder userOperate = UserOuterClass.UserOperate.newBuilder();
-                userOperate.setOldpass(etOldPassword.getText().toString().trim());
-                userOperate.setNewpass(pwdOnceMore);
-                reqBuild.setUserOperate(userOperate);
-                HashMap<String, String> params = new HashMap<>();
-                String token = headSession.getToken();
-                params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.UserApi.CHANGE_PASS, params, reqBuild.build().toByteArray(), new OnChangePassword(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isFindPwd = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-    private boolean checkChangePwdParams() {
-        if (UITextUtils.isEditTextEmpty(etOldPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password_old, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etOldPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-
-        if (UITextUtils.isEditTextEmpty(etNewPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password_new, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etNewPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etNewPasswordOnceMore.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                Glide.with(FgtChangePass.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnChangePassword implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_change_password_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-            }
-            isFindPwd = false;
-        }
-    }
-}

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

@@ -1,380 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.android.view.widget.MDLEditText;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.appstore.utils.sys.InputMethodUtils;
-import com.kfzs.duanduan.ActAuth;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.AuthEvent;
-import com.kfzs.duanduan.event.AuthEventUtils;
-import com.kfzs.duanduan.proto.ApiRequestOuterClass;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.Session;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseAuthCaptcha;
-import com.kfzs.duanduan.utils.net.UITextUtils;
-import com.kfzs.duanduan.view.OneMinuteCountDownTimer;
-
-import org.greenrobot.eventbus.EventBus;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtForgetPass</p>
- * @ <p>Description:AuthForgetPasswordFragment移植过来的代码，不背锅</p>
- * @ date:  2018/1/24 17:15
- * @ QQ:    315096953
- */
-public class FgtForgetPass extends BaseCompatFragment implements View.OnClickListener {
-
-    private MDLEditText etPhone;
-    private MDLEditText etCaptchaPhone;
-    private MDLEditText etCaptcha;
-    private MDLEditText etPassword;
-    private MDLEditText etPasswordOnceMore;
-    private Button btnActionForgetPassword;
-    private TextView btnCaptchaPhone;
-    private ImageView imgCaptcha;
-    private LinearLayout llImageCaptcha;
-
-    /**
-     * 是否需要验证码
-     */
-    private boolean isNeedCaptcha = false;
-    private boolean isFindPwd = false;
-    private boolean canGetCaptchaPhone = true;
-
-    private OneMinuteCountDownTimer countDownGetCaptchaPhone;
-    private String captchaKey = "";
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        isNeedCaptcha = false;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        if (countDownGetCaptchaPhone != null) {
-            countDownGetCaptchaPhone.cancel();
-        }
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_forget_password);
-        initViewById(mContentView);
-        setListeners();
-    }
-
-    private void initViewById(View v) {
-        this.etPhone = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_phone);
-        this.etCaptchaPhone = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_captcha_phone);
-        this.llImageCaptcha = (LinearLayout) v.findViewById(R.id.ll_fgt_forget_password_captcha);
-        this.imgCaptcha = (ImageView) v.findViewById(R.id.img_fgt_forget_password_captcha);
-        this.etCaptcha = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_captcha);
-        this.etPassword = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_password);
-        this.etPasswordOnceMore = (MDLEditText) v.findViewById(R.id.et_fgt_forget_password_password_once_more);
-        this.btnActionForgetPassword = (Button) v.findViewById(R.id.btn_fgt_forget_password_action);
-        this.btnCaptchaPhone = (TextView) v.findViewById(R.id.btn_fgt_forget_password_get_captcha_phone);
-    }
-
-    private void setListeners() {
-        btnCaptchaPhone.setOnClickListener(this);
-        btnActionForgetPassword.setOnClickListener(this);
-        imgCaptcha.setOnClickListener(this);
-        setEtOnEditorAction();
-        countDownGetCaptchaPhone = new OneMinuteCountDownTimer() {
-            @Override
-            public void onTimerRest() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int countTime) {
-                String text = countTime + " s";
-                btnCaptchaPhone.setText(text);
-            }
-
-            @Override
-            public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                btnCaptchaPhone.setText(getString(R.string.btn_fgt_user_get_captcha_phone));
-            }
-        };
-    }
-
-    private void setEtOnEditorAction() {
-        TextView.OnEditorActionListener onRegisterEditorActionListener = new EditText.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (null != event) {
-                    if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-                            || EditorInfo.IME_ACTION_GO == event.getAction()) {
-                        if (KeyEvent.ACTION_UP == event.getAction()) {
-                            InputMethodUtils.closeInputPan(getActivity());
-                            findPwdByStatus();
-                        }
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        etPasswordOnceMore.setOnEditorActionListener(onRegisterEditorActionListener);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.btn_fgt_forget_password_get_captcha_phone:
-                postGetCaptchaPhone();
-                break;
-            case R.id.btn_fgt_forget_password_action:
-                findPwdByStatus();
-                break;
-            case R.id.img_fgt_forget_password_captcha:
-                refreshCaptcha();
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    private void findPwdByStatus() {
-        if (!isFindPwd) {
-            postFindPwd();
-        } else {
-            showToast(R.string.toast_user_login_act_is_find_pwd, ToastBuilder.MIDDLE_TOAST_SINGLE);
-        }
-    }
-
-    private void postFindPwd() {
-        if (checkFindPwdParams()) {
-            String pwd = etPassword.getText().toString().trim();
-            String pwdOnceMore = etPasswordOnceMore.getText().toString().trim();
-            if (pwd.equals(pwdOnceMore)) {
-                Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                    @Override
-                    public void callErrorJob(boolean flag, int code, VolleyError error) {
-                        isFindPwd = false;
-                    }
-                });
-                Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-                sessionBuild.setStep(Session.FindPasswordStepCodes.CheckCaptchaAndReset_VALUE);
-                sessionBuild.setAccount(etPhone.getText().toString().trim());
-                if (isNeedCaptcha) {
-                    sessionBuild.setCaptcha(etCaptcha.getText().toString().trim());
-                    sessionBuild.setCaptchaKey(captchaKey);
-                }
-                sessionBuild.setSmsSeccode(etCaptchaPhone.getText().toString().trim());
-                sessionBuild.setNewPass(etPasswordOnceMore.getText().toString().trim());
-                Session.SessionIn sessionOut = sessionBuild.build();
-                ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-                reqBuild.setSessionIn(sessionOut);
-                APIRequest apiRequest = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.FIND_PWD,
-                        null, reqBuild.build().toByteArray(),
-                        new OnRegisterByPhone(), errorListener);
-                KFZSNetwork.addRequest(apiRequest);
-                isFindPwd = true;
-            } else {
-                showToast(R.string.toast_user_login_act_multi_password_difference, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            }
-        }
-    }
-
-    private boolean checkFindPwdParams() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPhone.getText().toString().trim().length() != getResources().getInteger(R.integer.size_phone_number)) {
-                showToast(R.string.toast_warning_phone_number_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etCaptchaPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_captcha_phone, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etCaptchaPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_captcha_image_code)) {
-                showToast(R.string.toast_warning_phone_captcha_image_code_size);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPassword)) {
-            showToast(R.string.tv_user_login_act_please_input_password, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPassword.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (UITextUtils.isEditTextEmpty(etPasswordOnceMore)) {
-            showToast(R.string.tv_user_login_act_please_input_password_once_more, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        } else {
-            if (etPasswordOnceMore.getText().toString().trim().length() < getResources().getInteger(R.integer.size_less_password)) {
-                showToast(R.string.toast_warning_password_less);
-                return false;
-            }
-        }
-        if (isNeedCaptcha) {
-            if (UITextUtils.isEditTextEmpty(etCaptcha)) {
-                showToast(R.string.tv_user_login_act_please_input_captcha, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                return false;
-            } else {
-                if (etCaptcha.getText().toString().trim().length() != getResources().getInteger(R.integer.size_captcha_image_code)) {
-                    showToast(R.string.toast_warning_captcha_image_code_size);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void postGetCaptchaPhone() {
-        if (!canGetCaptchaPhone) {
-            return;
-        }
-        countDownGetCaptchaPhone.reset();
-        if (checkPhoneInput()) {
-            Session.SessionIn.Builder sessionBuild = Session.SessionIn.newBuilder();
-            sessionBuild.setStep(Session.FindPasswordStepCodes.CheckPhone_VALUE);
-            sessionBuild.setAccount(etPhone.getText().toString().trim());
-            if (isNeedCaptcha) {
-                sessionBuild.setCaptcha(etCaptcha.getText().toString().trim());
-                sessionBuild.setCaptchaKey(captchaKey);
-            }
-            Session.SessionIn sessionOut = sessionBuild.build();
-            ApiRequestOuterClass.ApiRequest.Builder reqBuild = ApiRequestOuterClass.ApiRequest.newBuilder();
-            reqBuild.setSessionIn(sessionOut);
-            Response.ErrorListener errorListener = KFZSRestfulError.toast(KFZSApp.context, new KFZSRestfulErrorCallBack() {
-                @Override
-                public void callErrorJob(boolean flag, int code, VolleyError error) {
-                    canGetCaptchaPhone = true;
-                    countDownGetCaptchaPhone.reset();
-                }
-            });
-            APIRequest postReqCaptchaPhone = APIRequestInstance.postReq(TAG, UrlBll.AuthApi.FIND_PWD, null, reqBuild.build().toByteArray(),
-                    new OnCaptchaPhone(), errorListener
-            );
-            KFZSNetwork.addRequest(postReqCaptchaPhone);
-            canGetCaptchaPhone = false;
-            countDownGetCaptchaPhone.start();
-        }
-    }
-
-    private boolean checkPhoneInput() {
-        if (UITextUtils.isEditTextEmpty(etPhone)) {
-            showToast(R.string.tv_user_login_act_please_input_phone_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        if (etPhone.getText().toString().length() != getResources().getInteger(R.integer.size_phone_number)) {
-            showToast(R.string.toast_warning_phone_number_size, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            return false;
-        }
-        return true;
-    }
-
-    private void refreshCaptcha() {
-        isNeedCaptcha = true;
-        llImageCaptcha.setVisibility(View.VISIBLE);
-        Response.ErrorListener errorListener = KFZSRestfulError.job(new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                showToast(R.string.toast_user_login_act_login_get_captcha_error_place_retry, ToastBuilder.DEFAULT_TOAST_SINGLE);
-            }
-        });
-        APIRequest captchaRequest = APIRequestInstance.getReq(TAG, UrlBll.AuthApi.CAPTCHA, null, new ResponseAuthCaptcha() {
-            @Override
-            public void onAuthCaptchaURL(String captchaCode, String url) {
-                captchaKey = captchaCode;
-                Glide.with(FgtForgetPass.this)
-                        .load(url)
-                        .error(android.R.drawable.stat_notify_error)
-                        .into(imgCaptcha);
-            }
-
-            @Override
-            public void onErrorAuthCaptchaURL(int code, String msg) {
-                showToast(msg);
-            }
-        }, errorListener);
-        KFZSNetwork.addRequest(captchaRequest);
-    }
-
-    private class OnCaptchaPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_register_captcha_phone_success, ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    break;
-                case ApiResponseOuterClass.Codes.Capt_Err_VALUE:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    refreshCaptcha();
-                    countDownGetCaptchaPhone.reset();
-                    break;
-                default:
-                    showToast(apiResponse.getMsg(), ToastBuilder.MIDDLE_TOAST_SINGLE);
-                    countDownGetCaptchaPhone.reset();
-                    break;
-            }
-        }
-    }
-
-    private class OnRegisterByPhone implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            isFindPwd = false;
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    showToast(R.string.toast_user_login_act_find_pwd_success);
-                    AuthEvent event = new AuthEvent();
-                    event.setSkipCode(ActAuth.JOB_CODE_LOGIN);
-                    EventBus.getDefault().post(event);
-                    break;
-                case ApiResponseOuterClass.Codes.Bad_Request_VALUE:
-                    showToast(R.string.toast_user_login_act_find_pwd_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-                default:
-                    showToast(R.string.toast_user_login_act_find_pwd_error);
-                    showToast(apiResponse.getMsg());
-                    break;
-            }
-        }
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.widget.ListView;
-
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.ShelvesGiftOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.adp.AdpSearchGift;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtGift</p>
- * @ <p>Description: 商品详情页的礼包界面</p>
- * @ date:  2017/6/20 11:53
- * @ QQ:    315096953
- */
-
-public class FgtGift extends BaseCompatFragment {
-
-    private ListView mListView;
-    private AdpSearchGift mAdpSearchGift;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_gift);
-        mListView = (ListView) mContentView.findViewById(R.id.list_fgt_gift);
-        mListView.setEmptyView(mContentView.findViewById(R.id.download_mgr_empty_view));
-        mAdpSearchGift = new AdpSearchGift(getActivity());
-        mListView.setAdapter(mAdpSearchGift);
-        loadData();
-    }
-
-    /**
-     * 载入数据
-     */
-    private void loadData() {
-        String gameId;
-        gameId = getActivity().getIntent().getStringExtra(KFIntentKeys.EXTRA_GAME_ID);
-        HashMap<String, String> params = null;
-        if (KFZSDDContentSession.getInstance().findOutHeadSession(mContext) != null
-                && !TextUtils.isEmpty(KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken())) {
-            params = new HashMap<>();
-            String token = KFZSDDContentSession.getInstance().findOutHeadSession(mContext).getToken();
-            params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        }
-
-        String reqUrl = UrlBll.Gift.GAME_GIFT_LIST + "game_id=" + gameId;
-        APIRequest giftReq = APIRequestInstance.getReq(TAG, reqUrl, params, new ResponseNetworkTask() {
-
-            @Override
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                List<ShelvesGiftOuterClass.ShelvesGift> giftsList = apiResponse.getShelvesGiftsList();
-                mAdpSearchGift.clear();
-                mAdpSearchGift.addAll(giftsList);
-                mAdpSearchGift.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-
-            }
-
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-
-        KFZSNetwork.addRequest(giftReq);
-    }
-}

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

@@ -1,137 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.webkit.WebSettings;
-
-import com.kfzs.android.view.widget.SafeWebView;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.HashMap;
-
-import mdl.sinlov.android.log.ALog;
-
-
-/**
- * 社区
- * Created by HooRang on 2017/2/15.
- */
-public class FgtMainCommunity extends BaseCompatFragment {
-
-    private SafeWebView wParentView;
-    private HashMap<String, String> additionalHttpHeaders;
-    private WebSettings webSettings;
-    public static String communityURL;
-    private String tokenCatch = "";
-    private static final long CLOSE_TIME = 2000;
-    private long canNotGoBackTime = 0;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
-        communityURL = communityURL == null ? getString(R.string.str_public_html_community) : communityURL;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        webSettings.setJavaScriptEnabled(true);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        webSettings.setJavaScriptEnabled(false);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if(wParentView!=null) {
-            wParentView.setVisibility(View.GONE);
-            wParentView.removeAllViews();
-            wParentView.destroy();
-        }
-        System.gc();
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fgt_main_community);
-        wParentView = (SafeWebView) mContentView.findViewById(R.id.web_fgt_main_community);
-        wParentView.setFocusable(true);
-        wParentView.setFocusableInTouchMode(true);
-        wParentView.autoSettingWebViewDefaultByWideViewPort(getActivity(), true);
-        webSettings = wParentView.getSettings();
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        webSettings.setSaveFormData(true);
-        webSettings.setDomStorageEnabled(true);
-        webSettings.setSupportZoom(false);
-        additionalHttpHeaders = new HashMap<>();
-        additionalHttpHeaders.put(UrlBll.HeadParams.ANDROID_THEME, UrlBll.HeadValues.THEME_NO_TITLE);
-        loadCommunityFilterToken();
-
-    }
-
-    private void loadCommunityFilterToken() {
-        String communityUrl;
-        KFZSDDContentSession instance = KFZSDDContentSession.getInstance();
-        if (instance.isHasHeadSession(mContext)) {
-            String token = instance.findOutHeadSession(mContext).getToken();
-            if (!this.tokenCatch.equals(token)) {
-                this.tokenCatch = token;
-                communityUrl = communityURL + "?token=" + token;
-                wParentView.loadUrl(communityUrl);
-            } else {
-                String url = wParentView.getUrl();
-                ALog.d("Web URL: " + url);
-            }
-        } else {
-            communityUrl = communityURL;
-            wParentView.loadUrl(communityUrl);
-        }
-
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent bigEvent) {
-        switch (bigEvent.getEventTypes()) {
-            case WEB_BACK:
-                if (wParentView.canGoBack()) {
-                    wParentView.goBack();
-                } else {
-                    long now = System.currentTimeMillis();
-                    if (now - canNotGoBackTime < CLOSE_TIME) {
-                        KFZSApp.getInstance().quit();
-                    } else {
-                        canNotGoBackTime = now;
-//                        showToast(R.string.toast_double_click_exit_app);
-                    }
-                }
-                break;
-            case WEB_TRY_LOGIN_BY_TOKEN:
-                loadCommunityFilterToken();
-                break;
-            case WEB_GO_BBS://这里无前端支持，暂时写死。
-                wParentView.loadUrl(getString(R.string.str_public_html_community_bbs));
-                break;
-        }
-    }
-
-}

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

@@ -16,13 +16,11 @@ import com.kfzs.duanduan.adp.AdpMainPageRecy;
 import com.kfzs.duanduan.bean.BaseMsg;
 import com.kfzs.duanduan.bean.CateGameList;
 import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bean.Game;
 import com.kfzs.duanduan.bean.GuessYouLike;
 import com.kfzs.duanduan.bean.NewGameRecommend;
 import com.kfzs.duanduan.bean.RecyleObj;
 import com.kfzs.duanduan.bean.RecyleType;
 import com.kfzs.duanduan.bean.SpecialRecommend;
-import com.kfzs.duanduan.bll.CouponBll;
 import com.kfzs.duanduan.bll.GameListBll;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.event.EventDownloadHandler;
@@ -37,7 +35,6 @@ import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.List;
 
 /**
  * @ Created by Dlg
@@ -138,19 +135,6 @@ public class FgtMainGame extends BaseCompatFragment {
         }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
         KFZSNetwork.addRequest(bannerRequest);
 
-        //加载优惠券
-        new CouponBll().getCouponListMainPage(mContext, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-
-
-            @Override
-            public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                if (apiResponse.getVouchersList() == null || apiResponse.getVouchersList().size() < 1) {
-                    return;
-                }
-                mAdpMainPageRecy.add(RecyleObj.make(RecyleType.COUPON, apiResponse.getVouchersList()), POS_COUPON);
-                mAdpMainPageRecy.notifyItemChanged(POS_COUPON);
-            }
-        });
         GameListBll gameListBll = new GameListBll();
         //加载新游推荐列表
         gameListBll.getNewGameRecommendList(null, 10, new Response.Listener<BaseMsg>() {
@@ -220,21 +204,6 @@ public class FgtMainGame extends BaseCompatFragment {
             }
         });
 
-        //加载新游预约推荐列表
-        gameListBll.getNewGameBook(new Response.Listener<BaseMsg>() {
-            @Override
-            public void onResponse(BaseMsg baseMsg) {
-                List<Game> gameList = baseMsg.getDatas(Game.class);
-                if (gameList == null || gameList.size() < 0) {
-                    return;
-                }
-                mAdpMainPageRecy.add(RecyleObj.make(RecyleType.NEW_GAME_BOOK, gameList),
-                        POS_NEW_GAME_BANNER);
-                //TODO 暂时原因不明，如果局部加载，始终会第一次加载不出来。。。
-//                mAdpMainPageRecy.notifyItemChanged(POS_NEW_GAME_BANNER);
-                mAdpMainPageRecy.notifyDataSetChanged();
-            }
-        });
     }
 
 

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

@@ -1,247 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.duanduan.ActFeedback;
-import com.kfzs.duanduan.ActPersonPage;
-import com.kfzs.duanduan.ActSimple;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.mine.GiftpackListActivity;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-/**
- * 个人中心
- *
- * @author kemllor
- * @date 2017/7/11   13:26
- **/
-
-public class FgtMainMine extends BaseCompatFragment implements View.OnClickListener {
-
-    private boolean mIsLogin = false;//是否已经是登录状态
-    private TextView mTxtNick;//用户昵称
-    private TextView mTxtTips;//登录前后的提示文本
-
-    private ImageView mImgHead;
-    private View mViewDot;//预约游戏的红点
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        checkLoginAndUI();
-    }
-
-    /**
-     * 检查用户是否登录和处理相就UI状态
-     */
-    private void checkLoginAndUI() {
-        Current lastUser = DDProviderHelper.getInstance().getLastUser(getContext());
-        mIsLogin = !(lastUser == null || TextUtils.isEmpty(lastUser.getMUserId()));
-        mTxtNick.setText(mIsLogin ? lastUser.getMNickName() : "请登录");
-        if (mIsLogin) {
-            Glide.with(this)
-                    .load(lastUser.getMAvatar())
-                    .transform(new KFGlideRoundTransform(getActivity(), 5))
-                    .error(R.drawable.ic_user_head_default)
-                    .into(mImgHead);
-        } else {//退出登录后，头像没变的问题处理
-            mImgHead.setImageResource(R.drawable.ic_user_head_default);
-        }
-
-        //UI显示状态
-        int showStatus = mIsLogin ? View.VISIBLE : View.GONE;
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_gamenum)
-                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_myorder)
-                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_seller)
-                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_wallet)
-                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_coin)
-                .setVisibility(showStatus);
-//        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_mygift)
-//                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_bookgame)
-                .setVisibility(showStatus);
-//        ViewFindUtils.find(mContentView, R.id.lay_fgt_main_mine_sellaccount)
-//                .setVisibility(showStatus);
-
-        ViewFindUtils.find(mContentView, R.id.top_four_view_layout)
-                .setVisibility(showStatus);
-        //淘着玩
-//        ViewFindUtils.find(mContentView, R.id.lay_fgt_taozhewan_mine_about)
-//                .setVisibility(showStatus);
-        ViewFindUtils.find(mContentView, R.id.interval_gray_view)
-                .setVisibility(showStatus);
-//        ViewFindUtils.find(mContentView, R.id.lay_fgt_hoggerel_mine_about)
-//                .setVisibility(showStatus);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_main_mine);
-        initViewById(mContentView);
-        mViewDot = mContentView.findViewById(R.id.view_fgt_main_mine_dot);
-        EventBus.getDefault().register(this);
-    }
-
-    private void initViewById(View view) {
-        mImgHead = ViewFindUtils.find(view, R.id.img_fgt_main_mine_head);
-        mTxtNick = ViewFindUtils.find(view, R.id.txt_fgt_main_mine_nick);
-        mTxtTips = ViewFindUtils.find(view, R.id.txt_fgt_main_mine_tips);
-
-
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_head).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_gamenum).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_bookgame).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_myorder).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_seller).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_sellaccount).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_wallet).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_coin).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_mygift).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_about).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_main_mine_advice).setOnClickListener(this);
-
-        ViewFindUtils.find(view, R.id.giftpack_linearlayout).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.welfare_linearlayout).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.integral_linearlayout).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.kims_linearlayout).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_taozhewan_mine_about).setOnClickListener(this);
-        ViewFindUtils.find(view, R.id.lay_fgt_hoggerel_mine_about).setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        Intent intent;
-        FragmentActivity activity = getActivity();
-        switch (v.getId()) {
-            case R.id.lay_fgt_main_mine_head:
-                SkipUtils.getInstance().goUserCenter(getActivity());
-//                skip2ChangeAccount();
-                break;
-            case R.id.lay_fgt_main_mine_gamenum:
-                // 我的游戏号
-                goRn("我的游戏");
-                break;
-            case R.id.lay_fgt_main_mine_bookgame:
-                // 已预约游戏,隐藏小红点
-                mViewDot.setVisibility(View.GONE);
-                filterLoginOrShowSelfCenter();
-                break;
-            case R.id.lay_fgt_main_mine_myorder:
-                // 我的订单
-                goRn("我的订单");
-                break;
-            case R.id.lay_fgt_main_mine_seller:
-                // 卖家中心
-                goRn("卖家中心");
-                break;
-            case R.id.lay_fgt_main_mine_sellaccount:
-                // 出售游戏帐号
-                goRn("出售游戏号");
-                break;
-            case R.id.lay_fgt_main_mine_wallet:
-                // 我的钱包
-                goRn("我的钱包");
-                break;
-            case R.id.lay_fgt_main_mine_coin:
-                // 我的玩币
-                goRn("我的玩币");
-                break;
-            case R.id.lay_fgt_main_mine_mygift:
-                // 我的奖励
-                goRn("我的奖励");
-                break;
-            case R.id.lay_fgt_main_mine_about:
-                G.showToast("该功能正在开发中");
-                break;
-            case R.id.lay_fgt_main_mine_advice:
-                // 意见反馈
-                intent = new Intent(getActivity(), ActFeedback.class);
-                startActivity(intent);
-                break;
-            case R.id.giftpack_linearlayout:
-                // 礼包
-//                goRn("礼包");
-                intent = new Intent(getActivity(), GiftpackListActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.welfare_linearlayout:
-                // 福利券
-                SkipUtils.getInstance().goActSimple(mContext, ActSimple.ACTION.COUPON_VIP);
-                break;
-            case R.id.integral_linearlayout:
-                // 玩币
-                goRn("我的玩币");
-                break;
-            case R.id.kims_linearlayout:
-                // 代金券
-                SkipUtils.getInstance().goWebView(getActivity(),  BuildConfig.JFSC_DOMAIN,
-                        "", true);//
-
-//                intent = new Intent(getActivity(), VoucherListActivity.class);
-//                startActivity(intent);
-                break;
-            case R.id.lay_fgt_taozhewan_mine_about:
-                // 淘着玩
-                goRn("淘着玩");
-
-                break;
-            case R.id.lay_fgt_hoggerel_mine_about:
-                // 小绵羊
-//                SkipUtils.getInstance().goSheep(getActivity());//
-                break;
-        }
-    }
-
-    private void goRn(String msg) {
-        G.showToast("该功能正在建设中");
-    }
-
-
-    private void filterLoginOrShowSelfCenter() {
-        if (mIsLogin) {
-            SkipUtils.getInstance().goActSimple(getActivity(), ActSimple.ACTION.BOOKED_GAME);
-        } else {
-            Intent intent = new Intent(getActivity(), ActPersonPage.class);
-            startActivity(intent);
-        }
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case TIPS_BOOK_ICON:
-                mViewDot.setVisibility(View.VISIBLE);
-                break;
-        }
-    }
-
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-}

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

@@ -1,13 +1,155 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
+import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.presenter.SmallSheepContract;
+import com.sheep.gamegroup.presenter.SmallSheepPresenter;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.MyListview;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import javax.inject.Inject;
 
-public class FgtSmallSheep extends BaseCompatFragment {
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepContract.View {
 
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.homepage_act_layout);
+        initView();
+        initListener();
+        initData();
+    }
+
+    @BindView(R.id.icon_img_iv)
+    CircleImageView iconImgIv;
+    @BindView(R.id.name_tv)
+    TextView nameTv;
+    @BindView(R.id.sheep_num_tv)
+    TextView sheepNumTv;
+    @BindView(R.id.user_layout)
+    RelativeLayout userLayout;
+    @BindView(R.id.withdrawal)
+    TextView withdrawal;
+    @BindView(R.id.my_price)
+    TextView myPrice;
+    @BindView(R.id.my_all_price)
+    TextView myAllPrice;
+    @BindView(R.id.couple_red_packets_iv)
+    ImageView coupleRedPacketsIv;
+    @BindView(R.id.try_play_layout)
+    LinearLayout tryPlayLayout;
+    @BindView(R.id.invitation_layout)
+    LinearLayout invitationLayout;
+    @BindView(R.id.lying_layout)
+    LinearLayout lyingLayout;
+    @BindView(R.id.listview)
+    MyListview listview;
+
+    @Inject
+    SmallSheepPresenter pagePresenter;
+    private Activity activity;
+    private UserEntity userEntity;
+
+
+    Handler mHanderl = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            myPrice.setText(userEntity.getBalance()+" 元");
+            myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
+            nameTv.setText(userEntity.getNickname()+"");//绵羊号：123456789
+            sheepNumTv.setText("绵羊号："+userEntity.getInvitation_code());
+        }
+    };
+
+    public void initView() {
+        activity = getActivity();
+        ButterKnife.bind(this,mContentView);
+        DaggerSmallSheepComponent.builder()
+                .netComponent(SheepApp.get(getContext()).getNetComponent())
+                .smallSheepModule(new SmallSheepModule(this))
+                .build()
+                .inject(this);
+    }
+
+    public void initListener() {
+
+    }
+
+    public void initData() {
+        pagePresenter.getUserInfo();
+
+    }
+
+    @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.icon_img_iv:
+                break;
+            case R.id.user_layout:
+                Jump2View.getInstance().goPersonnalCenterView(activity, null);
+                break;
+            case R.id.withdrawal:
+                Jump2View.getInstance().goWithdrawal(activity, null);
+                break;
+            case R.id.couple_red_packets_iv:
+                break;
+            case R.id.try_play_layout:
+                Jump2View.getInstance().goTryplayView(activity, null);
+                break;
+            case R.id.invitation_layout:
+                break;
+            case R.id.lying_layout:
+                break;
+        }
+    }
+
+    @Override
+    public void updateData2View(Object o) {
+        if(o == null){
+            return;
+        }
+        BaseMessage baseMessage = (BaseMessage) o;
+        userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+        try {
+            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+//            userEntity = MyDbManager.getInstance().dbFindUser();
+            Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        mHanderl.sendEmptyMessage(0);
+
+    }
+
+    @Override
+    public void failData2View(Object o) {
+        G.showToast("网络错误");
+
     }
 }

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

@@ -1,42 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-/**
- * Created by Administrator on 2018/1/17.
- */
-
-public class FgtTask extends BaseCompatFragment {
-
-    private static int  count=0;
-    private RelativeLayout rl;
-
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_task);
-        rl=(RelativeLayout)mContentView.findViewById(R.id.rl);
-        rl.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-
-            }
-        });
-
-
-
-    }
-
-
-
-
-
-
-
-}

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

@@ -1,86 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ListView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.AdpVipCoupon;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.bll.CouponBll;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
-import com.kfzs.duanduan.view.ListMore;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  FgtVipCoupon</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/18 22:35
- * @ QQ:    315096953
- */
-
-public class FgtVipCoupon extends BaseCompatFragment {
-
-    private ListMore mListMore;
-
-    private AdpVipCoupon mAdpVipCoupon;
-
-    private int mCurrentPage = 1;//当前页为0
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_vip_coupon);
-
-
-        mListMore = mContentView.findViewById(R.id.list_fgt_vip_coupon);
-        mAdpVipCoupon = new AdpVipCoupon(getActivity());
-        mListMore.getmListView().setAdapter(mAdpVipCoupon);
-        mListMore.getmListView().setDividerHeight(0);
-        mListMore.setmOnListMoreListener(new ListMore.OnListMoreListener() {
-            @Override
-            public void onRefresh() {
-                loadDate(false);
-            }
-
-            @Override
-            public void onLoadMore() {
-                loadDate(true);
-            }
-        });
-        loadDate(false);
-    }
-
-
-    private void loadDate(final boolean isLoadMore) {
-        mListMore.setRefreshing(true);
-        mCurrentPage = isLoadMore ? mCurrentPage + 1 : 1;
-        new CouponBll().getReceiveCoupon(getActivity(), mCurrentPage,
-                10, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
-                    @Override
-                    public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                        mListMore.setRefreshing(false);
-                        if (apiResponse.getCodeValue() == ApiResponseOuterClass.Codes.Success_VALUE) {
-                            if (!isLoadMore) {
-                                mAdpVipCoupon.clear();
-                            }
-                            mAdpVipCoupon.addALL(apiResponse.getCouponCodesList());
-                            mAdpVipCoupon.notifyDataSetChanged();
-                        } else {
-                            G.showToast("福利券查询失败！");
-                        }
-                    }
-                }, new Response.ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError volleyError) {
-                        G.showToast("网络加载失败！");
-                        mListMore.setRefreshing(false);
-                    }
-                });
-    }
-
-}

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

@@ -1,524 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.app.ProgressDialog;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.android.volleyplus.Response;
-import com.android.volleyplus.VolleyError;
-import com.bumptech.glide.Glide;
-import com.kf.utils.ToastBuilder;
-import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
-import com.kfzs.appstore.utils.adapter.recyclerview.OnItemClickListener;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.appstore.utils.restful.KFZSRestfulError;
-import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.ActAccountManage;
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.ManagementAccountAdapter;
-import com.kfzs.duanduan.bll.AppBaseBll;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.data.graph.provider.current.Current;
-import com.kfzs.duanduan.data.graph.provider.player.User;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.KFZSDDContentSession;
-import com.kfzs.duanduan.datashare.YogConfig;
-import com.kfzs.duanduan.event.AccountManagementEvent;
-import com.kfzs.duanduan.event.AccountManagementEventUtils;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.UserOuterClass;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import mdl.sinlov.android.log.ALog;
-
-/**
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class ManagementAccountFragment extends BaseCompatFragment {
-    public static final int TYPE_ACCOUNT_DEFAULT = 1;
-    public static final int TYPE_ACCOUNT_NEW_ACCOUNT_CHECK = 2;
-    public static final int TYPE_ACCOUNT_NEW_ACCOUNT_SUCCESS = 3;
-    public static final int TYPE_ACCOUNT_REPLACE_HEAD = 4;
-    public static final int TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION = 5;
-    public static final int TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK = 6;
-    public static final int TYPE_ACCOUNT_REMOVE_ONE = 7;
-    public static final int TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD_CHECK = 8;
-    public static final int TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD = 9;
-    public static final String KEY_ACCOUNT_TYPE = "fgt:management:account:type";
-    public static final String KEY_ACCOUNT_NEW_UID = "fgt:management:account:new:uid";
-    public static final String KEY_ACCOUNT_REMOVE_UID = "fgt:management:account:remove:uid";
-    public static final String EXTRAS_NEED_GET_TOKEN = "extras:act:game:certification:need:get:token:string";
-    private RecyclerView recyclerView;
-    private Button accountActionNewOne;
-    private ProgressDialog progressDialog;
-    private ImageView imgAccountNow;
-    private TextView tvAccountNow;
-    private TextView tvGameNow;
-    private LinearLayout llAccountData;
-    private LinearLayout llDataShow;
-    private ImageView imgDataShow;
-    private TextView tvDataShow;
-    private RelativeLayout rlAccountNow;
-
-    private List<User> dataList;
-    private ManagementAccountAdapter adapter;
-    private boolean isNewAccount = false;
-    private int accountType;
-    private int newUid;
-    private int removeUid;
-    private KFZSDDContentSession contentSession;
-    private boolean isCertification = false;
-    private Bundle mArguments;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mArguments = getArguments();
-        if (mArguments != null) {
-            accountType = mArguments.getInt(KEY_ACCOUNT_TYPE, TYPE_ACCOUNT_DEFAULT);
-            newUid = mArguments.getInt(KEY_ACCOUNT_NEW_UID, 0);
-            removeUid = mArguments.getInt(KEY_ACCOUNT_REMOVE_UID, 0);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        isNewAccount = false;
-        AccountManagementEventUtils.getInstance().changeUserTitleByEvent(R.string.title_management_activity_account);
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        KFZSNetwork.stopByTag(TAG);
-    }
-
-    private void filterAccountData() {
-        ALog.w("accountType: " + accountType);
-        switch (accountType) {
-            case TYPE_ACCOUNT_NEW_ACCOUNT_SUCCESS:
-                AccountManagementEventUtils.getInstance().finishSelfBySuccess("切换成功");
-                break;
-            case TYPE_ACCOUNT_NEW_ACCOUNT_CHECK:
-                popHeadSessionUserGraphInfo(false);
-                break;
-            case TYPE_ACCOUNT_DEFAULT:
-                refreshAccountList();
-                break;
-            case TYPE_ACCOUNT_REPLACE_HEAD:
-                replaceHeadSessionAndUserGraph(false);
-                break;
-            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION:
-                isCertification = true;
-                refreshAccountList();
-                break;
-            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK:
-                isCertification = true;
-                changeAcountForGame();
-                //                updateHeadSessionAndUserGraph();
-                break;
-            case TYPE_ACCOUNT_REMOVE_ONE:
-                if (removeUid != 0) {
-                    DDProviderHelper.getInstance().deleteUser(mContext, String.valueOf(removeUid));
-                    //                    UserGraphUtils.removeByUid(mContext, removeUid);
-                    refreshAccountList();
-                }
-                break;
-            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD_CHECK:
-                isCertification = true;
-                updateHeadSessionAndUserGraph();
-                break;
-            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD:
-                isCertification = true;
-                updateHeadSessionAndUserGraph();
-                break;
-            default:
-                refreshAccountList();
-                break;
-        }
-    }
-
-    //切换游戏帐号；
-    private void changeAcountForGame() {
-        if (newUid != 0) {
-            String token = getToken(newUid);
-            if (token != null) {
-                popHeadSessionUserGraphInfo(isCertification);
-            } else {
-                showToast("切换的用户信息已经过期,请重新登录");
-                AccountManagementEvent event = new AccountManagementEvent();
-                if (isCertification) {
-                    event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT_CERTIFICATION);
-                } else {
-                    event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT);
-                }
-                EventBus.getDefault().post(event);
-                isNewAccount = true;
-            }
-        } else {
-            AccountManagementEventUtils.getInstance().finishSelfByError("切换 uid 为空");
-        }
-    }
-
-    private String getToken(int uid) {
-        User user = DDProviderHelper.getInstance().getUser(mContext, uid + "");
-        if (user != null)
-            return user.getMToken();
-        return null;
-    }
-
-
-    private void updateHeadSessionAndUserGraph() {
-        replaceHeadSessionAndUserGraph(false);
-    }
-
-    private void replaceHeadSessionAndUserGraph(boolean isCertification) {
-        if (newUid != 0) {
-            popHeadSessionUserGraphInfo(isCertification);
-        } else {
-            AccountManagementEventUtils.getInstance().finishSelfByError("切换 uid 为空");
-        }
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fgt_management_account);
-        progressDialog = new ProgressDialog(getContext());
-        progressDialog.setCancelable(false);
-        progressDialog.setCanceledOnTouchOutside(false);
-        initViewById(mContentView);
-        initUserData();
-        initListener();
-        filterAccountData();
-    }
-
-    private void initListener() {
-        OnItemClickListener onItemClickListener = new OnItemClickListener() {
-            @Override
-            public void onItemClick(ViewGroup parent, View view, Object object, int position) {
-                //                User changeAccountBean = dataList.get(position);
-                User changeAccountBean = (User) object;
-                int uid = Integer.parseInt(changeAccountBean.getMUserId());
-                int id = view.getId();
-                if (id == R.id.item_change_account_layout_content) {
-                    ALog.w("accountType setOnItemClickListener: " + accountType + " |uid: " + uid);
-                    switch (accountType) {
-                        case TYPE_ACCOUNT_DEFAULT:
-                            AccountManagementEventUtils.getInstance().newAccountByEvent(uid, changeAccountBean.getMNickName(), ActAccountManage.JOB_REPLACE_HEAD_ACCOUNT);
-                            break;
-                        case TYPE_ACCOUNT_REPLACE_HEAD:
-                            AccountManagementEventUtils.getInstance().newAccountByEvent(uid, changeAccountBean.getMNickName(), ActAccountManage.JOB_REPLACE_HEAD_ACCOUNT);
-                            break;
-                        case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION:
-                            AccountManagementEventUtils.getInstance().newAccountByEvent(changeAccountBean.getMToken(), uid, changeAccountBean.getMNickName(), changeAccountBean.getMOpenId(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK);
-                            break;
-                        case TYPE_ACCOUNT_NEW_ACCOUNT_CHECK:
-                            AccountManagementEventUtils.getInstance().newAccountByEvent(uid, changeAccountBean.getMNickName(), ActAccountManage.JOB_CHANGE_ACCOUNT_BY_CHECK);
-                            break;
-                        case TYPE_ACCOUNT_REMOVE_ONE:
-                            // if remove one it will check old session
-                            AccountManagementEventUtils.getInstance().newAccountByEvent(uid, changeAccountBean.getMNickName(), ActAccountManage.JOB_REPLACE_HEAD_ACCOUNT);
-                            break;
-                        default:
-                            AccountManagementEventUtils.getInstance().finishSelfByError("行为输入异常,退出管理页面");
-                            break;
-                    }
-                }
-            }
-
-            @Override
-            public boolean onItemLongClick(ViewGroup parent, View view, Object o, int position) {
-                return false;
-            }
-        };
-        adapter.setOnItemClickListener(onItemClickListener);
-        accountActionNewOne.setOnClickListener(new NewAccountListener());
-    }
-
-    private void initViewById(View v) {
-        this.llAccountData = (LinearLayout) v.findViewById(R.id.rl_change_account_data);
-        this.llDataShow = (LinearLayout) v.findViewById(R.id.ll_fgt_management_account_network_data);
-        this.imgDataShow = (ImageView) v.findViewById(R.id.img_fgt_management_account_network_data_show);
-        this.rlAccountNow = (RelativeLayout) v.findViewById(R.id.rl_item_change_account_now);
-        this.tvDataShow = (TextView) v.findViewById(R.id.tv_fgt_management_account_network_data_show);
-        this.imgAccountNow = (ImageView) v.findViewById(R.id.img_item_change_account_icon_now);
-        this.tvAccountNow = (TextView) v.findViewById(R.id.tv_item_change_account_nike_name_now);
-        this.tvGameNow = (TextView) v.findViewById(R.id.tv_item_change_account_nike_name_hint_now);
-        this.recyclerView = (RecyclerView) v.findViewById(R.id.rv_fgt_management_account_list);
-        this.accountActionNewOne = (Button) v.findViewById(R.id.btn_fgt_management_account_action_new_one);
-        recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
-        DividerItemDecoration decor = new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL);
-        decor.setSize(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_size));
-        decor.setColor(getResources().getColor(R.color.theme_app_divider_color));
-        decor.setPaddingStart(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_start));
-        decor.setPaddingEnd(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_end));
-        recyclerView.addItemDecoration(decor);
-    }
-
-    private void initUserData() {
-        contentSession = KFZSDDContentSession.getInstance();
-        dataList = new ArrayList<>();
-        adapter = new ManagementAccountAdapter(getContext(), dataList);
-        recyclerView.setAdapter(adapter);
-    }
-
-    private void refreshLastUser(User user) {
-        if (user == null) {
-            return;
-        }
-        llAccountData.setVisibility(View.VISIBLE);
-        String avatarNowURL = user.getMAvatar();
-        Glide.with(this).load(avatarNowURL).error(R.drawable.ic_user_head_default).into(imgAccountNow);
-        if (TextUtils.isEmpty(user.getMNickName())) {
-            tvAccountNow.setText(user.getMUserName());
-        } else {
-            tvAccountNow.setText(user.getMNickName());
-        }
-        if (isCertification)
-            tvGameNow.setText(getString(R.string.tv_item_change_game_nike_name_hint_now));
-        else
-            tvGameNow.setText(getString(R.string.tv_item_change_account_nike_name_hint_now));
-
-    }
-
-
-    private void refreshAccountList() {
-        String lastOpenId = null;
-        User lastPlayer = null;
-        if (isCertification || ((ActAccountManage) getActivity()).isCertification) {
-            Cursor lastOne = DDProviderHelper.getInstance().getGameLastPalyer(mContext, KFZSApp.getInstance().GameCode);
-            if (lastOne != null && lastOne.getCount() > 0) {
-                lastOne.moveToFirst();
-                lastOpenId = lastOne.getString(lastOne.getColumnIndex(YogConfig.Game.LASTUSERID));
-                if (TextUtils.isEmpty(lastOpenId)) {
-                    Current lastUser = DDProviderHelper.getInstance().getLastUser(mContext);
-                    if (lastUser != null) {
-                        lastPlayer = new User(lastUser);
-                        lastOpenId = lastPlayer.getMOpenId();
-                    }
-                }
-            }
-            if (lastOne != null) {
-                lastOne.close();
-            }
-        } else {
-            Current lastUser = DDProviderHelper.getInstance().getLastUser(mContext);
-            if (lastUser != null) {
-                lastPlayer = new User(lastUser);
-                lastOpenId = lastPlayer.getMOpenId();
-            }
-        }
-        List<User> userList = DDProviderHelper.getInstance().getUserList(mContext);
-        if (userList != null && userList.size() > 0) {
-
-            Iterator<User> iterator = userList.iterator();
-            while (iterator.hasNext()) {
-                User next = iterator.next();
-                if (TextUtils.equals(next.getMOpenId(), lastOpenId)) {
-                    lastPlayer = next;
-                    iterator.remove();
-                }
-            }
-            adapter.clear();
-            adapter.addAllUser(userList);
-            adapter.notifyDataSetChanged();
-        }
-        refreshLastUser(lastPlayer);
-
-       /* llAccountData.setVisibility(View.VISIBLE);
-        dataList.clear();
-        List<User> userBeans = DDProviderHelper.getInstance().getUserList(mContext);
-        if (userBeans.isEmpty()) {
-            popHeadSessionUserGraphInfo(false);
-            return;
-        }
-        User userBeanNow = userBeans.get(0);
-        String avatarNowURL = userBeanNow.getMAvatar();
-        Glide.with(this).load(avatarNowURL).error(R.drawable.ic_user_head_default).into(imgAccountNow);
-        tvAccountNow.setText(userBeanNow.getMNickName());
-        userBeans.remove(0);
-        dataList.addAll(userBeans);
-        adapter.notifyDataSetChanged();*/
-    }
-
-    private class NewAccountListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            if (!isNewAccount) {
-                AccountManagementEvent event = new AccountManagementEvent();
-                if (isCertification) {
-                    event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT_CERTIFICATION);
-                } else {
-                    event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT);
-                }
-                EventBus.getDefault().post(event);
-                isNewAccount = true;
-            }
-        }
-    }
-
-    private void errorPopHeadSessionUserGraphInfo(String errorInfo) {
-        showToast(errorInfo);
-    }
-
-    private void popHeadSessionUserGraphInfo(boolean isCertification) {
-        progressDialog.show();
-        String token = getToken(newUid);
-        if (TextUtils.isEmpty(token)) {
-            showToast(R.string.toast_user_info_you_sign_error, ToastBuilder.MIDDLE_TOAST_SINGLE);
-            contentSession.removeHeadSession(mContext);
-            errorPopHeadSessionUserGraphInfo("token 更新异常,请重试");
-            progressDialog.hide();
-            return;
-        }
-        Response.ErrorListener errorListener = KFZSRestfulError.toast(mContext, new KFZSRestfulErrorCallBack() {
-            @Override
-            public void callErrorJob(boolean flag, int code, VolleyError error) {
-                errorPopHeadSessionUserGraphInfo("网络异常,请重试");
-                progressDialog.hide();
-            }
-        });
-        DDProviderHelper.getInstance().deleteCurrent(getActivity());
-        HashMap<String, String> params = new HashMap<>();
-        params.put(UrlBll.HeadParams.AUTHORIZATION, token);
-        APIRequest userSelfRequest = APIRequestInstance.getReq(TAG, UrlBll.UserApi.SELF, params, new OnHeadSessionUserGraph(isCertification), errorListener);
-        KFZSNetwork.addRequest(userSelfRequest);
-    }
-
-    private class OnHeadSessionUserGraph implements Response.Listener<ApiResponseOuterClass.ApiResponse> {
-        private final boolean isCertification;
-
-        public OnHeadSessionUserGraph(boolean isCertification) {
-            this.isCertification = isCertification;
-        }
-
-        @Override
-        public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-            //            ALog.d(apiResponse.toString());
-            int codeValue = apiResponse.getCodeValue();
-            switch (codeValue) {
-                case ApiResponseOuterClass.Codes.Success_VALUE:
-                    UserOuterClass.User user = apiResponse.getUser();
-                    if (user != null) {
-                        ALog.d("popUserGraph: " + accountType + " |newUid: " + newUid + " |isCertification: " + isCertification);
-                        switch (accountType) {
-                            case TYPE_ACCOUNT_NEW_ACCOUNT_CHECK:
-                                if (isCertification) {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_SUCCESS);
-                                } else {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_SHOW_LIST);
-                                }
-                                break;
-                            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK:
-                                if (mArguments != null) {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(mArguments.getString(EXTRAS_NEED_GET_TOKEN), user.getId(), user.getNickname(), user.getOpenId(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_SUCCESS);
-                                } else
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_SUCCESS);
-                                break;
-                            case TYPE_ACCOUNT_REPLACE_HEAD:
-                                if (isCertification) {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_CHECK);
-                                } else {
-                                    replaceAcount(user);
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_SHOW_LIST);
-                                }
-                                break;
-                            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD_CHECK:
-                                if (isCertification) {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD);
-                                } else {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_SHOW_LIST);
-                                }
-                                break;
-                            case TYPE_ACCOUNT_REPLACE_HEAD_CERTIFICATION_CHECK_CHANGE_PASSWORD:
-                                if (isCertification) {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_CERTIFICATION_BY_PASSWORD_SUCCESS);
-                                } else {
-                                    AccountManagementEventUtils.getInstance().newAccountByEvent(user.getId(), user.getNickname(), ActAccountManage.JOB_CHANGE_ACCOUNT_SHOW_LIST);
-                                }
-                                break;
-                            default:
-                                refreshAccountList();
-                                break;
-                        }
-                    } else {
-                        errorPopHeadSessionUserGraphInfo("获取用户最新数据异常,请重试");
-                    }
-                    break;
-                case ApiResponseOuterClass.Codes.Unauthorized_VALUE:
-                    ALog.d("OnHeadSessionUserGraph: Unauthorized_VALUE");
-                    errorPopHeadSessionUserGraphInfo("用户授权过期,请重试");
-                    AccountManagementEvent event = new AccountManagementEvent();
-                    if (isCertification) {
-                        event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT_CERTIFICATION);
-                    } else {
-                        event.setSkipCode(ActAccountManage.JOB_NEW_ACCOUNT);
-                    }
-                    EventBus.getDefault().post(event);
-                    break;
-                default:
-                    errorPopHeadSessionUserGraphInfo("获取用户信息异常,且未捕获");
-                    break;
-            }
-            progressDialog.hide();
-        }
-    }
-
-    //切换帐号；
-    private void replaceAcount(UserOuterClass.User user) {
-
-
-        User userCur = DDProviderHelper.getInstance().getUser(mContext, "" + user.getId());
-        Current current;// DDProviderHelper.getInstance().getLastUser(mContext);
-        current = new Current();
-        current.setMToken(userCur.getMToken());
-        current.setMUserId(user.getId() + "");
-        current.setMUserName(user.getName());
-        current.setMVipType(user.getVipType());
-        current.setMNickName(user.getNickname());
-        current.setMMobile(user.getPhone());
-        current.setMOpenId(user.getOpenId());
-        current.setMUpdateTime(String.valueOf(user.getUpdatedTime()));
-        current.setMAvatar(user.getAvatar());
-
-        DDProviderHelper.getInstance().setLastUser(getContext(), current);
-
-        new AppBaseBll().reloadVipStyle(getActivity());
-    }
-}

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

@@ -1,59 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.ActMain;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.react.api.IRnViewContainer;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-/**
- * Created by "蔡刚" on 2017/4/20.
- */
-public class TradeMainFragment extends BaseCompatFragment implements IRnViewContainer {
-
-
-    private ActMain getMainActivity() {
-        return (ActMain) getActivity();
-    }
-
-    private TextView textView;
-    private ViewGroup container;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void removeRnView() {
-        container.removeAllViews();
-        container.addView(textView);
-    }
-
-    @Override
-    public void addRnView(View view) {
-        container.removeAllViews();
-        container.addView(view);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fragment_react_container);
-        if (textView == null) {
-            textView = new TextView(getContext());
-            textView.setText("1数据加载中...");
-        }
-//        container = (ViewGroup) mContentView.findViewById(R.id.react_container);
-//        View mReactRootView = getMainActivity().getReactRootView();
-//        if (mReactRootView == null) {
-//            container.addView(textView);
-//        } else {
-//            container.addView(mReactRootView);
-//        }
-    }
-}

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

@@ -1,161 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
-import com.kfzs.duanduan.ActUser;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.adp.UserSelfInfoShowAdapter;
-import com.kfzs.duanduan.bean.SelfInfoPojo;
-import com.kfzs.duanduan.data.graph.provider.user.UserBean;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.event.UserEvent;
-import com.kfzs.duanduan.event.UserEventUtils;
-import com.kfzs.duanduan.BaseCompatFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * user info of ui
- * <pre>
- *     sinlov
- *
- *     /\__/\
- *    /`    '\
- *  ≈≈≈ 0  0 ≈≈≈ Hello world!
- *    \  --  /
- *   /        \
- *  /          \
- * |            |
- *  \  ||  ||  /
- *   \_oo__oo_/≡≡≡≡≡≡≡≡o
- *
- * </pre>
- * Created by sinlov on 17/2/23.
- */
-public class UserSelfInfoShowFragment extends BaseCompatFragment {
-
-    private RecyclerView recyclerView;
-    private List<SelfInfoPojo> adapterData;
-    private UserSelfInfoShowAdapter adapter;
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        UserEventUtils.getInstance().changeUserTitleByEvent(R.string.title_user_activity_self_info, true, false, true);
-        readInfoData();
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentViewChildMode(R.layout.fgt_self_info_show);
-        initViewById(mContentView);
-    }
-
-    private void initViewById(View v) {
-        this.recyclerView = (RecyclerView) v.findViewById(R.id.rv_fgt_self_info_show);
-        adapterData = new ArrayList<>();
-        adapter = new UserSelfInfoShowAdapter(mContext, adapterData);
-        recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
-        DividerItemDecoration decor = new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL);
-        decor.setSize(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_size));
-        decor.setColor(getResources().getColor(R.color.theme_app_divider_color));
-        decor.setPaddingStart(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_start));
-        decor.setPaddingEnd(getResources().getDimensionPixelOffset(R.dimen.app_list_item_divider_end));
-        recyclerView.addItemDecoration(decor);
-        recyclerView.setAdapter(adapter);
-        adapter.setOnItemClickListener(new OnShowItemClickListener());
-    }
-
-    private void readInfoData() {
-        adapterData.clear();
-        UserBean outHeadUser = DDProviderHelper.getInstance().getLastUserBean(mContext);
-        if (outHeadUser != null) {
-            SelfInfoPojo account = new SelfInfoPojo();
-            account.setCanEdit(false);
-            account.setHint("帐户");
-            account.setInfo(outHeadUser.getUserName());
-            account.setIconID(R.drawable.ic_user_head);
-            adapterData.add(account);
-
-            SelfInfoPojo nickName = new SelfInfoPojo();
-            nickName.setCanEdit(true);
-            nickName.setHint("昵称");
-            nickName.setInfo(outHeadUser.getNickname());
-            nickName.setIconID(R.drawable.ic_tag);
-            adapterData.add(nickName);
-
-            SelfInfoPojo phone = new SelfInfoPojo();
-            phone.setCanEdit(true);
-            phone.setHint("手机号");
-            String phoneStr = outHeadUser.getPhone();
-            if (TextUtils.isEmpty(phoneStr)) {
-                phoneStr = "请绑定手机";
-                phone.setCanEdit(true);
-            } else {
-                phone.setCanEdit(false);
-            }
-            phone.setInfo(phoneStr);
-            phone.setIconID(R.drawable.ic_phone);
-            adapterData.add(phone);
-
-            SelfInfoPojo safe = new SelfInfoPojo();
-            safe.setCanEdit(true);
-            safe.setHint("帐户安全");
-            safe.setInfo("修改密码");
-            safe.setIconID(R.drawable.ic_defind_shell);
-            adapterData.add(safe);
-
-//        SelfInfoPojo name = new SelfInfoPojo();
-//        name.setCanEdit(true);
-//        name.setHint("昵称");
-//        name.setInfo(outHeadSession.getAccount());
-//        name.setIconID(R.drawable.ic_pen);
-//        adapterData.add(name);
-
-            adapter.notifyDataSetChanged();
-        } else {
-            showToast(R.string.toast_user_info_you_sign_out_of_time);
-            sendEventByJobCode(ActUser.JOB_CODE_LOGIN);
-        }
-
-    }
-
-    private void sendEventByJobCode(int jobCodeLogin) {
-        UserEvent event = new UserEvent();
-        event.setSkipCode(jobCodeLogin);
-        EventBus.getDefault().post(event);
-    }
-
-    private class OnShowItemClickListener implements com.kfzs.appstore.utils.adapter.recyclerview.OnItemClickListener {
-        @Override
-        public void onItemClick(ViewGroup parent, View view, Object o, int position) {
-            SelfInfoPojo selfInfoPojo = adapterData.get(position);
-            if (selfInfoPojo.getInfo().equals("修改密码")) {
-                sendEventByJobCode(ActUser.JOB_CODE_SELF_CHANGE_PASSWORD);
-            }
-            if (selfInfoPojo.getHint().equals("昵称")) {
-                sendEventByJobCode(ActUser.JOB_CODE_SELF_CHANGE_NICKNAME);
-            }
-            if (selfInfoPojo.getHint().equals("手机号")) {
-                if (selfInfoPojo.isCanEdit()) {
-                    sendEventByJobCode(ActUser.JOB_CODE_SELF_BIND_PHONE);
-                }
-            }
-        }
-
-        @Override
-        public boolean onItemLongClick(ViewGroup parent, View view, Object o, int position) {
-            return false;
-        }
-    }
-
-}

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
 
 /**
  * Created by realicing on 2017/11/24.
@@ -176,12 +176,7 @@ public class TabsHelper {
             presscount = presscount + 1;
             Observable.just(1).delay(period * presscount, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<Integer>() {
-                        @Override
-                        public void call(Integer integer) {
-                            doBackPress();
-                        }
-                    });
+                    .subscribe(integer -> doBackPress());
         } else {
             presscount = 0;
             doBackPress();

app/src/main/java/com/kfzs/duanduan/react/YouHuiWanPopUtil.java

@@ -1,88 +0,0 @@
-package com.kfzs.duanduan.react;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.support.v4.app.FragmentTabHost;
-import android.support.v4.view.ViewPager;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.PopupWindow;
-
-import com.kfzs.duanduan.ActMain;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.concurrent.TimeUnit;
-
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by Administrator on 2017/11/21.
- */
-
-public class YouHuiWanPopUtil {
-
-    public static void showPop(final ActMain actMain, final ViewPager view_pager_container) {
-        if (isFirstRunApp()) {
-            Observable.just(2).delay(2, TimeUnit.SECONDS)
-//                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<Integer>() {
-                        @Override
-                        public void call(Integer index) {
-                            view_pager_container.setCurrentItem(index);
-                            new YouHuiWanPop(actMain).show(view_pager_container);
-                        }
-                    }, new Action1<Throwable>() {
-                        @Override
-                        public void call(Throwable throwable) {
-                        }
-                    });
-        }
-    }
-
-    /**
-     * 第一次启动app
-     *
-     * @return
-     */
-    public static boolean isFirstRunApp() {
-        boolean isFirstRunApp = SharedPreferences.getInstance().getBoolean(SharedPreferences.KEY_IS_FIRST_RUN_APP, true);
-        if (isFirstRunApp)
-            SharedPreferences.getInstance().putBoolean(SharedPreferences.KEY_IS_FIRST_RUN_APP, false);
-        return isFirstRunApp;
-    }
-
-    private static class YouHuiWanPop {
-        private PopupWindow pop;
-
-        public YouHuiWanPop(ActMain actMain) {
-            init(actMain);
-        }
-
-        private void init(Activity activity) {
-            LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View popShareView = inflater.inflate(R.layout.popupwindow_you_hui_wan, null);
-            pop = new PopupWindow(popShareView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-            pop.setFocusable(true);
-            pop.setOutsideTouchable(true);
-            pop.setBackgroundDrawable(new ColorDrawable(Color.argb(0x80, 0x00, 0x00, 0x00)));
-            popShareView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    pop.dismiss();
-                }
-            });
-        }
-
-        private void show(View view) {
-            pop.showAtLocation(view, Gravity.CENTER, 0, 0);
-        }
-    }
-}

app/src/main/java/com/kfzs/duanduan/react/api/IRnViewContainer.java

@@ -1,12 +0,0 @@
-package com.kfzs.duanduan.react.api;
-
-import android.view.View;
-
-/**
- * Created by Administrator on 2017/10/19.
- */
-
-public interface IRnViewContainer {
-    void addRnView(View view);
-    void removeRnView();
-}

app/src/main/java/com/kfzs/duanduan/react/pay/AilPayUtils.java

@@ -1,86 +0,0 @@
-package com.kfzs.duanduan.react.pay;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.alipay.sdk.app.PayTask;
-
-import java.util.Map;
-
-/**
- * Created by "howie" on 2017/5/2.
- */
-public class AilPayUtils {
-    private static final String TAG = "AilPayUtils";
-    private static final int SDK_PAY_FLAG = 1;
-    private Context mContext;
-    private PayListener mListener;
-
-    /**
-     * 支付方法
-     * @param mContext
-     * @param payInfo   支付信息
-     * @param listener  回调监听
-     */
-    public AilPayUtils(Context mContext, String payInfo, PayListener listener) {
-        this.mContext = mContext;
-        this.mListener = listener;
-        pay(payInfo);
-    }
-
-    @SuppressLint("HandlerLeak")
-    private Handler mHander = new Handler() {
-        @SuppressWarnings("unused")
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case SDK_PAY_FLAG: {
-                    @SuppressWarnings("unchecked")
-                    PayResult payResult = new PayResult((Map<String, String>) msg.obj);
-                    String resultInfo = payResult.getResult();// 同步返回需要验证的信息
-                    String resultStatus = payResult.getResultStatus();
-                    // 判断resultStatus 为9000则代表支付成功
-                    if (TextUtils.equals(resultStatus, "9000")) {
-                        // 该笔订单是否真实支付成功，需要依赖服务端的异步通知。
-                        if (mListener != null) {
-                            mListener.Success();
-                        }
-                    } else {
-                        // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        if (mListener != null) {
-                            mListener.Failure();
-                        }
-                    }
-                    break;
-
-                }
-                default:
-                    break;
-            }
-        }
-    };
-
-    public void pay(final String payInfo) {
-
-        Runnable payRunnable = new Runnable() {
-
-            @Override
-            public void run() {
-                PayTask alipay = new PayTask((Activity) mContext);
-                Map<String, String> result = alipay.payV2(payInfo, true);
-                Log.i(TAG, result.toString());
-                Message msg = new Message();
-                msg.what = SDK_PAY_FLAG;
-                msg.obj = result;
-                mHander.sendMessage(msg);
-            }
-        };
-
-        Thread payThread = new Thread(payRunnable);
-        payThread.start();
-    }
-}

app/src/main/java/com/kfzs/duanduan/react/pay/PayListener.java

@@ -1,9 +0,0 @@
-package com.kfzs.duanduan.react.pay;
-
-/**
- * Created by "howie" on 2017/5/2.
- */
-public interface PayListener {
-    void Success();
-    void Failure();
-}

app/src/main/java/com/kfzs/duanduan/react/upfile/UpFileListener.java

@@ -1,14 +0,0 @@
-package com.kfzs.duanduan.react.upfile;
-
-/**
- * Created by howie on 2017/5/15.
- */
-
-public interface UpFileListener {
-
-    void Success(String msg);
-
-    void Progress(String progress);
-
-    void Failure(String err);
-}

app/src/main/java/com/kfzs/duanduan/react/upfile/UpFileUtils.java

@@ -1,104 +0,0 @@
-package com.kfzs.duanduan.react.upfile;
-
-import android.app.Activity;
-import android.widget.Toast;
-
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.Callback;
-
-import java.io.File;
-
-import okhttp3.Call;
-import okhttp3.Response;
-import top.zibin.luban.Luban;
-import top.zibin.luban.OnCompressListener;
-
-/**
- * Created by howie on 2017/5/11.
- */
-
-public class UpFileUtils {
-    private Activity mActivity;
-    private String COMPRESS_FILE_ERROR = "压缩图片失败";
-    private String FILE_NOT_EXISTS = "文件不存在";
-    private String URL_IS_EMPTY = "请求地址为空";
-    private String URL_RN_UP_IMAGE;
-
-    public UpFileUtils(Activity mActivity, String url) {
-        this.mActivity = mActivity;
-        this.URL_RN_UP_IMAGE = url;
-    }
-
-
-    //压缩图片
-    public void compressImageByLuBan(File file, final UpFileListener upFileListener) {
-        if (upFileListener != null) {
-            if (!file.exists()) {
-                upFileListener.Failure(FILE_NOT_EXISTS);
-                return;
-            }
-            if (URL_RN_UP_IMAGE.isEmpty()) {
-                upFileListener.Failure(URL_IS_EMPTY);
-                return;
-            }
-            Luban.get(mActivity)
-                    .load(file)                     //传人要压缩的图片
-                    .putGear(Luban.THIRD_GEAR)      //设定压缩档次，默认三挡
-                    .setCompressListener(new OnCompressListener() {
-
-                        @Override
-                        public void onStart() {
-                            // TODO 压缩开始前调用，可以在方法内启动 loading UI
-                        }
-
-                        @Override
-                        public void onSuccess(File file) {
-                            if (file != null) {
-                                upImage(file, upFileListener);
-                            } else {
-                                Toast.makeText(mActivity, COMPRESS_FILE_ERROR, Toast.LENGTH_SHORT).show();
-                            }
-                        }
-
-                        @Override
-                        public void onError(Throwable e) {
-                            Toast.makeText(mActivity, COMPRESS_FILE_ERROR, Toast.LENGTH_SHORT).show();
-
-                        }
-                    }).launch();
-
-        }
-    }
-
-    //上传图片
-    private void upImage(File compressImageSuccess, final UpFileListener upFileListener) {
-        OkHttpUtils.post()//
-                .addFile("asset_name", "1.png", compressImageSuccess)//
-                .url(URL_RN_UP_IMAGE)
-                .build()//
-                .execute(new Callback() {
-                    @Override
-                    public void inProgress(float progress, long total, int id) {
-                        super.inProgress(progress, total, id);
-                        upFileListener.Progress(String.valueOf(Math.round(progress * 100)));
-                    }
-
-                    @Override
-                    public Object parseNetworkResponse(Response response, int id) throws Exception {
-                        return response.body().string();
-                    }
-
-                    @Override
-                    public void onError(Call call, Exception e, int id) {
-                        upFileListener.Failure(e.toString());
-                    }
-
-                    @Override
-                    public void onResponse(Object response, int id) {
-                        upFileListener.Success(response.toString());
-                    }
-                });
-
-    }
-
-}

app/src/main/java/com/kfzs/duanduan/react/version/DownloadUtil.java

@@ -1,135 +0,0 @@
-package com.kfzs.duanduan.react.version;
-
-import android.os.Environment;
-import android.support.annotation.NonNull;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * Created by zjb on 2017/5/25.
- */
-
-public class DownloadUtil {
-
-    private static DownloadUtil downloadUtil;
-    private final OkHttpClient okHttpClient;
-
-    public static DownloadUtil get() {
-        if (downloadUtil == null) {
-            downloadUtil = new DownloadUtil();
-        }
-        return downloadUtil;
-    }
-
-    private DownloadUtil() {
-        okHttpClient = new OkHttpClient();
-    }
-
-    /**
-     * @param url 下载连接
-     * @param saveDir 储存下载文件的SDCard目录
-     * @param listener 下载监听
-     */
-    public void download(final String url, final String saveDir, final OnDownloadListener listener) {
-        Request request = new Request.Builder().url(url).build();
-        okHttpClient.newCall(request).enqueue(new Callback() {
-            @Override
-            public void onFailure(Call call, IOException e) {
-                // 下载失败
-                listener.onDownloadFailed();
-            }
-            @Override
-            public void onResponse(Call call, Response response) throws IOException {
-                InputStream is = null;
-                byte[] buf = new byte[2048];
-                int len = 0;
-                FileOutputStream fos = null;
-                // 储存下载文件的目录
-                String savePath = isExistDir(saveDir);
-                try {
-                    is = response.body().byteStream();
-                    long total = response.body().contentLength();
-                    File file = new File(savePath, getNameFromUrl(url));
-                    fos = new FileOutputStream(file);
-                    long sum = 0;
-                    while ((len = is.read(buf)) != -1) {
-                        fos.write(buf, 0, len);
-                        sum += len;
-                        int progress = (int) (sum * 1.0f / total * 100);
-                        // 下载中
-                        listener.onDownloading(progress);
-                    }
-                    fos.flush();
-                    // 下载完成
-                    listener.onDownloadSuccess(file.getAbsolutePath());
-                } catch (Exception e) {
-                    listener.onDownloadFailed();
-                } finally {
-                    try {
-                        if (is != null)
-                            is.close();
-                    } catch (IOException e) {
-                    }
-                    try {
-                        if (fos != null)
-                            fos.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * @param saveDir
-     * @return
-     * @throws IOException
-     * 判断下载目录是否存在
-     */
-    private String isExistDir(String saveDir) throws IOException {
-        // 下载位置
-        File downloadFile = new File(Environment.getExternalStorageDirectory(), saveDir);
-        if (!downloadFile.mkdirs()) {
-            downloadFile.createNewFile();
-        }
-        String savePath = downloadFile.getAbsolutePath();
-        return savePath;
-    }
-
-    /**
-     * @param url
-     * @return
-     * 从下载连接中解析出文件名
-     */
-    @NonNull
-    private String getNameFromUrl(String url) {
-        return url.substring(url.lastIndexOf("/") + 1);
-    }
-
-    public interface OnDownloadListener {
-        /**
-         * 下载成功
-         */
-        void onDownloadSuccess(String filePath);
-
-        /**
-         * @param progress
-         * 下载进度
-         */
-        void onDownloading(int progress);
-
-        /**
-         * 下载失败
-         */
-        void onDownloadFailed();
-    }
-}

app/src/main/java/com/kfzs/duanduan/utils/dlg/SkipUtils.java

@@ -7,19 +7,9 @@ import android.text.TextUtils;
 
 import com.kfzs.duanduan.ActGameDetails;
 import com.kfzs.duanduan.ActGategoryRank;
-import com.kfzs.duanduan.ActGift;
-import com.kfzs.duanduan.ActLogin;
-import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.ActPersonPage;
-import com.kfzs.duanduan.ActRegist;
-import com.kfzs.duanduan.ActSimple;
 import com.kfzs.duanduan.ActWeb;
 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.proto.ShelvesGiftOuterClass;
 
-import static com.kfzs.duanduan.ActLogin.KEY_LOGIN_TYPE;
 
 /**
  * @ Created by Dlg
@@ -63,20 +53,6 @@ public class SkipUtils {
         context.startActivity(intent);
     }
 
-
-    /**
-     * 跳转到礼包详情页
-     *
-     * @param context
-     * @param gift
-     */
-    public void goGiftDetails(Context context, ShelvesGiftOuterClass.ShelvesGift gift) {
-        Intent intent = new Intent(context, ActGift.class);
-//        intent.putExtra(ActGift.INTENT_GIFT, String.valueOf(gift));
-        intent.putExtra(ActGift.INTENT_GIFT, gift);
-        context.startActivity(intent);
-    }
-
     /**
      * 跳游戏分类页
      *
@@ -90,25 +66,6 @@ public class SkipUtils {
     }
 
     /**
-     * 跳到万能容器页
-     *
-     * @param context
-     * @param action  ActSimple.ACTION. 这种格式
-     */
-    public void goActSimple(Context context, ActSimple.ACTION action) {
-        Intent intent = new Intent(context, ActSimple.class);
-        intent.putExtra(ActSimple.INTENT_ACTION, action);
-        context.startActivity(intent);
-    }
-
-    public void goActSimple(Activity activity, ActSimple.ACTION action, int requestCode) {
-        Intent intent = new Intent(activity, ActSimple.class);
-        intent.putExtra(ActSimple.INTENT_ACTION, action);
-        activity.startActivityForResult(intent, requestCode);
-    }
-
-
-    /**
      * 跳到Web页
      *
      * @param strUrl
@@ -141,68 +98,4 @@ public class SkipUtils {
         context.startActivity(intent);
     }
 
-    /**
-     * 跳到淘着玩
-     */
-    public void goTaozhewan(Context context) {
-
-    }
-
-    /**
-     * 跳转到登录页面
-     *
-     * @param context
-     */
-    public void goLogin(Context context) {
-        Intent intent = new Intent(context, ActLogin.class);
-        context.startActivity(intent);
-    }
-
-
-    /**
-     * @param context
-     * @param loginType loginType
-     */
-    public void goLogin(Context context, int loginType) {
-        Intent intent = new Intent(context, ActLogin.class);
-        intent.putExtra(KEY_LOGIN_TYPE, loginType);
-        context.startActivity(intent);
-    }
-
-
-    public void goUserCenter(Context context) {
-        Current lastUser = DDProviderHelper.getInstance().getLastUser(context);
-        boolean islogin = !(lastUser == null || TextUtils.isEmpty(lastUser.getMUserId()));
-        if (islogin) {
-            Intent intent = new Intent(context, ActPersonPage.class);
-            context.startActivity(intent);
-        } else {
-            goLogin(context);
-        }
-    }
-
-
-    /**
-     * 跳指定游戏详情页的论坛页面
-     *
-     * @param activity
-     * @param gameId
-     */
-    public void goBBSGameDetail(Activity activity, int gameId) {
-        Intent intent = new Intent(activity, ActMain.class);
-        intent.putExtra(ActMain.INTEN_GAME_ID, gameId);
-        activity.startActivity(intent);
-        activity.finish();
-    }
-
-    /**
-     * @param context
-     * @param registFrom 如：ActLogin.LOGIN_TYPE_IS_CERTIFICATION
-     */
-    public void goRegist(Context context, int registFrom) {
-        Intent intent = new Intent(context, ActRegist.class);
-        intent.putExtra(KEY_LOGIN_TYPE, registFrom);
-        context.startActivity(intent);
-    }
-
 }

app/src/main/java/com/kfzs/duanduan/view/GameCertificationActivity.java

@@ -1,17 +0,0 @@
-package com.kfzs.duanduan.view;
-
-import android.os.Bundle;
-
-import com.kfzs.duanduan.ActGameCertification;
-
-/**
- * Created by ljy on 2017/12/20.
- */
-
-public class GameCertificationActivity extends ActGameCertification {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-}

app/src/main/java/com/sheep/gamegroup/di/components/SmallSheepComponent.java

@@ -0,0 +1,16 @@
+package com.sheep.gamegroup.di.components;
+
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
+import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+@UserScope
+@Component(modules = SmallSheepModule.class, dependencies = NetComponent.class)
+public interface SmallSheepComponent {
+    void inject(FgtSmallSheep fgtSmallSheep);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/SmallSheepModule.java

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.di.modules;
+
+import com.sheep.gamegroup.presenter.SmallSheepContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+@Module
+public class SmallSheepModule {
+    private SmallSheepContract.View view;
+
+    public SmallSheepModule(SmallSheepContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public SmallSheepContract.View providView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/SmallSheepContract.java

@@ -0,0 +1,19 @@
+package com.sheep.gamegroup.presenter;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+public interface SmallSheepContract {
+
+    interface Persenter{
+
+        void getUserInfo();
+    }
+
+    interface View {
+
+        void updateData2View(Object o);
+        void failData2View(Object o);
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/SmallSheepPresenter.java

@@ -0,0 +1,57 @@
+package com.sheep.gamegroup.presenter;
+
+import android.util.Log;
+
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import javax.inject.Inject;
+
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+public class SmallSheepPresenter implements SmallSheepContract.Persenter {
+    private SmallSheepContract.View view;
+    private ApiService apiService;
+
+    @Inject
+    public SmallSheepPresenter(SmallSheepContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void getUserInfo() {
+        String token = SpUtils.getOpenId(SheepApp.mContext);
+
+        Log.e("token---user",token+"");
+        apiService.getInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseMessage>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        view.failData2View(throwable);
+                        Log.e("throwable",throwable+"");
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage o) {
+                        Log.e("token---user",o.toString()+"");
+                        view.updateData2View(o);
+                    }
+                });
+    }
+}

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

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-//    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
+    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+//    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //    public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.kfzs.duanduan.ActMain;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
@@ -62,7 +63,7 @@ public class Jump2View {
      * @param o
      */
     public void goHomePageView(Context context, Object o){
-        Intent intent = new Intent(context, HomePageAct.class);
+        Intent intent = new Intent(context, ActMain.class);
         context.startActivity(intent);
     }
 

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

@@ -11,13 +11,6 @@ import android.view.View;
 import android.widget.Toast;
 
 import com.sheep.gamegroup.util.ActivityManager;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.event.FloatMsg;
-import com.readystatesoftware.chuck.Chuck;
-
-import org.greenrobot.eventbus.EventBus;
 
 import butterknife.ButterKnife;
 

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>